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

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

@@ -0,0 +1,211 @@
+//
+// Tables
+// --------------------------------------------------
+
+
+table {
+  max-width: 100%;
+  background-color: $table-bg;
+}
+th {
+  text-align: left;
+}
+
+
+// Baseline styles
+// ---------------
+
+.table {
+  width: 100%;
+  margin-bottom: $line-height-computed;
+  // Cells
+  thead,
+  tbody,
+  tfoot {
+    > tr {
+      > th,
+      > td {
+        padding: $table-cell-padding;
+        line-height: $line-height-base;
+        vertical-align: top;
+        border-top: 1px solid $table-border-color;
+      }
+    }
+  }
+  // Bottom align for column headings
+  thead > tr > th {
+    vertical-align: bottom;
+  }
+  // Remove top border from thead by default
+  caption + thead,
+  colgroup + thead,
+  thead:first-child {
+    tr:first-child {
+      th, td {
+        border-top: 0;
+      }
+    }
+  }
+  // Account for multiple tbody instances
+  tbody + tbody {
+    border-top: 2px solid $table-border-color;
+  }
+
+  // Nesting
+  .table {
+    background-color: $body-bg;
+  }
+}
+
+
+
+// Condensed table w/ half padding
+// -------------------------------
+
+.table-condensed {
+  thead,
+  tbody,
+  tfoot {
+    > tr {
+      > th,
+      > td {
+        padding: $table-condensed-cell-padding;
+      }
+    }
+  }
+}
+
+
+
+// Bordered version
+// ----------------
+
+.table-bordered {
+  border: 1px solid $table-border-color;
+  > thead,
+  > tbody,
+  > tfoot {
+    > tr {
+      > th,
+      > td {
+        border: 1px solid $table-border-color;
+      }
+    }
+  }
+}
+
+
+
+// Zebra-striping
+// --------------
+
+// Default zebra-stripe styles (alternating gray and transparent backgrounds)
+.table-striped {
+  > tbody {
+    > tr:nth-child(odd) {
+      > td,
+      > th {
+        background-color: $table-bg-accent;
+      }
+    }
+  }
+}
+
+
+
+// Hover effect
+// ------------
+
+// Placed here since it has to come after the potential zebra striping
+.table-hover {
+  > tbody {
+    > tr:hover {
+      > td,
+      > th {
+        background-color: $table-bg-hover;
+      }
+    }
+  }
+}
+
+
+
+// Table cell sizing
+// -----------------
+
+// Reset default table behavior
+table col[class^="col-"] {
+  float: none;
+  display: table-column;
+}
+table {
+  td,
+  th {
+    &[class^="col-"] {
+      float: none;
+      display: table-cell;
+    }
+  }
+}
+
+
+
+// Table backgrounds
+// -----------------
+// Exact selectors below required to override `.table-striped` and prevent
+// inheritance to nested tables.
+
+.table > thead > tr,
+.table > tbody > tr,
+.table > tfoot > tr {
+  > td.active,
+  > th.active,
+  &.active > td,
+  &.active > th  {
+    background-color: $table-bg-hover;
+  }
+  > td.success,
+  > th.success,
+  &.success > td,
+  &.success > th {
+    background-color: $state-success-bg;
+    border-color: $state-success-border;
+  }
+  > td.danger,
+  > th.danger,
+  &.danger > td,
+  &.danger > th {
+    background-color: $state-danger-bg;
+    border-color: $state-danger-border;
+  }
+  > td.warning,
+  > th.warning,
+  &.warning > td,
+  &.warning > th {
+    background-color: $state-warning-bg;
+    border-color: $state-warning-border;
+  }
+}
+
+// Hover states for `.table-hover`
+// Note: this is not available for cells or rows within `thead` or `tfoot`.
+.table-hover > tbody > tr {
+  > td.success:hover,
+  > th.success:hover,
+  &.success:hover > td {
+    background-color: darken($state-success-bg, 5%);
+    border-color: darken($state-success-border, 5%);
+  }
+  > td.danger:hover,
+  > th.danger:hover,
+  &.danger:hover > td {
+    background-color: darken($state-danger-bg, 5%);
+    border-color: darken($state-danger-border, 5%);
+  }
+  > td.warning:hover,
+  > th.warning:hover,
+  &.warning:hover > td {
+    background-color: darken($state-warning-bg, 5%);
+    border-color: darken($state-warning-border, 5%);
+  }
+}

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

