Skip to content

Commit c18d4a9

Browse files
tilwinjoytilwinjoy
committed
fixing navigation and updating validation demo
1 parent 1eef337 commit c18d4a9

File tree

3 files changed

+48
-38
lines changed

3 files changed

+48
-38
lines changed

‎demos/index.css‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,15 @@ body {
1313
background-color: #fff;
1414
}
1515

16+
:target:before {
17+
content: "";
18+
display: block;
19+
height: 60px;
20+
/* fixed header height*/
21+
margin: -60px 0 0;
22+
/* negative fixed header height */
23+
}
24+
1625
#main-content {
1726
margin-top: 60px;
1827
}

‎demos/index.html‎

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -45,40 +45,43 @@
4545
</button>
4646
<a class="navbar-brand" href="#">Angular Bootsrap Material</a>
4747
</div>
48-
<div id="navbar" class="navbar-collapse collapse">
48+
<div class="navbar-collapse collapse">
4949
<ul class="nav navbar-nav">
50-
<li><a href="#startup">Getting started</a></li>
50+
<li><a href="#startup" target="_self">Getting started</a></li>
5151
<li class="dropdown" uib-dropdown>
5252
<a class="dropdown-toggle" uib-dropdown-toggle role="button">Form Controls <span class="caret"></span></a>
5353
<ul class="dropdown-menu" uib-dropdown-menu>
54-
<li><a href="#input">Input</a></li>
55-
<li><a href="#textarea">Textarea</a></li>
56-
<li><a href="#checkbox">Checkbox</a></li>
57-
<li><a href="#radio">Radio</a></li>
58-
<li><a href="#select">Select</a></li>
54+
<li><a href="#input" target="_self">Input</a></li>
55+
<li><a href="#textarea" target="_self">Textarea</a></li>
56+
<li><a href="#checkbox" target="_self">Checkbox</a></li>
57+
<li><a href="#radio" target="_self">Radio</a></li>
58+
<li><a href="#select" target="_self">Select</a></li>
59+
<li role="separator" class="divider"></li>
60+
<li><a href="#form-validation" target="_self">Validation</a></li>
5961
</ul>
6062
</li>
6163
<li class="dropdown" uib-dropdown>
6264
<a class="dropdown-toggle" uib-dropdown-toggle role="button">Components<span class="caret"></span></a>
6365
<ul class="dropdown-menu" uib-dropdown-menu>
6466
<li class="dropdown-header">Bootstrap</li>
65-
<li><a href="#navbar">Navbar</a></li>
66-
<li><a href="#tabs">Tabs</a></li>
67-
<li><a href="#alert">Alert</a></li>
68-
<li><a href="#dropdown">Dropdown</a></li>
69-
<li><a href="#progress">Progress</a></li>
70-
<li><a href="#pagination">Pagination</a></li>
71-
<li><a href="#pager">Pager</a></li>
72-
<li><a href="#modal">Modal</a></li>
73-
<li><a href="#popover">Popover</a></li>
74-
<li><a href="#tooltip">Tooltip</a></li>
67+
<li><a href="#navbar" target="_self">Navbar</a></li>
68+
<li><a href="#tabs" target="_self">Tabs</a></li>
69+
<li><a href="#alert" target="_self">Alert</a></li>
70+
<!--<li>
71+
<a href="#dropdown">Dropdown</a></li>-->
72+
<li><a href="#progress" target="_self">Progress</a></li>
73+
<li><a href="#pagination" target="_self">Pagination</a></li>
74+
<li><a href="#pager" target="_self">Pager</a></li>
75+
<li><a href="#modal" target="_self">Modal</a></li>
76+
<li><a href="#popover" target="_self">Popover</a></li>
77+
<li><a href="#tooltip" target="_self">Tooltip</a></li>
7578
<li class="dropdown-header">Other</li>
76-
<li><a href="#toggle">Toggle button</a></li>
79+
<li><a href="#toggle" target="_self">Toggle button</a></li>
7780
</ul>
7881
</li>
7982
</ul>
8083
<ul class="nav navbar-nav navbar-right">
81-
<li><a href="http://github.com/tilwinjoy/angular-bootstrap-material">View on GitHub</a></li>
84+
<li><a href="http://github.com/tilwinjoy/angular-bootstrap-material" target="_blank">View on GitHub</a></li>
8285
<li><a href="http://github.com/tilwinjoy/angular-bootstrap-material/zipball/master">Download .zip</a></li>
8386
<li><a href="http://github.com/tilwinjoy/angular-bootstrap-material/tarball/master">Download .tar.gz</a></li>
8487
</ul>
@@ -173,6 +176,14 @@ <h3>Select</h3>
173176
</div>
174177
<div class="col-xs-6"></div>
175178
</div>
179+
<div id="form-validation" class="container-fluid">
180+
<div class="row">
181+
<div class="col-xs-12">
182+
<h3>Form Validation</h3>
183+
<ng-include src="'validation/demo.html'"></ng-include>
184+
</div>
185+
</div>
186+
</div>
176187
</div>
177188
<div id="bs-components" class="container-fluid">
178189
<h2>Components</h2>
@@ -264,14 +275,6 @@ <h3>Toggle Button</h3>
264275
</div>
265276
</div>
266277
</div>
267-
<div id="form-validation" class="container-fluid">
268-
<div class="row">
269-
<div class="col-xs-12">
270-
<h3>Form Validation</h3>
271-
<ng-include src="'validation/demo.html'"></ng-include>
272-
</div>
273-
</div>
274-
</div>
275278
<script src="../bower_components/angular/angular.js"></script>
276279
<script src="../bower_components/angular-messages/angular-messages.js"></script>
277280
<script src="../bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>

‎demos/validation/demo.html‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,15 @@
2121
<div class="togglebutton" abm-toggle label="Premium Account">
2222
<input type="checkbox" name="premiumAccount" ng-model="user.premium" ng-change="user.paymentMode=null">
2323
</div>
24-
<fieldset ng-disabled="!user.premium">
25-
<abm-form-group error-messages="errorMap">
26-
<label>Prefered payment method</label>
27-
<div class="radio" abm-radio label="Net banking">
28-
<input type="radio" name="payment" value="net" ng-model="user.paymentMode" ng-required="user.premium">
29-
</div>
30-
<div class="radio" abm-radio label="Credit card">
31-
<input type="radio" name="payment" value="credit" ng-model="user.paymentMode" ng-required="user.premium">
32-
</div>
33-
</abm-form-group>
34-
</fieldset>
24+
<abm-form-group error-messages="errorMap">
25+
<label>Prefered payment method</label>
26+
<div class="radio" abm-radio label="Net banking">
27+
<input type="radio" name="payment" value="net" ng-model="user.paymentMode" ng-required="user.premium" ng-disabled="!user.premium">
28+
</div>
29+
<div class="radio" abm-radio label="Credit card">
30+
<input type="radio" name="payment" value="credit" ng-model="user.paymentMode" ng-required="user.premium" ng-disabled="!user.premium">
31+
</div>
32+
</abm-form-group>
3533
<a href="" class="btn btn-raised btn-primary" ng-disabled="signup.$invalid" abm-component>Create Account</a>
3634
</form>
3735
</div>

0 commit comments

Comments
 (0)