diff --git a/app/views/includes/foot.jade b/app/views/includes/foot.jade index 6d695aa8..09b1b54d 100755 --- a/app/views/includes/foot.jade +++ b/app/views/includes/foot.jade @@ -1,8 +1,3 @@ -script(type='text/javascript', src='/lib/jquery/jquery.js') - -//Bootstrap -script(type='text/javascript', src='/lib/bootstrap-assets/js/bootstrap.js') - //AngularJS script(type='text/javascript', src='/lib/angular/angular.js') script(type='text/javascript', src='/lib/angular-cookies/angular-cookies.js') @@ -10,6 +5,7 @@ script(type='text/javascript', src='/lib/angular-resource/angular-resource.js') //Angular UI script(type='text/javascript', src='/lib/angular-bootstrap/ui-bootstrap-tpls.js') +script(type='text/javascript', src='/lib/angular-bootstrap/ui-bootstrap.js') script(type='text/javascript', src='/lib/angular-ui-utils/modules/route/route.js') //Application Init diff --git a/app/views/includes/head.jade b/app/views/includes/head.jade index 07d1d486..5ebb0c59 100755 --- a/app/views/includes/head.jade +++ b/app/views/includes/head.jade @@ -19,8 +19,8 @@ head meta(property='og:site_name', content='MEAN - A Modern Stack') meta(property='fb:admins', content='APP_ADMIN') - link(rel='stylesheet', href='/lib/bootstrap-assets/css/bootstrap.css') - link(rel='stylesheet', href='/lib/bootstrap-assets/css/bootstrap-responsive.css') + link(rel='stylesheet', href='/lib/bootstrap-css-only/css/bootstrap.css') + link(rel='stylesheet', href='/lib/bootstrap-css-only/css/bootstrap-responsive.css') link(rel='stylesheet', href='/css/common.css') link(rel='stylesheet', href='/css/views/articles.css') diff --git a/app/views/layouts/default.jade b/app/views/layouts/default.jade index f2ffb493..5e242b17 100755 --- a/app/views/layouts/default.jade +++ b/app/views/layouts/default.jade @@ -2,7 +2,7 @@ html(lang='en', xmlns='http://www.w3.org/1999/xhtml', xmlns:fb='https://www.facebook.com/2008/fbml', itemscope='itemscope', itemtype='http://schema.org/Product') include ../includes/head body - header.navbar.navbar-fixed-top.navbar-inverse(data-ng-include="'views/header.html'") + .navbar.navbar-inverse.navbar-fixed-top(data-ng-include="'views/header.html'", data-role="navigation") section.content section.container block content diff --git a/bower.json b/bower.json index e00fcd87..54b07e00 100644 --- a/bower.json +++ b/bower.json @@ -2,13 +2,12 @@ "name": "mean", "version": "1.0.0", "dependencies": { - "bootstrap-assets": "2.3.2", + "bootstrap-css-only": "latest", "angular": "~1.0.6", "angular-resource": "~1.0.6", "angular-cookies": "~1.0.6", - "angular-bootstrap": "~0.4.0", + "angular-bootstrap": "latest", "angular-ui-utils": "0.0.4", - "json3": "~3.2.4", - "jquery": "~1.9.1" + "json3": "~3.2.4" } } diff --git a/public/js/controllers/header.js b/public/js/controllers/header.js index eb6254a2..1c1b04fc 100644 --- a/public/js/controllers/header.js +++ b/public/js/controllers/header.js @@ -8,4 +8,6 @@ angular.module('mean.system').controller('HeaderController', ['$scope', 'Global' "title": "Create New Article", "link": "articles/create" }]; + + $scope.isCollapsed = false; }]); \ No newline at end of file diff --git a/public/js/init.js b/public/js/init.js index fa2955c8..f77b4f2a 100644 --- a/public/js/init.js +++ b/public/js/init.js @@ -6,7 +6,7 @@ window.init = function() { window.bootstrap(); }; -$(document).ready(function() { +angular.element(document).ready(function() { //Fixing facebook bug with redirect if (window.location.hash == "#_=_") window.location.hash = "";