Skip to content
This repository was archived by the owner on Aug 30, 2021. It is now read-only.

Commit a3a7129

Browse files
amoshavivamoshaviv
committed
Fixing Bower Versions, Fix Flickering
1 parent 8c825ff commit a3a7129

File tree

7 files changed

+71
-82
lines changed

7 files changed

+71
-82
lines changed

‎app/views/layout.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
<![endif]-->
5050
</head>
5151

52-
<body>
53-
<header data-ng-include="'/modules/core/views/header.html'" class="navbar navbar-fixed-top navbar-inverse ng-cloak"></header>
52+
<body class="ng-cloak">
53+
<header data-ng-include="'/modules/core/views/header.html'" class="navbar navbar-fixed-top navbar-inverse"></header>
5454
<section class="content">
5555
<section class="container">
5656
{% block content %}{% endblock %}

‎bower.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"version": "0.2.1",
44
"description": "Fullstack JavaScript with MongoDB, Express, AngularJS, and Node.js.",
55
"dependencies": {
6-
"bootstrap": "latest",
7-
"angular": "latest",
8-
"angular-cookies": "latest",
9-
"angular-resource": "latest",
10-
"angular-animate": "latest",
11-
"angular-mocks": "latest",
12-
"angular-bootstrap": "latest",
13-
"angular-ui-utils": "latest",
14-
"angular-ui-router": "#master"
6+
"bootstrap": "~3",
7+
"angular": "~1.2",
8+
"angular-cookies": "~1.2",
9+
"angular-resource": "~1.2",
10+
"angular-animate": "~1.2",
11+
"angular-mocks": "~1.2",
12+
"angular-bootstrap": "~0.10.0",
13+
"angular-ui-utils": "~0.1.0",
14+
"angular-ui-router": "~0.2.9"
1515
}
1616
}

‎package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
"npm": "1.4.x"
1414
},
1515
"scripts": {
16-
"start": "node node_modules/grunt-cli/bin/grunt",
17-
"test": "node node_modules/grunt-cli/bin/grunt test",
18-
"postinstall": "node node_modules/bower/bin/bower install"
16+
"start": "grunt",
17+
"test": "grunt test",
18+
"postinstall": "bower install"
1919
},
2020
"dependencies": {
21-
"express": "~3.4.7",
21+
"express": "~3.4.8",
2222
"consolidate": "~0.10.0",
2323
"swig": "~1.3.2",
2424
"mongoose": "~3.8.8",

‎public/css/common.css

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,9 @@
1-
body {
2-
padding-top:50px;
1+
.content {
2+
margin-top: 50px;
33
}
4-
54
a.undecorated-link:hover {
65
text-decoration: none;
76
}
8-
9-
footer {
10-
position:fixed;
11-
left:0px;
12-
bottom:0px;
13-
height:30px;
14-
width:100%;
15-
background:#ddd;
16-
-webkit-box-shadow:0 8px 6px 6px black;
17-
-moz-box-shadow:0 8px 6px 6px black;
18-
box-shadow:0 8px 6px 6px black
19-
}
20-
21-
footer p {
22-
padding:5px 0 12px 10px
7+
[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
8+
display: none !important;
239
}

‎public/js/config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ var ApplicationConfiguration = (function() {
2020
applicationModuleVendorDependencies: applicationModuleVendorDependencies,
2121
registerModule: registerModule
2222
};
23-
})();
23+
})();

‎public/modules/core/controllers/header.js

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
'use strict';
22

33
angular.module('mean.core').controller('HeaderController', ['$scope', 'Authentication',
4-
function($scope, Authentication) {
5-
$scope.authentication = Authentication;
4+
function($scope, Authentication) {
5+
$scope.authentication = Authentication;
6+
$scope.isCollapsed = false;
67

7-
$scope.menu = [{
8-
title: 'Articles',
9-
link: 'articles',
10-
uiRoute: '/articles'
11-
}, {
12-
title: 'New Article',
13-
link: 'articles/create',
14-
uiRoute: '/articles/create'
15-
}];
8+
$scope.menu = [{
9+
title: 'Articles',
10+
link: 'articles',
11+
uiRoute: '/articles'
12+
}, {
13+
title: 'New Article',
14+
link: 'articles/create',
15+
uiRoute: '/articles/create'
16+
}];
1617

17-
$scope.isCollapsed = false;
18-
}
18+
$scope.toggleCollapsibleMenu = function() {
19+
$scope.isCollapsed = !$scope.isCollapsed;
20+
};
21+
}
1922
]);

