anjlab-bootstrap-rails 3.0.0.0.alpha1 → 3.0.0.rc1

data/{vendor → app}/assets/javascripts/twitter/bootstrap/transition.js

@@ -1,6 +1,6 @@
 /* ========================================================================
  * Bootstrap: transition.js v3.0.0
- * http://twitter.github.com/bootstrap/javascript.html#transitions
+ * http://twbs.github.com/bootstrap/javascript.html#transitions
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
  *
@@ -40,6 +40,15 @@
     }
   }
 
+  // http://blog.alexmaccaw.com/css-transitions
+  $.fn.emulateTransitionEnd = function (duration) {
+    var called = false, $el    = this
+    $(this).one('webkitTransitionEnd', function () { called = true })
+    var callback = function () { if (!called) $($el).trigger('webkitTransitionEnd') }
+    setTimeout(callback, duration)
+    return this
+  }
+
   $(function () {
     $.support.transition = transitionEnd()
   })

data/{vendor → app}/assets/stylesheets/twitter/bootstrap/_accordion.scss

@@ -11,24 +11,21 @@
 // Group == heading + body
 .accordion-group {
   margin-bottom: 2px;
-  border: 1px solid #e5e5e5;
+  border: 1px solid $accordion-border-color;
   border-radius: $border-radius-base;
 }
 .accordion-heading {
   border-bottom: 0;
-}
-.accordion-heading .accordion-toggle {
-  display: block;
-  padding: 8px 15px;
-}
 
-// General toggle styles
-.accordion-toggle {
-  cursor: pointer;
+  .accordion-toggle {
+    display: block;
+    padding: 8px 15px;
+    cursor: pointer;
+  }
 }
 
 // Inner needs the styles because you can't animate properly with any styles on the element
 .accordion-inner {
   padding: 9px 15px;
-  border-top: 1px solid #e5e5e5;
+  border-top: 1px solid $accordion-border-color;
 }

data/{vendor → app}/assets/stylesheets/twitter/bootstrap/_alerts.scss

@@ -43,37 +43,13 @@
 // -------------------------
 
 .alert-success {
-  background-color: $alert-success-bg;
-  border-color: $alert-success-border;
-  color: $alert-success-text;
-  hr {
-    border-top-color: darken($alert-success-border, 5%);
-  }
-  .alert-link {
-    color: darken($alert-success-text, 10%);
-  }
+  @include alert-variant($alert-success-bg, $alert-success-border, $alert-success-text);
 }
 .alert-danger {
-  background-color: $alert-danger-bg;
-  border-color: $alert-danger-border;
-  color: $alert-danger-text;
-  hr {
-    border-top-color: darken($alert-danger-border, 5%);
-  }
-  .alert-link {
-    color: darken($alert-danger-text, 10%);
-  }
+  @include alert-variant($alert-danger-bg, $alert-danger-border, $alert-danger-text);
 }
 .alert-info {
-  background-color: $alert-info-bg;
-  border-color: $alert-info-border;
-  color: $alert-info-text;
-  hr {
-    border-top-color: darken($alert-info-border, 5%);
-  }
-  .alert-link {
-    color: darken($alert-info-text, 10%);
-  }
+  @include alert-variant($alert-info-bg, $alert-info-border, $alert-info-text);
 }
 
 // Block alerts
@@ -82,11 +58,12 @@
 .alert-block {
   padding-top: 15px;
   padding-bottom: 15px;
-}
-.alert-block > p,
-.alert-block > ul {
-  margin-bottom: 0;
-}
-.alert-block p + p {
-  margin-top: 5px;
+
+  > p,
+  > ul {
+    margin-bottom: 0;
+  }
+  p + p {
+    margin-top: 5px;
+  }
 }

data/{vendor → app}/assets/stylesheets/twitter/bootstrap/_badges.scss

@@ -10,12 +10,12 @@
   padding: 3px 7px;
   font-size: $font-size-small;
   font-weight: bold;
-  color: #fff;
+  color: $badge-color;
   line-height: 1;
   vertical-align: middle;
   white-space: nowrap;
   text-align: center;
-  background-color: $gray-light;
+  background-color: $badge-bg;
   border-radius: 10px;
 
   // Empty labels/badges collapse
@@ -28,30 +28,23 @@
 a.badge {
   &:hover,
   &:focus {
-    color: #fff;
+    color: $badge-link-hover-color;
     text-decoration: none;
     cursor: pointer;
   }
 }
 
 // Quick fix for labels/badges in buttons
-.btn {
-  .badge {
-    position: relative;
-    top: -1px;
-  }
-}
-.btn-mini {
-  .badge {
-    top: 0;
-  }
+.btn .badge {
+  position: relative;
+  top: -1px;
 }
 
 // Account for counters in navs
 a.list-group-item.active > .badge,
 .nav-pills > .active > a > .badge {
-  color: $link-color;
-  background-color: #fff;
+  color: $badge-active-color;
+  background-color: $badge-active-bg;
 }
 .nav-pills > li > a > .badge {
   margin-left: 3px;

data/{vendor → app}/assets/stylesheets/twitter/bootstrap/_bootstrap.scss

@@ -28,7 +28,6 @@
 
 // Components: common
 @import "component-animations";
-@import "glyphicons";
 @import "dropdowns";
 @import "list-group";
 @import "panels";

data/app/assets/stylesheets/twitter/bootstrap/_breadcrumbs.scss

@@ -0,0 +1,23 @@
+//
+// Breadcrumbs
+// --------------------------------------------------
+
+
+.breadcrumb {
+  padding: 8px 15px;
+  margin-bottom: $line-height-computed;
+  list-style: none;
+  background-color: $breadcrumb-bg;
+  border-radius: $border-radius-base;
+  > li {
+    display: inline-block;
+    &+li:before {
+      content: "/\00a0"; // Unicode space added since inline-block means non-collapsing white-space
+      padding: 0 5px;
+      color: $breadcrumb-color;
+    }
+  }
+  > .active {
+    color: $breadcrumb-active-color;
+  }
+}

data/{vendor → app}/assets/stylesheets/twitter/bootstrap/_button-groups.scss

@@ -40,11 +40,12 @@
     float: left;
   }
   // Space out series of button groups
-  > .btn + .btn,
-  > .btn-group + .btn,
-  > .btn + .btn-group,
-  > .btn-group + .btn-group {
-    margin-left: 5px;
+  > .btn,
+  > .btn-group {
+    + .btn,
+    + .btn-group {
+      margin-left: 5px;
+    }
   }
 }
 
@@ -72,9 +73,11 @@
 .btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {
   border-radius: 0;
 }
-.btn-group > .btn-group:first-child > .btn:last-child,
-.btn-group > .btn-group:first-child > .dropdown-toggle {
-  @include border-right-radius(0);
+.btn-group > .btn-group:first-child {
+  > .btn:last-child,
+  > .dropdown-toggle {
+    @include border-right-radius(0);
+  }
 }
 .btn-group > .btn-group:last-child > .btn:first-child {
   @include border-left-radius(0);
@@ -96,10 +99,6 @@
   padding-left: 8px;
   padding-right: 8px;
 }
-.btn-group > .btn-mini + .dropdown-toggle {
-  padding-left: 5px;
-  padding-right: 5px;
-}
 .btn-group > .btn-large + .dropdown-toggle {
   padding-left: 12px;
   padding-right: 12px;
@@ -138,14 +137,16 @@
     margin-top: -1px;
   }
 }
-.btn-group-vertical .btn:not(:first-child):not(:last-child) {
-  border-radius: 0;
-}
-.btn-group-vertical .btn:first-child {
-  @include border-bottom-radius(0);
-}
-.btn-group-vertical .btn:last-child {
-  @include border-top-radius(0);
+.btn-group-vertical .btn {
+  &:not(:first-child):not(:last-child) {
+    border-radius: 0;
+  }
+  &:first-child {
+    @include border-bottom-radius(0);
+  }
+  &:last-child {
+    @include border-top-radius(0);
+  }
 }
 
 
@@ -164,7 +165,7 @@
 
 
 // Checkbox and radio options
-.btn-group[data-toggle="buttons-radio"] > .btn > input[type="radio"],
-.btn-group[data-toggle="buttons-checkbox"] > .btn > input[type="checkbox"] {
+.btn-group[data-toggle="buttons"] > .btn > input[type="radio"],
+.btn-group[data-toggle="buttons"] > .btn > input[type="checkbox"] {
   display: none;
 }

data/{vendor → app}/assets/stylesheets/twitter/bootstrap/_buttons.scss

@@ -27,14 +27,13 @@
 
   &:hover,
   &:focus {
-    color: #fff;
+    color: $btn-hover-color;
     text-decoration: none;
   }
 
   &:active,
   &.active {
     outline: 0;
-    background-image: none;
     @include box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
   }
 
@@ -81,33 +80,31 @@
 // -------------------------
 
 // Make a button look and behave like a link
-.btn-link,
-.btn-link:active,
-.btn-link[disabled],
-fieldset[disabled] .btn-link {
-  background-color: transparent;
-  background-image: none;
-  @include box-shadow(none);
-}
-.btn-link,
-.btn-link:hover,
-.btn-link:focus,
-.btn-link:active {
-  border-color: transparent;
-}
 .btn-link {
   color: $link-color;
   font-weight: normal;
   cursor: pointer;
   border-radius: 0;
-}
-.btn-link:hover,
-.btn-link:focus {
-  color: $link-hover-color;
-  text-decoration: underline;
-  background-color: transparent;
-}
-.btn-link {
+
+  &,
+  &:active,
+  &[disabled],
+  fieldset[disabled] & {
+    background-color: transparent;
+    @include box-shadow(none);
+  }
+  &,
+  &:hover,
+  &:focus,
+  &:active {
+    border-color: transparent;
+  }
+  &:hover,
+  &:focus {
+    color: $link-hover-color;
+    text-decoration: underline;
+    background-color: transparent;
+  }
   &[disabled],
   fieldset[disabled] & {
     &:hover,

data/{vendor → app}/assets/stylesheets/twitter/bootstrap/_carousel.scss

@@ -8,15 +8,10 @@
   position: relative;
 }
 
-// Wrap all slides, but only show the active one
 .carousel-inner {
   position: relative;
   overflow: hidden;
   width: 100%;
-}
-
-// Immediate parent of all slides
-.carousel-inner {
 
   > .item {
     display: none;
@@ -26,7 +21,7 @@
     // Account for jankitude on images
     > img,
     > a > img {
-      display: block;
+      @include img-responsive();
       line-height: 1;
     }
   }
@@ -77,39 +72,36 @@
   width: 15%;
   @include opacity(.5);
   font-size: 20px;
-  color: #fff;
+  color: $carousel-control-color;
   text-align: center;
-  text-shadow: 0 1px 2px rgba(0,0,0,.6);
-
-  // we can't have this transition here
-  // because webkit cancels the carousel
-  // animation if you trip this while
-  // in the middle of another animation
-  // ;_;
-  // .transition(opacity .2s linear);
+  text-shadow: $carousel-text-shadow;
+  // We can't have this transition here because webkit cancels the carousel
+  // animation if you trip this while in the middle of another animation.
 
   // Set gradients for backgrounds
   &.left {
-    @include gradient-horizontal(rgba(0,0,0,.5), rgba(0,0,0,.0001));
+    @include gradient-horizontal($start-color: rgba(0,0,0,.5), $end-color: rgba(0,0,0,.0001));
     background-color: transparent;
   }
   &.right {
     left: auto;
     right: 0;
-    @include gradient-horizontal(rgba(0,0,0,.0001), rgba(0,0,0,.5));
+    @include gradient-horizontal($start-color: rgba(0,0,0,.0001), $end-color: rgba(0,0,0,.5));
     background-color: transparent;
   }
 
   // Hover/focus state
   &:hover,
   &:focus {
-    color: #fff;
+    color: $carousel-control-color;
     text-decoration: none;
     @include opacity(.9);
   }
 
   // Toggles
-  .glyphicon {
+  .glyphicon,
+  .icon-prev,
+  .icon-next {
     position: absolute;
     top: 50%;
     left: 50%;
@@ -119,6 +111,18 @@
     height: 20px;
     margin-top: -10px;
     margin-left: -10px;
+    font-family: serif;
+  }
+  // Non-glyphicon toggles
+  .icon-prev {
+    &:before {
+      content: '\2039';// SINGLE LEFT-POINTING ANGLE QUOTATION MARK (U+2039)
+    }
+  }
+  .icon-next {
+    &:before {
+      content: '\203a';// SINGLE RIGHT-POINTING ANGLE QUOTATION MARK (U+203A)
+    }
   }
 }
 
@@ -126,27 +130,30 @@
 // -----------------------------
 .carousel-indicators {
   position: absolute;
-  bottom: 20px;
+  bottom: 10px;
   left: 50%;
   z-index: 15;
-  width: 100px;
-  margin: 0 0 0 -50px;
+  width: 120px;
+  margin-left: -60px;
+  padding-left: 0;
   list-style: none;
   text-align: center;
 
   li {
     display: inline-block;
-    width: 8px;
-    height: 8px;
-    margin-left: 0;
-    margin-right: 0;
+    width:  10px;
+    height: 10px;
+    margin: 1px;
     text-indent: -999px;
-    border: 1px solid #fff;
-    border-radius: 5px;
+    border: 1px solid $carousel-indicator-border-color;
+    border-radius: 10px;
     cursor: pointer;
   }
   .active {
-    background-color: #fff;
+    margin: 0;
+    width:  12px;
+    height: 12px;
+    background-color: $carousel-indicator-active-bg;
   }
 }
 
@@ -161,9 +168,9 @@
   z-index: 10;
   padding-top: 20px;
   padding-bottom: 20px;
-  color: #fff;
+  color: $carousel-caption-color;
   text-align: center;
-  text-shadow: 0 1px 2px rgba(0,0,0,.6);
+  text-shadow: $carousel-text-shadow;
   & .btn {
     text-shadow: none; // No shadow for button elements in carousel-caption
   }
@@ -174,7 +181,9 @@
 @media screen and (min-width: $screen-tablet) {
 
   // Scale up the controls a smidge
-  .carousel-control .glyphicon {
+  .carousel-control .glyphicon,
+  .carousel-control .icon-prev,
+  .carousel-control .icon-next {
     width: 30px;
     height: 30px;
     margin-top: -15px;
@@ -188,4 +197,9 @@
     right: 20%;
     padding-bottom: 30px;
   }
+
+  // Move up the indicators
+  .carousel-indicators {
+    bottom: 20px;
+  }
 }