bootstrap-sass-rails 2.3.2.1 → 3.0.0.0.rc1

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

@@ -1,123 +1,108 @@
-/* Partial: twitter/bootstrap/_pagination.scss */
 //
 // Pagination (multiple pages)
 // --------------------------------------------------
-
-// Space out pagination from surrounding content
 .pagination {
-  margin: $baseLineHeight 0;
- }
-.pagination ul {
-  // Allow for text-based alignment
   display: inline-block;
-  @include ie7-inline-block();
-  // Reset default ul styles
-  margin-left: 0;
-  margin-bottom: 0;
-  // Visuals
-  @include border-radius($baseBorderRadius);
-  @include box-shadow(0 1px 2px rgba(0,0,0,.05));
-}
-.pagination ul > li {
-  display: inline; // Remove list-style and block-level defaults
-}
-.pagination ul > li > a,
-.pagination ul > li > span {
-  float: left; // Collapse white-space
-  padding: 4px 12px;
-  line-height: $baseLineHeight;
-  text-decoration: none;
-  background-color: $paginationBackground;
-  border: 1px solid $paginationBorder;
-  border-left-width: 0;
-}
-.pagination ul > li > a:hover,
-.pagination ul > li > a:focus,
-.pagination ul > .active > a,
-.pagination ul > .active > span {
-  background-color: $paginationActiveBackground;
-}
-.pagination ul > .active > a,
-.pagination ul > .active > span {
-  color: $grayLight;
-  cursor: default;
-}
-.pagination ul > .disabled > span,
-.pagination ul > .disabled > a,
-.pagination ul > .disabled > a:hover,
-.pagination ul > .disabled > a:focus {
-  color: $grayLight;
-  background-color: transparent;
-  cursor: default;
-}
-.pagination ul > li:first-child > a,
-.pagination ul > li:first-child > span {
-  border-left-width: 1px;
-  @include border-left-radius($baseBorderRadius);
-}
-.pagination ul > li:last-child > a,
-.pagination ul > li:last-child > span {
-  @include border-radius(0 3px 3px 0);
-}
-
-
-// Alignment
-// --------------------------------------------------
-
-.pagination-centered {
-  text-align: center;
-}
-.pagination-right {
-  text-align: right;
+  padding-left: 0;
+  margin: $line-height-computed 0;
+  border-radius: $border-radius-base;
+  
+  > li {
+    display: inline; // Remove list-style and block-level defaults
+    > a,
+    > span {
+      float: left; // Collapse white-space
+      padding: 4px 12px;
+      line-height: $line-height-base;
+      text-decoration: none;
+      background-color: $pagination-bg;
+      border: 1px solid $pagination-border;
+      border-left-width: 0;
+    }
+    &:first-child {
+      > a,
+      > span {
+        border-left-width: 1px;
+        @include border-left-radius($border-radius-base);
+      }
+    }
+    &:last-child {
+      > a,
+      > span {
+        @include border-right-radius($border-radius-base);
+      }
+    }
+  }
+  
+  > li > a:hover,
+  > li > a:focus,
+  > .active > a,
+  > .active > span {
+    background-color: $pagination-active-bg;
+  }
+  > .active > a,
+  > .active > span {
+    color: $pagination-active-color;
+    cursor: default;
+  }
+  
+  > .disabled {
+    > span,
+    > a,
+    > a:hover,
+    > a:focus {
+      color: $pagination-disabled-color;
+      background-color: $pagination-bg;
+      cursor: not-allowed;
+    }
+  }
 }
 
