Skip to content

Commit 7023cc2

Browse files
tilwinjoytilwinjoy
committed
Fixing navbar
1 parent 3b747d8 commit 7023cc2

File tree

5 files changed

+21
-14
lines changed

5 files changed

+21
-14
lines changed

‎bower.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"angular": "^1.5.3",
2020
"bootstrap-material-design": "v0.5.9",
2121
"angular-messages": "^1.5.3",
22-
"angular-bootstrap": "^1.3.2"
22+
"angular-bootstrap": "^1.3.2",
23+
"angular-animate": "^1.5.6"
2324
}
2425
}

‎demos/index.html‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,18 @@
3434

3535
<body ng-app="angularBootstrapMaterialDocs">
3636
<!-- Fixed navbar -->
37-
<nav class="navbar navbar-inverse navbar-fixed-top" abm-component>
37+
<nav class="navbar navbar-inverse navbar-fixed-top" abm-component ng-controller="navbarDemoCtrl">
3838
<div class="container-fluid">
3939
<div class="navbar-header">
40-
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
40+
<button type="button" class="navbar-toggle collapsed" aria-expanded="false" aria-controls="navbar" ng-click="isCollapsed = !isCollapsed">
4141
<span class="sr-only">Toggle navigation</span>
4242
<span class="icon-bar"></span>
4343
<span class="icon-bar"></span>
4444
<span class="icon-bar"></span>
4545
</button>
4646
<a class="navbar-brand" href="#">Angular Bootsrap Material</a>
4747
</div>
48-
<div class="navbar-collapse collapse">
48+
<div class="navbar-collapse collapse" uib-collapse="isCollapsed">
4949
<ul class="nav navbar-nav">
5050
<li><a href="#startup" target="_self">Getting started</a></li>
5151
<li class="dropdown" uib-dropdown>
@@ -276,11 +276,13 @@ <h3>Toggle Button</h3>
276276
</div>
277277
</div>
278278
<script src="../bower_components/angular/angular.js"></script>
279+
<script src="../bower_components/angular-animate/angular-animate.js"></script>
279280
<script src="../bower_components/angular-messages/angular-messages.js"></script>
280281
<script src="../bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
281282
<script src="../dist/angular-bootstrap-material.js"></script>
282283
<script src="index.js"></script>
283284
<script src="alert/demo.js"></script>
285+
<script src="navbar/demo.js"></script>
284286
<script src="buttons/demo.js"></script>
285287
<script src="dropdown/demo.js"></script>
286288
<script src="modal/demo.js"></script>

‎demos/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
angular.module('angularBootstrapMaterialDocs', ['angularBootstrapMaterial', 'ui.bootstrap']);
1+
angular.module('angularBootstrapMaterialDocs', ['angularBootstrapMaterial', 'ngAnimate', 'ui.bootstrap']);

‎demos/navbar/demo.html‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<nav class="navbar navbar-default" abm-component>
1+
<nav class="navbar navbar-default" abm-component ng-controller="navbarDemoCtrl">
22
<div class="container-fluid">
33
<!-- Brand and toggle get grouped for better mobile display -->
44
<div class="navbar-header">
5-
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
5+
<button type="button" class="navbar-toggle collapsed" aria-expanded="false" ng-click="isCollapsed = !isCollapsed">
66
<span class="sr-only">Toggle navigation</span>
77
<span class="icon-bar"></span>
88
<span class="icon-bar"></span>
@@ -12,7 +12,7 @@
1212
</div>
1313

1414
<!-- Collect the nav links, forms, and other content for toggling -->
15-
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
15+
<div class="collapse navbar-collapse" uib-collapse="isCollapsed">
1616
<ul class="nav navbar-nav">
1717
<li class="active"><a href="">Link <span class="sr-only">(current)</span></a></li>
1818
<li><a href="">Link</a></li>
@@ -53,11 +53,11 @@
5353
</div>
5454
<!-- /.container-fluid -->
5555
</nav>
56-
<nav class="navbar navbar-inverse" abm-component>
56+
<nav class="navbar navbar-inverse" abm-component ng-controller="navbarDemoCtrl">
5757
<div class="container-fluid">
5858
<!-- Brand and toggle get grouped for better mobile display -->
5959
<div class="navbar-header">
60-
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
60+
<button type="button" class="navbar-toggle collapsed" aria-expanded="false" ng-click="isCollapsed = !isCollapsed">
6161
<span class="sr-only">Toggle navigation</span>
6262
<span class="icon-bar"></span>
6363
<span class="icon-bar"></span>
@@ -67,7 +67,7 @@
6767
</div>
6868

6969
<!-- Collect the nav links, forms, and other content for toggling -->
70-
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
70+
<div class="collapse navbar-collapse" uib-collapse="isCollapsed">
7171
<ul class="nav navbar-nav">
7272
<li class="active"><a href="">Link <span class="sr-only">(current)</span></a></li>
7373
<li><a href="">Link</a></li>
@@ -108,11 +108,11 @@
108108
</div>
109109
<!-- /.container-fluid -->
110110
</nav>
111-
<nav class="navbar navbar-warning" abm-component>
111+
<nav class="navbar navbar-warning" abm-component ng-controller="navbarDemoCtrl">
112112
<div class="container-fluid">
113113
<!-- Brand and toggle get grouped for better mobile display -->
114114
<div class="navbar-header">
115-
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
115+
<button type="button" class="navbar-toggle collapsed" aria-expanded="false" ng-click="isCollapsed = !isCollapsed">
116116
<span class="sr-only">Toggle navigation</span>
117117
<span class="icon-bar"></span>
118118
<span class="icon-bar"></span>
@@ -122,7 +122,7 @@
122122
</div>
123123

124124
<!-- Collect the nav links, forms, and other content for toggling -->
125-
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
125+
<div class="collapse navbar-collapse" uib-collapse="isCollapsed">
126126
<ul class="nav navbar-nav">
127127
<li class="active"><a href="">Link <span class="sr-only">(current)</span></a></li>
128128
<li><a href="">Link</a></li>

‎demos/navbar/demo.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
angular.module('angularBootstrapMaterialDocs')
2+
.controller('navbarDemoCtrl', ['$scope', function ($scope) {
3+
$scope.isCollapsed = true;
4+
}]);

0 commit comments

Comments
 (0)