‎public/modules/core/views/header.html

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
<div class="container" data-ng-controller="HeaderController">
2-
<div class="navbar-header">
3-
<button class="navbar-toggle" type="button" data-ng-click="isCollapsed = !isCollapsed">
4-
<span class="sr-only">Toggle navigation</span>
5-
<span class="icon-bar"></span>
6-
<span class="icon-bar"></span>
7-
<span class="icon-bar"></span>
8-
</button>
9-
<a href="/#!/" class="navbar-brand">MEAN.JS</a>
10-
</div>
11-
<nav class="collapse navbar-collapse" collapse="!isCollapsed" role="navigation">
12-
<ul class="nav navbar-nav" data-ng-show="authentication.user">
13-
<li data-ng-repeat="item in menu" data-ng-show="authentication.user" ui-route="{{item.uiRoute}}" ng-class="{active: $uiRoute}">
14-
<a href="/#!/{{item.link}}">{{item.title}}</a>
15-
</li>
16-
</ul>
17-
<ul class="nav navbar-nav navbar-right" data-ng-hide="authentication.user">
18-
<li ui-route="/signup" ng-class="{active: $uiRoute}">
19-
<a href="/#!/signup">Signup</a>
20-
</li>
21-
<li class="divider-vertical"></li>
22-
<li ui-route="/signin" ng-class="{active: $uiRoute}">
23-
<a href="/#!/signin">Signin</a>
24-
</li>
25-
</ul>
26-
<ul class="nav navbar-nav navbar-right" data-ng-show="authentication.user">
27-
<li class="dropdown">
28-
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
2+
<div class="navbar-header">
3+
<button class="navbar-toggle" type="button" data-ng-click="toggleCollapsibleMenu()">
4+
<span class="sr-only">Toggle navigation</span>
5+
<span class="icon-bar"></span>
6+
<span class="icon-bar"></span>
7+
<span class="icon-bar"></span>
8+
</button>
9+
<a href="/#!/" class="navbar-brand">MEAN.JS</a>
10+
</div>
11+
<nav class="collapse navbar-collapse" collapse="!isCollapsed" role="navigation">
12+
<ul class="nav navbar-nav" data-ng-show="authentication.user">
13+
<li data-ng-repeat="item in menu" data-ng-show="authentication.user" ui-route="{{item.uiRoute}}" ng-class="{active: $uiRoute}">
14+
<a href="/#!/{{item.link}}">{{item.title}}</a>
15+
</li>
16+
</ul>
17+
<ul class="nav navbar-nav navbar-right" data-ng-hide="authentication.user">
18+
<li ui-route="/signup" ng-class="{active: $uiRoute}">
19+
<a href="/#!/signup">Signup</a>
20+
</li>
21+
<li class="divider-vertical"></li>
22+
<li ui-route="/signin" ng-class="{active: $uiRoute}">
23+
<a href="/#!/signin">Signin</a>
24+
</li>
25+
</ul>
26+
<ul class="nav navbar-nav navbar-right" data-ng-show="authentication.user">
27+
<li class="dropdown">
28+
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
2929
{{authentication.user.displayName}} <b class="caret"></b>
3030
</a>
31-
<ul class="dropdown-menu">
32-
<li>
33-
<a href="/auth/signout">Signout</a>
34-
</li>
35-
</ul>
36-
</li>
37-
</ul>
38-
</nav>
31+
<ul class="dropdown-menu">
32+
<li>
33+
<a href="/auth/signout">Signout</a>
34+
</li>
35+
</ul>
36+
</li>
37+
</ul>
38+
</nav>
3939
</div>

0 commit comments

Comments
 (0)