-
 // Sizing
 // --------------------------------------------------
 
 // Large
 .pagination-large {
-  ul > li > a,
-  ul > li > span {
-    padding: $paddingLarge;
-    font-size: $fontSizeLarge;
-  }
-  ul > li:first-child > a,
-  ul > li:first-child > span {
-    @include border-left-radius($borderRadiusLarge);
-  }
-  ul > li:last-child > a,
-  ul > li:last-child > span {
-    @include border-right-radius($borderRadiusLarge);
-  }
-}
-
-// Small and mini
-.pagination-mini,
-.pagination-small {
-  ul > li:first-child > a,
-  ul > li:first-child > span {
-    @include border-left-radius($borderRadiusSmall);
-  }
-  ul > li:last-child > a,
-  ul > li:last-child > span {
-    @include border-right-radius($borderRadiusSmall);
+  > li {
+    > a,
+    > span {
+      padding: $padding-large-vertical $padding-large-horizontal;
+      font-size: $font-size-large;
+    }
+    &:first-child {
+      > a,
+      > span {
+        @include border-left-radius($border-radius-large);
+      }
+    }
+    &:last-child {
+      > a,
+      > span {
+        @include border-right-radius($border-radius-large);
+      }
+    }
   }
 }
 
 // Small
 .pagination-small {
-  ul > li > a,
-  ul > li > span {
-    padding: $paddingSmall;
-    font-size: $fontSizeSmall;
-  }
-}
-// Mini
-.pagination-mini {
-  ul > li > a,
-  ul > li > span {
-    padding: $paddingMini;
-    font-size: $fontSizeMini;
+  > li {
+    > a,
+    > span {
+      padding: $padding-small-vertical $padding-small-horizontal;
+      font-size: $font-size-small;
+    }
+    &:first-child {
+      > a,
+      > span {
+        @include border-left-radius($border-radius-small);
+      }
+    }
+    &:last-child {
+      > a,
+      > span {
+        @include border-right-radius($border-radius-small);
+      }
+    }
   }
 }

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

@@ -0,0 +1,102 @@
+//
+// Panels
+// --------------------------------------------------
+
+
+// Base class
+.panel {
+  padding: 15px;
+  margin-bottom: 20px;
+  background-color: $panel-bg;
+  border: 1px solid $panel-border;
+  border-radius: $panel-border-radius;
+  @include box-shadow(0 1px 1px rgba(0,0,0,.05));
+}
+
+// Optional heading
+.panel-heading {
+  margin: -15px -15px 15px;
+  padding: 10px 15px;
+  background-color: $panel-heading-bg;
+  border-bottom: 1px solid $panel-border;
+  border-top-left-radius:  ($panel-border-radius - 1);
+  border-top-right-radius: ($panel-border-radius - 1);
+}
+
+// Within heading, strip any `h*` tag of it's default margins for spacing.
+.panel-title {
+  margin-top: 0;
+  margin-bottom: 0;
+  font-size: ($font-size-base * 1.25);
+  font-weight: 500;
+}
+
+// Optional footer (stays gray in every modifier class)
+.panel-footer {
+  margin: 15px -15px -15px;
+  padding: 10px 15px;
+  background-color: $panel-footer-bg;
+  border-top: 1px solid $panel-border;
+  border-bottom-left-radius:  ($panel-border-radius - 1);
+  border-bottom-right-radius: ($panel-border-radius - 1);
+}
+
+// Contextual variations
+.panel-primary {
+  border-color: $panel-primary-border;
+  .panel-heading {
+    color: $panel-primary-text;
+    background-color: $panel-primary-heading-bg;
+    border-color: $panel-primary-border;
+  }
+}
+.panel-success {
+  border-color: $panel-success-border;
+  .panel-heading {
+    color: $panel-success-text;
+    background-color: $panel-success-heading-bg;
+    border-color: $panel-success-border;
+  }
+}
+.panel-warning {
+  border-color: $panel-warning-border;
+  .panel-heading {
+    color: $panel-warning-text;
+    background-color: $panel-warning-heading-bg;
+    border-color: $panel-warning-border;
+  }
+}
+.panel-danger {
+  border-color: $panel-danger-border;
+  .panel-heading {
+    color: $panel-danger-text;
+    background-color: $panel-danger-heading-bg;
+    border-color: $panel-danger-border;
+  }
+}
+.panel-info {
+  border-color: $panel-info-border;
+  .panel-heading {
+    color: $panel-info-text;
+    background-color: $panel-info-heading-bg;
+    border-color: $panel-info-border;
+  }
+}
+
+// List groups in panels
+.list-group-flush {
+  margin: 15px -15px -15px;
+
+  .list-group-item {
+    border-width: 1px 0;
+
+    // Remove border radius for top one
+    &:first-child {
+      @include border-top-radius(0);
+    }
+    // But keep it for the last one
+    &:last-child {
+      border-bottom: 0;
+    }
+  }
+}

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

@@ -1,4 +1,3 @@
-/* Partial: twitter/bootstrap/_popovers.scss */
 //
 // Popovers
 // --------------------------------------------------
@@ -8,19 +7,19 @@
   position: absolute;
   top: 0;
   left: 0;
-  z-index: $zindexPopover;
+  z-index: $zindex-popover;
   display: none;
-  max-width: 276px;
+  max-width: $popover-max-width;
   padding: 1px;
   text-align: left; // Reset given new insertion method
-  background-color: $popoverBackground;
-  -webkit-background-clip: padding-box;
-     -moz-background-clip: padding;
-          background-clip: padding-box;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0,0,0,.2);
-  @include border-radius(6px);
-  @include box-shadow(0 5px 10px rgba(0,0,0,0.2));
+  background-color: $popover-bg;
+  -webkit-bg-clip: padding-box;
+     -moz-bg-clip: padding;
+  background-clip: padding-box;
+  border: 1px solid $popover-fallback-border-color;
+  border: 1px solid $popover-border-color;
+  border-radius: $border-radius-large;
+  @include box-shadow(0 5px 10px rgba(0,0,0,.2));
 
   // Overrides for proper insertion
   white-space: normal;
@@ -30,22 +29,17 @@
   &.right   { margin-left: 10px; }
   &.bottom  { margin-top: 10px; }
   &.left    { margin-left: -10px; }
-
 }
 
 .popover-title {
   margin: 0; // reset heading margin
   padding: 8px 14px;
-  font-size: 14px;
+  font-size: $font-size-base;
   font-weight: normal;
   line-height: 18px;
-  background-color: $popoverTitleBackground;
-  border-bottom: 1px solid darken($popoverTitleBackground, 5%);
-  @include border-radius(5px 5px 0 0);
-
-  &:empty {
-    display: none;
-  }
+  background-color: $popover-title-bg;
+  border-bottom: 1px solid darken($popover-title-bg, 5%);
+  border-radius: 5px 5px 0 0;
 }
 
 .popover-content {
@@ -56,78 +50,85 @@
 //
 // .arrow is outer, .arrow:after is inner
 
-.popover .arrow,
-.popover .arrow:after {
-  position: absolute;
-  display: block;
-  width: 0;
-  height: 0;
-  border-color: transparent;
-  border-style: solid;
+.popover .arrow {
+  &,
+  &:after {
+    position: absolute;
+    display: block;
+    width: 0;
+    height: 0;
+    border-color: transparent;
+    border-style: solid;
+  }
 }
 .popover .arrow {
-  border-width: $popoverArrowOuterWidth;
+  border-width: $popover-arrow-outer-width;
 }
 .popover .arrow:after {
-  border-width: $popoverArrowWidth;
+  border-width: $popover-arrow-width;
   content: "";
 }
 
 .popover {
   &.top .arrow {
     left: 50%;
-    margin-left: -$popoverArrowOuterWidth;
+    margin-left: -$popover-arrow-outer-width;
     border-bottom-width: 0;
-    border-top-color: #999; // IE8 fallback
-    border-top-color: $popoverArrowOuterColor;
-    bottom: -$popoverArrowOuterWidth;
+    border-top-color: $popover-arrow-outer-fallback-color; // IE8 fallback
+    border-top-color: $popover-arrow-outer-color;
+    bottom: -$popover-arrow-outer-width;
     &:after {
+      content: " ";
       bottom: 1px;
-      margin-left: -$popoverArrowWidth;
+      margin-left: -$popover-arrow-width;
       border-bottom-width: 0;
-      border-top-color: $popoverArrowColor;
+      border-top-color: $popover-arrow-color;
     }
   }
   &.right .arrow {
     top: 50%;
-    left: -$popoverArrowOuterWidth;
-    margin-top: -$popoverArrowOuterWidth;
+    left: -$popover-arrow-outer-width;
+    margin-top: -$popover-arrow-outer-width;
     border-left-width: 0;
-    border-right-color: #999; // IE8 fallback
-    border-right-color: $popoverArrowOuterColor;
+    border-right-color: $popover-arrow-outer-fallback-color; // IE8 fallback
+    border-right-color: $popover-arrow-outer-color;
     &:after {
+      content: " ";
       left: 1px;
-      bottom: -$popoverArrowWidth;
+      bottom: -$popover-arrow-width;
       border-left-width: 0;
-      border-right-color: $popoverArrowColor;
+      border-right-color: $popover-arrow-color;
     }
   }
   &.bottom .arrow {
     left: 50%;
-    margin-left: -$popoverArrowOuterWidth;
+    margin-left: -$popover-arrow-outer-width;
     border-top-width: 0;
-    border-bottom-color: #999; // IE8 fallback
-    border-bottom-color: $popoverArrowOuterColor;
-    top: -$popoverArrowOuterWidth;
+    border-bottom-color: $popover-arrow-outer-fallback-color; // IE8 fallback
+    border-bottom-color: $popover-arrow-outer-color;
+    top: -$popover-arrow-outer-width;
     &:after {
+      content: " ";
       top: 1px;
-      margin-left: -$popoverArrowWidth;
+      margin-left: -$popover-arrow-width;
       border-top-width: 0;
-      border-bottom-color: $popoverArrowColor;
+      border-bottom-color: $popover-arrow-color;
     }
   }
+
   &.left .arrow {
     top: 50%;
-    right: -$popoverArrowOuterWidth;
-    margin-top: -$popoverArrowOuterWidth;
+    right: -$popover-arrow-outer-width;
+    margin-top: -$popover-arrow-outer-width;
     border-right-width: 0;
-    border-left-color: #999; // IE8 fallback
-    border-left-color: $popoverArrowOuterColor;
+    border-left-color: $popover-arrow-outer-fallback-color; // IE8 fallback
+    border-left-color: $popover-arrow-outer-color;
     &:after {
+      content: " ";
       right: 1px;
       border-right-width: 0;
-      border-left-color: $popoverArrowColor;
-      bottom: -$popoverArrowWidth;
+      border-left-color: $popover-arrow-color;
+      bottom: -$popover-arrow-width;
     }
   }