feat(carousel): some changes for Bootstrap3

angular-ui · Dec 28, 2013 · 1f632b6 · 1f632b6
1 parent dbae55a
commit 1f632b6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/src/carousel/docs/demo.html b/src/carousel/docs/demo.html
@@ -8,18 +8,12 @@ <h4>Slide {{$index}}</h4>
       </div>
     </slide>
   </carousel>
-  <div class="row-fluid">
-    <div class="span6">
-      <ul>
-        <li ng-repeat="slide in slides">
-          <button class="btn btn-mini" ng-class="{'btn-info': !slide.active, 'btn-success': slide.active}" ng-disabled="slide.active" ng-click="slide.active = true">select</button>
-          {{$index}}: {{slide.text}}
-        </li>
-      </ul>
-      <a class="btn" ng-click="addSlide()">Add Slide</a>
+  <div class="row">
+    <div class="col-md-6">
+      <a class="btn btn-info" ng-click="addSlide()">Add Slide</a>
     </div>
-    <div class="span6">
-      Interval, in milliseconds: <input type="number" ng-model="myInterval">
+    <div class="col-md-6">
+      Interval, in milliseconds: <input type="number" class="form-control" ng-model="myInterval">
       <br />Enter a negative number to stop the interval.
     </div>
   </div>

diff --git a/template/carousel/carousel.html b/template/carousel/carousel.html
@@ -3,6 +3,6 @@
         <li ng-repeat="slide in slides()" ng-class="{active: isActive(slide)}" ng-click="select(slide)"></li>
     </ol>
     <div class="carousel-inner" ng-transclude></div>
-    <a ng-click="prev()" class="carousel-control left" ng-show="slides().length > 1">&lsaquo;</a>
-    <a ng-click="next()" class="carousel-control right" ng-show="slides().length > 1">&rsaquo;</a>
+    <a class="left carousel-control" ng-click="prev()" ng-show="slides().length > 1"><span class="icon-prev"></span></a>
+    <a class="right carousel-control" ng-click="next()" ng-show="slides().length > 1"><span class="icon-next"></span></a>
 </div>