From a3a712906de66aa889344bcaba5cd5698a7a60c8 Mon Sep 17 00:00:00 2001 From: Amos Haviv Date: Thu, 6 Mar 2014 01:01:04 +0200 Subject: [PATCH] Fixing Bower Versions, Fix Flickering --- app/views/layout.html | 4 +- bower.json | 18 +++--- package.json | 8 +-- public/css/common.css | 22 ++----- public/js/config.js | 2 +- public/modules/core/controllers/header.js | 29 +++++----- public/modules/core/views/header.html | 70 +++++++++++------------ 7 files changed, 71 insertions(+), 82 deletions(-) diff --git a/app/views/layout.html b/app/views/layout.html index c7ec47e2..62848d03 100644 --- a/app/views/layout.html +++ b/app/views/layout.html @@ -49,8 +49,8 @@ - -
+ +
{% block content %}{% endblock %} diff --git a/bower.json b/bower.json index 06a40c7e..fabbf4e6 100644 --- a/bower.json +++ b/bower.json @@ -3,14 +3,14 @@ "version": "0.2.1", "description": "Fullstack JavaScript with MongoDB, Express, AngularJS, and Node.js.", "dependencies": { - "bootstrap": "latest", - "angular": "latest", - "angular-cookies": "latest", - "angular-resource": "latest", - "angular-animate": "latest", - "angular-mocks": "latest", - "angular-bootstrap": "latest", - "angular-ui-utils": "latest", - "angular-ui-router": "#master" + "bootstrap": "~3", + "angular": "~1.2", + "angular-cookies": "~1.2", + "angular-resource": "~1.2", + "angular-animate": "~1.2", + "angular-mocks": "~1.2", + "angular-bootstrap": "~0.10.0", + "angular-ui-utils": "~0.1.0", + "angular-ui-router": "~0.2.9" } } \ No newline at end of file diff --git a/package.json b/package.json index 0b178ccc..d405b277 100755 --- a/package.json +++ b/package.json @@ -13,12 +13,12 @@ "npm": "1.4.x" }, "scripts": { - "start": "node node_modules/grunt-cli/bin/grunt", - "test": "node node_modules/grunt-cli/bin/grunt test", - "postinstall": "node node_modules/bower/bin/bower install" + "start": "grunt", + "test": "grunt test", + "postinstall": "bower install" }, "dependencies": { - "express": "~3.4.7", + "express": "~3.4.8", "consolidate": "~0.10.0", "swig": "~1.3.2", "mongoose": "~3.8.8", diff --git a/public/css/common.css b/public/css/common.css index b73bf1ea..a1a2546a 100644 --- a/public/css/common.css +++ b/public/css/common.css @@ -1,23 +1,9 @@ -body { - padding-top:50px; +.content { + margin-top: 50px; } - a.undecorated-link:hover { text-decoration: none; } - -footer { - position:fixed; - left:0px; - bottom:0px; - height:30px; - width:100%; - background:#ddd; - -webkit-box-shadow:0 8px 6px 6px black; - -moz-box-shadow:0 8px 6px 6px black; - box-shadow:0 8px 6px 6px black -} - -footer p { - padding:5px 0 12px 10px +[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak { + display: none !important; } \ No newline at end of file diff --git a/public/js/config.js b/public/js/config.js index 02bb5aa8..e429f257 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -20,4 +20,4 @@ var ApplicationConfiguration = (function() { applicationModuleVendorDependencies: applicationModuleVendorDependencies, registerModule: registerModule }; -})(); +})(); \ No newline at end of file diff --git a/public/modules/core/controllers/header.js b/public/modules/core/controllers/header.js index 803eb0b5..92557351 100644 --- a/public/modules/core/controllers/header.js +++ b/public/modules/core/controllers/header.js @@ -1,19 +1,22 @@ 'use strict'; angular.module('mean.core').controller('HeaderController', ['$scope', 'Authentication', - function($scope, Authentication) { - $scope.authentication = Authentication; + function($scope, Authentication) { + $scope.authentication = Authentication; + $scope.isCollapsed = false; - $scope.menu = [{ - title: 'Articles', - link: 'articles', - uiRoute: '/articles' - }, { - title: 'New Article', - link: 'articles/create', - uiRoute: '/articles/create' - }]; + $scope.menu = [{ + title: 'Articles', + link: 'articles', + uiRoute: '/articles' + }, { + title: 'New Article', + link: 'articles/create', + uiRoute: '/articles/create' + }]; - $scope.isCollapsed = false; - } + $scope.toggleCollapsibleMenu = function() { + $scope.isCollapsed = !$scope.isCollapsed; + }; + } ]); \ No newline at end of file diff --git a/public/modules/core/views/header.html b/public/modules/core/views/header.html index 47d48c7b..e19b906c 100644 --- a/public/modules/core/views/header.html +++ b/public/modules/core/views/header.html @@ -1,39 +1,39 @@
-
- - MEAN.JS -
-
\ No newline at end of file