Skip to content

Commit 428f147

Browse files
bekospkozlowski-opensource
bekos
authored and
pkozlowski-opensource
committed
demo(all): various fixes
1 parent 9613b61 commit 428f147

File tree

11 files changed

+60
-84
lines changed

11 files changed

+60
-84
lines changed

‎Gruntfile.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ module.exports = function(grunt) {
1717

1818
grunt.initConfig({
1919
ngversion: '1.0.8',
20-
bsversion: '3.0.2',
21-
faversion: '3.2.1',
20+
bsversion: '3.0.3',
2221
modules: [],//to be filled in by build task
2322
pkg: grunt.file.readJSON('package.json'),
2423
dist: 'dist',

‎misc/demo/assets/demo.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ section {
6363
border-bottom: 1px solid rgba(221,221,221,0.3);
6464
}
6565

66-
.nav, .pagination, .carousel a {
66+
.nav, .pagination, .carousel, .panel-title a {
6767
cursor: pointer;
6868
}
6969

‎misc/demo/index.html‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@
66
<meta name="description" content="AngularJS (Angular) native directives for Twitter Bootstrap. Small footprint (5kB gzipped!), no 3rd party JS dependencies (jQuery, bootstrap JS) required! Widgets: <% demoModules.forEach(function(module) { %><%= module.displayName %>, <% }); %>">
77
<meta name="google-site-verification" content="7lc5HyceLDqpV_6oNHteYFfxDJH7-S3DwnJKtNUKcRg" />
88

9-
<script src="http://ajax.googleapis.com/ajax/libs/angularjs/<%= ngversion %>/angular.min.js"></script>
9+
<script src="//ajax.googleapis.com/ajax/libs/angularjs/<%= ngversion %>/angular.min.js"></script>
1010
<script src="ui-bootstrap-tpls-<%= pkg.version%>.js"></script>
1111
<script src="assets/plunker.js"></script>
1212
<script src="assets/app.js"></script>
1313

14-
<link href="http://netdna.bootstrapcdn.com/bootstrap/<%= bsversion %>/css/bootstrap.min.css" rel="stylesheet"/>
15-
<link href="http://netdna.bootstrapcdn.com/bootstrap/<%= bsversion %>/css/bootstrap-glyphicons.css" rel="stylesheet">
14+
<link href="//netdna.bootstrapcdn.com/bootstrap/<%= bsversion %>/css/bootstrap.min.css" rel="stylesheet"/>
1615
<link rel="stylesheet" href="assets/rainbow.css"/>
1716
<link rel="stylesheet" href="assets/demo.css"/>
1817
<link rel="author" href="https://github.com/angular-ui/bootstrap/graphs/contributors">
@@ -129,7 +128,7 @@ <h3>Dependencies</h3>
129128
</p>
130129
<ul>
131130
<li><a href="http://angularjs.org" target="_blank">AngularJS</a> (minimal version 1.0.8 or 1.1.5)</li>
132-
<li><a href="http://getbootstrap.com/2.3.2/" target="_blank">Bootstrap CSS</a> (version 2.3)</li>
131+
<li><a href="http://getbootstrap.com" target="_blank">Bootstrap CSS</a> (version 3.0)</li>
133132
</ul>
134133
<h3>Files to download</h3>
135134
<p>
@@ -154,7 +153,7 @@ <h3>CSS</h3>
154153
This is why we need to remove empty <code>href</code> attributes from directive templates and as a result
155154
styling is not applied correctly. The remedy is simple, just add the following styling to your application:
156155
<code>
157-
.nav, .pagination, .carousel a {
156+
.nav, .pagination, .carousel, .panel-title a {
158157
cursor: pointer;
159158
}
160159
</code>

‎src/accordion/docs/demo.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</accordion-group>
1414
<accordion-group heading="Dynamic Body Content">
1515
<p>The body of the accordion group grows to fit the contents</p>
16-
<button class="btn btn-default btn-small" ng-click="addItem()">Add Item</button>
16+
<button class="btn btn-default btn-sm" ng-click="addItem()">Add Item</button>
1717
<div ng-repeat="item in items">{{item}}</div>
1818
</accordion-group>
1919
<accordion-group is-open="isopen">

‎src/collapse/docs/demo.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div ng-controller="CollapseDemoCtrl">
2-
<button class="btn" ng-click="isCollapsed = !isCollapsed">Toggle collapse</button>
2+
<button class="btn btn-default" ng-click="isCollapsed = !isCollapsed">Toggle collapse</button>
33
<hr>
44
<div collapse="isCollapsed">
5-
<div class="well well-large">Some content</div>
5+
<div class="well well-lg">Some content</div>
66
</div>
77
</div>

‎src/datepicker/docs/demo.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<h4>Inline</h4>
55
<div style="display:inline-block; min-height:290px;">
6-
<div class="well well-small" ng-model="dt">
6+
<div class="well well-sm" ng-model="dt">
77
<datepicker min="minDate" show-weeks="showWeeks"></datepicker>
88
</div>
99
</div>

‎src/pagination/docs/demo.html‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
1-
<div ng-controller="PaginationDemoCtrl" class="well well-small">
1+
<div ng-controller="PaginationDemoCtrl">
22
<h4>Default</h4>
3-
43
<pagination total-items="totalItems" page="currentPage"></pagination>
54
<pagination boundary-links="true" total-items="totalItems" page="currentPage" class="pagination-sm" previous-text="&lsaquo;" next-text="&rsaquo;" first-text="&laquo;" last-text="&raquo;"></pagination>
65
<pagination direction-links="false" boundary-links="true" total-items="totalItems" page="currentPage"></pagination>
76
<pagination direction-links="false" total-items="totalItems" page="currentPage" num-pages="smallnumPages"></pagination>
8-
9-
<div>
10-
<button class="btn btn-info" ng-click="setPage(3)">Set current page to: 3</button>
11-
The selected page no: {{currentPage}}
12-
</div>
7+
<pre>The selected page no: {{currentPage}}</pre>
8+
<button class="btn btn-info" ng-click="setPage(3)">Set current page to: 3</button>
139

1410
<hr />
1511
<h4>Pager</h4>
@@ -19,6 +15,5 @@ <h4>Pager</h4>
1915
<h4>Limit the maximum visible buttons</h4>
2016
<pagination total-items="bigTotalItems" page="bigCurrentPage" max-size="maxSize" class="pagination-sm" boundary-links="true"></pagination>
2117
<pagination total-items="bigTotalItems" page="bigCurrentPage" max-size="maxSize" class="pagination-sm" boundary-links="true" rotate="false" num-pages="numPages"></pagination>
22-
2318
<pre>Page: {{bigCurrentPage}} / {{numPages}}</pre>
2419
</div>

‎src/popover/docs/demo.html‎

Lines changed: 30 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,35 @@
11
<div ng-controller="PopoverDemoCtrl">
2-
<div class="well">
3-
<div>
4-
<h4>Dynamic</h4>
5-
<form role="form">
6-
<div class="form-group">
7-
<label>Dynamic Popover </label>
8-
<input type="text" ng-model="dynamicPopoverText" class="form-control">
9-
</div>
10-
<div class="form-group">
11-
<label>Dynamic Popover Popup Text</label>
12-
<input type="text" ng-model="dynamicPopover" class="form-control">
13-
</div>
14-
<div class="form-group">
15-
<label>Dynamic Popover Popup Title:</label>
16-
<input type="text" ng-model="dynamicPopoverTitle" class="form-control">
17-
</div>
18-
<button popover="{{dynamicPopover}}" popover-title="{{dynamicPopoverTitle}}" class="btn btn-info">{{dynamicPopoverText}}</button>
19-
</form>
2+
<h4>Dynamic</h4>
3+
<div class="form-group">
4+
<label>Popup Title:</label>
5+
<input type="text" ng-model="dynamicPopoverText" class="form-control">
206
</div>
21-
<div>
22-
<h4>Positional</h4>
23-
<button popover-placement="top" popover="On the Top!" class="btn btn-info">Top</button>
24-
<button popover-placement="left" popover="On the Left!" class="btn btn-info">Left</button>
25-
<button popover-placement="right" popover="On the Right!" class="btn btn-info">Right</button>
26-
<button popover-placement="bottom" popover="On the Bottom!" class="btn btn-info">Bottom</button>
7+
<div class="form-group">
8+
<label>Popup Text:</label>
9+
<input type="text" ng-model="dynamicPopover" class="form-control">
2710
</div>
28-
<div>
29-
<h4>Triggers</h4>
30-
<button popover="I appeared on mouse enter!" popover-trigger="mouseenter" class="btn btn-info">Mouseenter</button>
31-
<hr>
32-
<input type="text" value="Click me!"
33-
popover="I appeared on focus! Click away and I'll vanish..."
34-
popover-trigger="focus" class="form-control">
11+
<div class="form-group">
12+
<label>Popup Title:</label>
13+
<input type="text" ng-model="dynamicPopoverTitle" class="form-control">
3514
</div>
36-
<div>
37-
<h4>Other</h4>
38-
<button Popover-animation="true" popover="I fade in and out!" class="btn btn-info">fading</button>
39-
<button popover="I have a title!" popover-title="The title." class="btn btn-info">title</button>
40-
</div>
41-
</div>
15+
<button popover="{{dynamicPopover}}" popover-title="{{dynamicPopoverTitle}}" class="btn btn-default">{{dynamicPopoverText}}</button>
16+
17+
<hr />
18+
<h4>Positional</h4>
19+
<button popover-placement="top" popover="On the Top!" class="btn btn-default">Top</button>
20+
<button popover-placement="left" popover="On the Left!" class="btn btn-default">Left</button>
21+
<button popover-placement="right" popover="On the Right!" class="btn btn-default">Right</button>
22+
<button popover-placement="bottom" popover="On the Bottom!" class="btn btn-default">Bottom</button>
23+
24+
<hr />
25+
<h4>Triggers</h4>
26+
<p>
27+
<button popover="I appeared on mouse enter!" popover-trigger="mouseenter" class="btn btn-default">Mouseenter</button>
28+
</p>
29+
<input type="text" value="Click me!" popover="I appeared on focus! Click away and I'll vanish..." popover-trigger="focus" class="form-control">
30+
31+
<hr />
32+
<h4>Other</h4>
33+
<button Popover-animation="true" popover="I fade in and out!" class="btn btn-default">fading</button>
34+
<button popover="I have a title!" popover-title="The title." class="btn btn-default">title</button>
4235
</div>

‎src/progressbar/docs/demo.html‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
<div ng-controller="ProgressDemoCtrl" class="well">
1+
<div ng-controller="ProgressDemoCtrl">
22

33
<h3>Static</h3>
4-
<div class="row-fluid">
5-
<div class="span4"><progressbar value="55"></progressbar></div>
6-
<div class="span4"><progressbar class="progress-striped" value="22" type="warning">22%</progressbar></div>
7-
<div class="span4"><progressbar class="progress-striped active" max="200" value="166" type="danger"><i>166 / 200</i></progressbar></div>
4+
<div class="row">
5+
<div class="col-sm-4"><progressbar value="55"></progressbar></div>
6+
<div class="col-sm-4"><progressbar class="progress-striped" value="22" type="warning">22%</progressbar></div>
7+
<div class="col-sm-4"><progressbar class="progress-striped active" max="200" value="166" type="danger"><i>166 / 200</i></progressbar></div>
88
</div>
99

10+
<hr />
1011
<h3>Dynamic <button class="btn btn-sm btn-primary" type="button" ng-click="random()">Randomize</button></h3>
1112
<progressbar max="max" value="dynamic"><span style="color:black; white-space:nowrap;">{{dynamic}} / {{max}}</span></progressbar>
1213

@@ -16,7 +17,7 @@ <h3>Dynamic <button class="btn btn-sm btn-primary" type="button" ng-click="rando
1617
<small><em>Object (changes type based on value)</em></small>
1718
<progressbar class="progress-striped active" value="dynamic" type="{{type}}">{{type}} <i ng-show="showWarning">!!! Watch out !!!</i></progressbar>
1819

19-
20+
<hr />
2021
<h3>Stacked <button class="btn btn-sm btn-primary" type="button" ng-click="randomStacked()">Randomize</button></h3>
2122
<progress><bar ng-repeat="bar in stacked" value="bar.value" type="{{bar.type}}"><span ng-hide="bar.value < 5">{{bar.value}}%</span></bar></progress>
2223

‎src/rating/docs/demo.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div ng-controller="RatingDemoCtrl" class="well well-small">
1+
<div ng-controller="RatingDemoCtrl">
22
<h4>Default</h4>
33
<rating value="rate" max="max" readonly="isReadonly" on-hover="hoveringOver(value)" on-leave="overStar = null"></rating>
44
<span class="label" ng-class="{'label-warning': percent<30, 'label-info': percent>=30 && percent<70, 'label-success': percent>=70}" ng-show="overStar && !isReadonly">{{percent}}%</span>

0 commit comments

Comments
 (0)