@@ -20,8 +20,9 @@
 .thumbnail {
   display: block;
 }
+.thumbnail > img,
 .img-thumbnail {
-  display: inline-block;
+  @include img-responsive();
 }
 
 // Add a hover state for linked versions only
@@ -32,8 +33,6 @@ a.thumbnail:focus {
 
 // Images and captions
 .thumbnail > img {
-  display: block;
-  max-width: 100%;
   margin-left: auto;
   margin-right: auto;
 }

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

@@ -9,7 +9,7 @@
   z-index: $zindex-tooltip;
   display: block;
   visibility: visible;
-  font-size: $font-size-mini;
+  font-size: $font-size-small;
   line-height: 1.4;
   @include opacity(0);
 
@@ -22,7 +22,7 @@
 
 // Wrapper for the tooltip content
 .tooltip-inner {
-  max-width: 200px;
+  max-width: $tooltip-max-width;
   padding: 3px 8px;
   color: $tooltip-color;
   text-align: center;
@@ -47,6 +47,18 @@
     border-width: $tooltip-arrow-width $tooltip-arrow-width 0;
     border-top-color: $tooltip-arrow-color;
   }
+  &.top-left .tooltip-arrow {
+    bottom: 0;
+    left: 5px;
+    border-width: $tooltip-arrow-width $tooltip-arrow-width 0;
+    border-top-color: $tooltip-arrow-color;
+  }
+  &.top-right .tooltip-arrow {
+    bottom: 0;
+    right: 5px;
+    border-width: $tooltip-arrow-width $tooltip-arrow-width 0;
+    border-top-color: $tooltip-arrow-color;
+  }
   &.right .tooltip-arrow {
     top: 50%;
     left: 0;
@@ -68,4 +80,16 @@
     border-width: 0 $tooltip-arrow-width $tooltip-arrow-width;
     border-bottom-color: $tooltip-arrow-color;
   }
+  &.bottom-left .tooltip-arrow {
+    top: 0;
+    left: 5px;
+    border-width: 0 $tooltip-arrow-width $tooltip-arrow-width;
+    border-bottom-color: $tooltip-arrow-color;
+  }
+  &.bottom-right .tooltip-arrow {
+    top: 0;
+    right: 5px;
+    border-width: 0 $tooltip-arrow-width $tooltip-arrow-width;
+    border-bottom-color: $tooltip-arrow-color;
+  }
 }

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

@@ -11,9 +11,13 @@ p {
 }
 .lead {
   margin-bottom: $line-height-computed;
-  font-size: ($font-size-base * 1.5);
+  font-size: ($font-size-base * 1.15);
   font-weight: 200;
   line-height: 1.4;
+
+  @media (min-width: 768px) {
+    font-size: ($font-size-base * 1.5);
+  }
 }
 
 
