feat(progressbar): update to bootstrap3

angular-ui · Dec 28, 2013 · 5bcff62 · 5bcff62
1 parent dfc3b0b
commit 5bcff62
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/progressbar/docs/demo.html b/src/progressbar/docs/demo.html
@@ -7,7 +7,7 @@ <h3>Static</h3>
         <div class="span4"><progressbar class="progress-striped active" max="200" value="166" type="danger"><i>166 / 200</i></progressbar></div>
     </div>
 
-    <h3>Dynamic <button class="btn btn-small btn-primary" type="button" ng-click="random()">Randomize</button></h3>
+    <h3>Dynamic <button class="btn btn-sm btn-primary" type="button" ng-click="random()">Randomize</button></h3>
     <progressbar max="max" value="dynamic"><span style="color:black; white-space:nowrap;">{{dynamic}} / {{max}}</span></progressbar>
 
     <small><em>No animation</em></small>
@@ -17,7 +17,7 @@ <h3>Dynamic <button class="btn btn-small btn-primary" type="button" ng-click="ra
     <progressbar class="progress-striped active" value="dynamic" type="{{type}}">{{type}} <i ng-show="showWarning">!!! Watch out !!!</i></progressbar>
 
 
-    <h3>Stacked <button class="btn btn-small btn-primary" type="button" ng-click="randomStacked()">Randomize</button></h3>
+    <h3>Stacked <button class="btn btn-sm btn-primary" type="button" ng-click="randomStacked()">Randomize</button></h3>
     <progress><bar ng-repeat="bar in stacked" value="bar.value" type="{{bar.type}}"><span ng-hide="bar.value < 5">{{bar.value}}%</span></bar></progress>
 
 </div>
diff --git a/src/progressbar/test/progressbar.spec.js b/src/progressbar/test/progressbar.spec.js
@@ -10,7 +10,7 @@ describe('progressbar directive', function () {
     $rootScope.$digest();
   }));
 
-  var BAR_CLASS = 'bar';
+  var BAR_CLASS = 'progress-bar';
 
   function getBar(i) {
     return element.children().eq(i);

diff --git a/template/progressbar/bar.html b/template/progressbar/bar.html
@@ -1 +1 @@
-<div class="bar" ng-class="type && 'bar-' + type" ng-transclude></div>
+<div class="progress-bar" ng-class="type && 'progress-bar-' + type" ng-transclude></div>
diff --git a/template/progressbar/progressbar.html b/template/progressbar/progressbar.html
@@ -1 +1 @@
-<div class="progress"><div class="bar" ng-class="type && 'bar-' + type" ng-transclude></div></div>
+<div class="progress"><div class="progress-bar" ng-class="type && 'progress-bar-' + type" ng-transclude></div></div>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<div class="bar" ng-class="type && 'bar-' + type" ng-transclude></div>
		<div class="progress-bar" ng-class="type && 'progress-bar-' + type" ng-transclude></div>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<div class="progress"><div class="bar" ng-class="type && 'bar-' + type" ng-transclude></div></div>
		<div class="progress"><div class="progress-bar" ng-class="type && 'progress-bar-' + type" ng-transclude></div></div>