anjlab-bootstrap-rails 3.0.0.rc1 → 3.0.0.rc2

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

@@ -6,7 +6,9 @@
 // Reset the box-sizing
 // -------------------------
 
-* {
+*,
+*:before,
+*:after {
   @include box-sizing(border-box);
 }
 
@@ -83,7 +85,7 @@ img {
 
 // Perfect circle
 .img-circle {
-  border-radius: 500px; // crank the border-radius so it works with most reasonably sized images
+  border-radius: 50%; // set radius in percents
 }
 
 
@@ -97,3 +99,17 @@ hr {
   border-top: 1px solid $hr-border;
 }
 
+// Only display content to screen readers
+// See: http://a11yproject.com/posts/how-to-hide-content/
+// -------------------------
+
+.sr-only {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  margin: -1px;
+  padding: 0;
+  overflow: hidden;
+  clip: rect(0 0 0 0);
+  border: 0;
+}

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

@@ -162,7 +162,7 @@ table {
   > th.active,
   &.active > td,
   &.active > th  {
-    background-color: $table-bg-hover;
+    background-color: $table-bg-active;
   }
   > td.success,
   > th.success,

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

@@ -10,7 +10,7 @@
 // Can be `a`, `div`, or `img`
 .thumbnail,
 .img-thumbnail {
-  padding: 4px;
+  padding: $thumbnail-padding;
   line-height: $line-height-base;
   background-color: $thumbnail-bg;
   border: 1px solid $thumbnail-border;
@@ -37,6 +37,6 @@ a.thumbnail:focus {
   margin-right: auto;
 }
 .thumbnail .caption {
-  padding: 9px;
+  padding: $thumbnail-caption-padding;
   color: $thumbnail-caption-color;
 }

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

@@ -13,7 +13,7 @@
   line-height: 1.4;
   @include opacity(0);
 
-  &.in     { @include opacity(1); }
+  &.in     { @include opacity(.9); }
   &.top    { margin-top:  -3px; padding: 5px 0; }
   &.right  { margin-left:  3px; padding: 0 5px; }
   &.bottom { margin-top:   3px; padding: 5px 0; }

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

@@ -144,18 +144,25 @@ dt {
 dd {
   margin-left: 0; // Undo browser default
 }
-// Horizontal layout (like forms)
-.dl-horizontal {
-  dt {
-    float: left;
-    width: ($component-offset-horizontal - 20);
-    clear: left;
-    text-align: right;
-    @include text-overflow();
-  }
-  dd {
-    @include clearfix(); // Clear the floated `dt` if an empty `dd` is present
-    margin-left: $component-offset-horizontal;
+
+// Horizontal description lists
+//
+// Defaults to being stacked without any of the below styles applied, until the
+// grid breakpoint is reached (default of ~768px).
+
+@media (min-width: $grid-float-breakpoint) {
+  .dl-horizontal {
+    dt {
+      float: left;
+      width: ($component-offset-horizontal - 20);
+      clear: left;
+      text-align: right;
+      @include text-overflow();
+    }
+    dd {
+      margin-left: $component-offset-horizontal;
+      @include clearfix(); // Clear the floated `dt` if an empty `dd` is present
+    }
   }
 }
 
@@ -198,7 +205,6 @@ blockquote {
 
   // Float right with text-align: right
   &.pull-right {
-    float: right;
     padding-right: 15px;
     padding-left: 0;
     border-right: 5px solid $blockquote-border-color;

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

@@ -9,11 +9,12 @@
 .clearfix {
   @include clearfix();
 }
+
 .pull-right {
-  float: right;
+  @include pull-right;
 }
 .pull-left {
-  float: left;
+  @include pull-left;
 }
 
 

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

@@ -2,12 +2,13 @@
 // Variables
 // --------------------------------------------------
 
+
 // Media queries breakpoints
 // --------------------------------------------------
 
-// Tiny screen / phone
-$screen-tiny:                480px !default;
-$screen-phone:               $screen-tiny !default;
+// Extra small screen / phone
+$screen-xsmall:              480px !default;
+$screen-phone:               $screen-xsmall !default;
 
 // Small screen / tablet
 $screen-small:               768px !default;
@@ -17,26 +18,15 @@ $screen-tablet:              $screen-small !default;
 $screen-medium:              992px !default;
 $screen-desktop:             $screen-medium !default;
 
-// So media queries don't overlap when required, provide a maximum
-$screen-small-max:           ($screen-medium - 1) !default;
-$screen-tablet-max:          $screen-small-max !default;
-
 // Large screen / wide desktop
 $screen-large:               1200px !default;
 $screen-large-desktop:       $screen-large !default;
 
-
-// Container sizes
-// --------------------------------------------------
-
-// Small screen / tablet
-$container-tablet:          728px !default;
-
-// Medium screen / desktop
-$container-desktop:         940px !default;
-
-// Large screen / wide desktop
-$container-large-desktop:   1170px !default;
+// So media queries don't overlap when required, provide a maximum
+$screen-phone-max:           ($screen-small - 1) !default;
+$screen-small-max:           ($screen-medium - 1) !default;
+$screen-tablet-max:          ($screen-desktop - 1) !default;
+$screen-desktop-max:         ($screen-large-desktop - 1) !default;
 
 
 // Grid system
@@ -49,6 +39,7 @@ $grid-gutter-width:         30px !default;
 // Point at which the navbar stops collapsing
 $grid-float-breakpoint:     $screen-tablet !default;
 
+
 // Grays
 // -------------------------
 
@@ -103,21 +94,26 @@ $headings-line-height:    1.1 !default;
 // -------------------------
 // Based on 14px font-size and 1.428 line-height (~20px to start)
 
-$padding-base-vertical:          8px !default;
+$padding-base-vertical:          6px !default;
 $padding-base-horizontal:        12px !default;
 
-$padding-large-vertical:         14px !default;
+$padding-large-vertical:         10px !default;
 $padding-large-horizontal:       16px !default;
 
 $padding-small-vertical:         5px !default;
 $padding-small-horizontal:       10px !default;
 
+$line-height-large:              1.33 !default;
+$line-height-small:              1.5 !default;
+
 $border-radius-base:             4px !default;
 $border-radius-large:            6px !default;
 $border-radius-small:            3px !default;
 
 $component-active-bg:            $brand-primary !default;
 
+$caret-width-base:               4px !default;
+$caret-width-large:              5px !default;
 
 // Tables
 // -------------------------
@@ -136,31 +132,33 @@ $table-border-color:                 #ddd !default; // table and cell border
 // Buttons
 // -------------------------
 
-$btn-default-color:              #fff !default;
-$btn-default-bg:                 #474949 !default;
-$btn-default-border:             $btn-default-bg !default;
+$btn-font-weight:                bold !default;
+
+$btn-default-color:              #333 !default;
+$btn-default-bg:                 #fff !default;
+$btn-default-border:             #ccc !default;
 
-$btn-primary-color:              $btn-default-color !default;
+$btn-primary-color:              #fff !default;
 $btn-primary-bg:                 $brand-primary !default;
-$btn-primary-border:             $btn-primary-bg !default;
+$btn-primary-border:             darken($btn-primary-bg, 5%) !default;
 
-$btn-success-color:              $btn-default-color !default;
+$btn-success-color:              #fff !default;
 $btn-success-bg:                 $brand-success !default;
-$btn-success-border:             $btn-success-bg !default;
+$btn-success-border:             darken($btn-success-bg, 5%) !default;
 
-$btn-warning-color:              $btn-default-color !default;
+$btn-warning-color:              #fff !default;
 $btn-warning-bg:                 $brand-warning !default;
-$btn-warning-border:             $btn-warning-bg !default;
+$btn-warning-border:             darken($btn-warning-bg, 5%) !default;
 
-$btn-danger-color:               $btn-default-color !default;
+$btn-danger-color:               #fff !default;
 $btn-danger-bg:                  $brand-danger !default;
-$btn-danger-border:              $btn-danger-bg !default;
+$btn-danger-border:              darken($btn-danger-bg, 5%) !default;
 
-$btn-info-color:                 $btn-default-color !default;
+$btn-info-color:                 #fff !default;
 $btn-info-bg:                    $brand-info !default;
-$btn-info-border:                $btn-info-bg !default;
+$btn-info-border:                darken($btn-info-bg, 5%) !default;
 
-$btn-hover-color:                $btn-default-color !default;
+$btn-link-disabled-color:        $gray-light !default;
 
 
 // Forms
@@ -169,17 +167,21 @@ $btn-hover-color:                $btn-default-color !default;
 $input-bg:                       #fff !default;
 $input-bg-disabled:              $gray-lighter !default;
 
+$input-color:                    $gray !default;
 $input-border:                   #ccc !default;
 $input-border-radius:            $border-radius-base !default;
+$input-border-focus:             #66afe9 !default;
 
 $input-color-placeholder:        $gray-light !default;
 
-$input-height-base:              ($line-height-computed + ($padding-base-vertical * 2) + 2);
-$input-height-large:             (ceil($font-size-large * $line-height-base) + ($padding-large-vertical * 2) + 2);
-$input-height-small:             (ceil($font-size-small * $line-height-base) + ($padding-small-vertical * 2) + 2);
+$input-height-base:              ($line-height-computed + ($padding-base-vertical * 2) + 2) !default;
+$input-height-large:             (floor($font-size-large * $line-height-large) + ($padding-large-vertical * 2) + 2) !default;
+$input-height-small:             (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2) !default;
 
+$legend-color:                   $gray-dark !default;
 $legend-border-color:            #e5e5e5 !default;
 
+$input-group-addon-bg:           $gray-lighter !default;
 $input-group-addon-border-color: $input-border !default;
 
 
@@ -198,6 +200,10 @@ $dropdown-link-color:            $gray-dark !default;
 $dropdown-link-hover-color:      #fff !default;
 $dropdown-link-hover-bg:         $dropdown-link-active-bg !default;
 
+$dropdown-link-disabled-color:   $gray-light !default;
+
+$dropdown-header-color:          $gray-light !default;
+
 $dropdown-caret-color:           #000 !default;
 
 
@@ -224,9 +230,12 @@ $zindex-modal:             1050 !default;
 
 // Basics of a navbar
 $navbar-height:                    50px !default;
+$navbar-margin-bottom:             $line-height-computed !default;
 $navbar-color:                     #777 !default;
-$navbar-bg:                        #eee !default;
-$navbar-padding-horizontal:        floor($grid-gutter-width / 2) !default;  // ~15px
+$navbar-bg:                        #f8f8f8 !default;
+$navbar-border:                    darken($navbar-bg, 6.5%) !default;
+$navbar-border-radius:             $border-radius-base !default;
+$navbar-padding-horizontal:        floor($grid-gutter-width / 2) !default;
 $navbar-padding-vertical:          (($navbar-height - $line-height-computed) / 2) !default;
 
 // Navbar links
@@ -234,7 +243,7 @@ $navbar-link-color:                #777 !default;
 $navbar-link-hover-color:          #333 !default;
 $navbar-link-hover-bg:             transparent !default;
 $navbar-link-active-color:         #555 !default;
-$navbar-link-active-bg:            darken($navbar-bg, 10%) !default;
+$navbar-link-active-bg:            darken($navbar-bg, 6.5%) !default;
 $navbar-link-disabled-color:       #ccc !default;
 $navbar-link-disabled-bg:          transparent !default;
 
@@ -253,6 +262,7 @@ $navbar-toggle-border-color:       #ddd !default;
 // Reset inverted navbar basics
 $navbar-inverse-color:                      $gray-light !default;
 $navbar-inverse-bg:                         #222 !default;
+$navbar-inverse-border:                     darken($navbar-inverse-bg, 10%) !default;
 
 // Inverted navbar links
 $navbar-inverse-link-color:                 $gray-light !default;
@@ -357,7 +367,7 @@ $state-info-border:              darken(adjust-hue($state-info-bg, -10%), 7%) !d
 // -------------------------
 $tooltip-max-width:           200px !default;
 $tooltip-color:               #fff !default;
-$tooltip-bg:                  rgba(0,0,0,.9) !default;
+$tooltip-bg:                  #000 !default;
 
 $tooltip-arrow-width:         5px !default;
 $tooltip-arrow-color:         $tooltip-bg !default;
@@ -382,6 +392,8 @@ $popover-arrow-outer-fallback-color:  #999 !default;
 
 // Labels
 // -------------------------
+
+$label-default-bg:            $gray-light !default;
 $label-success-bg:            $brand-success !default;
 $label-info-bg:               $brand-info !default;
 $label-warning-bg:            $brand-warning !default;
@@ -409,10 +421,13 @@ $modal-footer-border-color:   $modal-header-border-color !default;
 
 // Alerts
 // -------------------------
+$alert-padding:               15px !default;
+$alert-border-radius:         $border-radius-base !default;
+$alert-link-font-weight:      bold !default;
+
 $alert-bg:                    $state-warning-bg !default;
 $alert-text:                  $state-warning-text !default;
 $alert-border:                $state-warning-border !default;
-$alert-border-radius:         $border-radius-base !default;
 
 $alert-success-bg:            $state-success-bg !default;
 $alert-success-text:          $state-success-text !default;
@@ -485,10 +500,12 @@ $panel-info-heading-bg:       $state-info-bg !default;
 
 // Thumbnails
 // -------------------------
-$thumbnail-caption-color:     $text-color !default;
+$thumbnail-padding:           4px !default;
 $thumbnail-bg:                $body-bg !default;
 $thumbnail-border:            #ddd !default;
 $thumbnail-border-radius:     $border-radius-base !default;
+$thumbnail-caption-color:     $text-color !default;
+$thumbnail-caption-padding:   9px !default;
 
 
 // Wells
@@ -505,11 +522,15 @@ $accordion-border-color:      #e5e5e5 !default;
 // -------------------------
 $badge-color:                 #fff !default;
 $badge-link-hover-color:      #fff !default;
-
 $badge-bg:                    $gray-light !default;
+
 $badge-active-color:          $link-color !default;
 $badge-active-bg:             #fff !default;
 
+$badge-font-weight:           bold !default;
+$badge-line-height:           1 !default;
+$badge-border-radius:         10px !default;
+
 
 // Breadcrumbs
 // -------------------------
@@ -523,9 +544,12 @@ $breadcrumb-active-color:     $gray-light !default;
 $carousel-text-shadow:                        0 1px 2px rgba(0,0,0,.6) !default;
 
 $carousel-control-color:                      #fff !default;
+$carousel-control-width:                      15% !default;
+$carousel-control-opacity:                    .5 !default;
+$carousel-control-font-size:                  20px !default;
 
-$carousel-indicator-border-color:             #fff !default;
 $carousel-indicator-active-bg:                #fff !default;
+$carousel-indicator-border-color:             #fff !default;
 
 $carousel-caption-color:                      #fff !default;
 
@@ -533,6 +557,7 @@ $carousel-caption-color:                      #fff !default;
 // Close
 // ------------------------
 $close-color:                 #000 !default;
+$close-font-weight:           bold !default;
 $close-text-shadow:           0 1px 0 #fff !default;
 
 
@@ -542,7 +567,9 @@ $code-color:                  #c7254e !default;
 $code-bg:                     #f9f2f4 !default;
 
 $pre-bg:                      #f5f5f5 !default;
+$pre-color:                   $gray-dark !default;
 $pre-border-color:            #ccc !default;
+$pre-scrollable-max-height:   340px !default;
 
 // Type
 // ------------------------
@@ -561,3 +588,16 @@ $hr-border:                   $gray-lighter !default;
 
 // Horizontal forms & lists
 $component-offset-horizontal: 180px !default;
+
+
+// Container sizes
+// --------------------------------------------------
+
+// Small screen / tablet
+$container-tablet:          720px !default;
+
+// Medium screen / desktop
+$container-desktop:         940px !default;
+
+// Large screen / wide desktop
+$container-large-desktop:   1140px !default;

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

@@ -19,11 +19,11 @@
 }
 
 // Sizes
-.well-large {
+.well-lg {
   padding: 24px;
   border-radius: $border-radius-large;
 }
-.well-small {
+.well-sm {
   padding: 9px;
   border-radius: $border-radius-small;
 }