@@ -23,27 +27,18 @@ p {
 // Ex: 14px base font * 85% = about 12px
 small   { font-size: 85%; }
 
-strong  { font-weight: bold; }
-em      { font-style: italic; }
+// Undo browser default styling
 cite    { font-style: normal; }
 
-// Utility classes
-.text-muted          { color: $gray-light; }
-a.text-muted:hover,
-a.text-muted:focus   { color: darken($gray-light, 10%); }
-
+// Contextual emphasis
+.text-muted          { color: $text-muted; }
+.text-primary        { color: $brand-primary; }
 .text-warning        { color: $state-warning-text; }
-a.text-warning:hover,
-a.text-warning:focus { color: darken($state-warning-text, 10%); }
-
 .text-danger         { color: $state-danger-text; }
-a.text-danger:hover,
-a.text-danger:focus  { color: darken($state-danger-text, 10%); }
-
 .text-success        { color: $state-success-text; }
-a.text-success:hover,
-a.text-success:focus { color: darken($state-success-text, 10%); }
+.text-info           { color: $state-info-text; }
 
+// Alignment
 .text-left           { text-align: left; }
 .text-right          { text-align: right; }
 .text-center         { text-align: center; }
@@ -54,12 +49,13 @@ a.text-success:focus { color: darken($state-success-text, 10%); }
 
 h1, h2, h3, h4, h5, h6,
 .h1, .h2, .h3, .h4, .h5, .h6 {
+  font-family: $headings-font-family;
   font-weight: $headings-font-weight;
   line-height: $headings-line-height;
   small {
     font-weight: normal;
     line-height: 1;
-    color: $gray-light;
+    color: $headings-small-color;
   }
 }
 
@@ -95,7 +91,7 @@ h4 small, .h4 small { font-size: $font-size-base; }
 .page-header {
   padding-bottom: (($line-height-computed / 2) - 1);
   margin: ($line-height-computed * 2) 0 $line-height-computed;
-  border-bottom: 1px solid $gray-lighter;
+  border-bottom: 1px solid $page-header-border-color;
 }
 
 
@@ -106,24 +102,19 @@ h4 small, .h4 small { font-size: $font-size-base; }
 // Unordered and Ordered lists
 ul,
 ol {
-  padding: 0;
-  margin: 0 0 ($line-height-computed / 2) 25px;
-}
-ul ul,
-ul ol,
-ol ol,
-ol ul {
-  margin-bottom: 0;
-}
-li {
-  line-height: $line-height-base;
+  margin-top: 0;
+  margin-bottom: ($line-height-computed / 2);
+  ul,
+  ol{
+    margin-bottom: 0;
+  }
 }
 
 // List options
 
-// Unstyled keeps list items block level, just removes list-style
+// Unstyled keeps list items block level, just removes default browser padding and list-style
 @mixin list-unstyled {
-  margin-left: 0;
+  padding-left: 0;
   list-style: none;
 }
 
@@ -151,11 +142,10 @@ dt {
   font-weight: bold;
 }
 dd {
-  margin-left: ($line-height-computed / 2);
+  margin-left: 0; // Undo browser default
 }
 // Horizontal layout (like forms)
 .dl-horizontal {
-  @include clearfix(); // Ensure dl clears floats if empty dd elements present
   dt {
     float: left;
     width: ($component-offset-horizontal - 20);
@@ -164,6 +154,7 @@ dd {
     @include text-overflow();
   }
   dd {
+    @include clearfix(); // Clear the floated `dt` if an empty `dd` is present
     margin-left: $component-offset-horizontal;
   }
 }
@@ -171,21 +162,12 @@ dd {
 // MISC
 // ----
 
-// Horizontal rules
-hr {
-  margin: $line-height-computed 0;
-  border: 0;
-  border-top: 1px solid $hr-border;
-  border-bottom: 1px solid #fff;
-  border-bottom: 1px solid rgba(255,255,255,.5);
-}
-
 // Abbreviations and acronyms
 abbr[title],
-// Added data-* attribute to help out our tooltip plugin, per https://github.com/twitter/bootstrap/issues/5257
+// Added data-* attribute to help out our tooltip plugin, per https://github.com/twbs/bootstrap/issues/5257
 abbr[data-original-title] {
   cursor: help;
-  border-bottom: 1px dotted $gray-light;
+  border-bottom: 1px dotted $abbr-border-color;
 }
 abbr.initialism {
   font-size: 90%;
@@ -196,7 +178,7 @@ abbr.initialism {
 blockquote {
   padding: ($line-height-computed / 2) $line-height-computed;
   margin: 0 0 $line-height-computed;
-  border-left: 5px solid $gray-lighter;
+  border-left: 5px solid $blockquote-border-color;
   p {
     font-size: ($font-size-base * 1.25);
     font-weight: 300;
@@ -208,9 +190,9 @@ blockquote {
   small {
     display: block;
     line-height: $line-height-base;
-    color: $gray-light;
+    color: $blockquote-small-color;
     &:before {
-      content: '\2014 \00A0';
+      content: '\2014 \00A0';// EM DASH, NBSP
     }
   }
 
@@ -219,7 +201,7 @@ blockquote {
     float: right;
     padding-right: 15px;
     padding-left: 0;
-    border-right: 5px solid $gray-lighter;
+    border-right: 5px solid $blockquote-border-color;
     border-left: 0;
     p,
     small {
@@ -230,7 +212,7 @@ blockquote {
         content: '';
       }
       &:after {
-        content: '\00A0 \2014';
+        content: '\00A0 \2014';// NBSP, EM DASH
       }
     }
   }