diff options
| author | Nana Nosirova <nargiza.nosirova@mail.utoronto.ca> | 2018-07-17 02:44:47 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-17 02:44:47 +0000 |
| commit | 62b53c0971765a4e5f5d447188eb90bd22571424 (patch) | |
| tree | d2f7aa3f3bb7b05cd5d3dee288eabf0f38d39b1a /views/layouts/layout.hbs | |
| parent | 541341598d5ed0e5c8ef9b2325dc6bbec958463a (diff) | |
| parent | 27f1cff089254b678bfcc695ab40b23a6a65a998 (diff) | |
Merge pull request #4 from kdam0/feat/SR-35
Feat/sr 35
Diffstat (limited to 'views/layouts/layout.hbs')
| -rw-r--r-- | views/layouts/layout.hbs | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/views/layouts/layout.hbs b/views/layouts/layout.hbs index 42eaff6..52a3506 100644 --- a/views/layouts/layout.hbs +++ b/views/layouts/layout.hbs @@ -9,11 +9,13 @@ <!--Custom CSS Files--> <link href="/assets/css/style.css" rel="stylesheet" type="text/css"> + <link href="/assets/css/style768.css" rel="stylesheet" type="text/css"> + <link href="/assets/css/style1024.css" rel="stylesheet" type="text/css"> <!--Bootstrap File--> - <link rel="stylesheet" href="/assets/css/bootstrap.min.css"> + <link rel="stylesheet" href="/assets/css/bootstrap.css"> <link rel="stylesheet" href="/assets/css/creative.css"> - + <link rel="stylesheet" href="/assets/css/typeheadjs.css" title="typehead css" type="text/css"> <!-- Partial Scripts, Order important --> {{# if userProfile}} <link href="/assets/css/user_profile.css" rel="stylesheet" type="text/css"> @@ -28,8 +30,9 @@ crossorigin="anonymous"> <!--JS--> - <script src="/assets/js/jquery-2.2.4.min.js"></script> - <script src="/assets/js/bootstrap.min.js"></script> + <script type="text/javascript" src="/assets/js/jquery-2.2.4.min.js"></script> + <script type="text/javascript" src="/assets/js/bootstrap.min.js"></script> + <script type="text/javascript" src="/assets/js/typeaheadPlusBloodhound.js"></script> <script src="/assets/js/script.js"></script> <script src="/socket.io/socket.io.js"></script> @@ -40,10 +43,9 @@ <script src="/assets/js/admin_panel.js"></script> {{/if}} {{# if homePage }} - <script src="/assets/js/home_page.js"></script> + <script type="text/javascript" src="/assets/js/home_page.js"></script> {{/if}} - </head> <body> {{# if noHeader}} @@ -58,4 +60,4 @@ {{/if}} </body> -</html>
\ No newline at end of file +</html> |