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

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

@@ -4,6 +4,7 @@
 
 
 .pager {
+  padding-left: 0;
   margin: $line-height-computed 0;
   list-style: none;
   text-align: center;
@@ -16,7 +17,7 @@
       padding: 5px 14px;
       background-color: $pagination-bg;
       border: 1px solid $pagination-border;
-      border-radius: 15px;
+      border-radius: $pager-border-radius;
     }
 
     > a:hover,
@@ -45,9 +46,9 @@
     > a:hover,
     > a:focus,
     > span {
-      color: $gray-light;
+      color: $pager-disabled-color;
       background-color: $pagination-bg;
-      cursor: default;
+      cursor: not-allowed;
     }
   }
 

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

@@ -0,0 +1,108 @@
+//
+// Pagination (multiple pages)
+// --------------------------------------------------
+.pagination {
+  display: inline-block;
+  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 {
+  > 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 {
+  > 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/{vendor → app}/assets/stylesheets/twitter/bootstrap/_panels.scss

@@ -17,14 +17,20 @@
 .panel-heading {
   margin: -15px -15px 15px;
   padding: 10px 15px;
-  font-size: ($font-size-base * 1.25);
-  font-weight: 500;
   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;

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

@@ -9,16 +9,16 @@
   left: 0;
   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: $popover-bg;
   -webkit-bg-clip: padding-box;
      -moz-bg-clip: padding;
   background-clip: padding-box;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0,0,0,.2);
-  border-radius: 6px;
+  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
@@ -40,10 +40,6 @@
   background-color: $popover-title-bg;
   border-bottom: 1px solid darken($popover-title-bg, 5%);
   border-radius: 5px 5px 0 0;
-
-  &:empty {
-    display: none;
-  }
 }
 
 .popover-content {
@@ -54,14 +50,16 @@
 //
 // .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: $popover-arrow-outer-width;
@@ -76,10 +74,11 @@
     left: 50%;
     margin-left: -$popover-arrow-outer-width;
     border-bottom-width: 0;
-    border-top-color: #999; // IE8 fallback
+    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: -$popover-arrow-width;
       border-bottom-width: 0;
@@ -91,9 +90,10 @@
     left: -$popover-arrow-outer-width;
     margin-top: -$popover-arrow-outer-width;
     border-left-width: 0;
-    border-right-color: #999; // IE8 fallback
+    border-right-color: $popover-arrow-outer-fallback-color; // IE8 fallback
     border-right-color: $popover-arrow-outer-color;
     &:after {
+      content: " ";
       left: 1px;
       bottom: -$popover-arrow-width;
       border-left-width: 0;
@@ -104,10 +104,11 @@
     left: 50%;
     margin-left: -$popover-arrow-outer-width;
     border-top-width: 0;
-    border-bottom-color: #999; // IE8 fallback
+    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: -$popover-arrow-width;
       border-top-width: 0;
@@ -120,9 +121,10 @@
     right: -$popover-arrow-outer-width;
     margin-top: -$popover-arrow-outer-width;
     border-right-width: 0;
-    border-left-color: #999; // IE8 fallback
+    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: $popover-arrow-color;

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

@@ -71,4 +71,30 @@
   .navbar {
     display: none;
   }
+  .table {
+    td,
+    th {
+      background-color: #fff !important;
+    }
+  }
+  .btn,
+  .dropup > .btn {
+    > .caret {
+      border-top-color: #000 !important;
+    }
+  }
+  .label {
+    border: 1px solid #000;
+  }
+
+  .table {
+    border-collapse: collapse !important;
+  }
+  .table-bordered {
+    th,
+    td {
+      border: 1px solid #ddd !important;
+    }
+  }
+
 }

data/{vendor → app}/assets/stylesheets/twitter/bootstrap/_progress-bars.scss

@@ -57,9 +57,8 @@
   width: 0%;
   height: 100%;
   font-size: $font-size-small;
-  color: #fff;
+  color: $progress-bar-color;
   text-align: center;
-  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
   background-color: $progress-bar-bg;
   @include box-shadow(inset 0 -1px 0 rgba(0,0,0,.15));
   @include transition(width .6s ease);
@@ -87,32 +86,20 @@
 
 // Danger (red)
 .progress-bar-danger {
-  background-color: $progress-bar-danger-bg;
-  .progress-striped & {
-    @include gradient-striped($progress-bar-danger-bg);
-  }
+  @include progress-bar-variant($progress-bar-danger-bg);
 }
 
 // Success (green)
 .progress-bar-success {
-  background-color: $progress-bar-success-bg;
-  .progress-striped & {
-    @include gradient-striped($progress-bar-success-bg);
-  }
+  @include progress-bar-variant($progress-bar-success-bg);
 }
 
 // Warning (orange)
 .progress-bar-warning {
-  background-color: $progress-bar-warning-bg;
-  .progress-striped & {
-    @include gradient-striped($progress-bar-warning-bg);
-  }
+  @include progress-bar-variant($progress-bar-warning-bg);
 }
 
 // Info (teal)
 .progress-bar-info {
-  background-color: $progress-bar-info-bg;
-  .progress-striped & {
-    @include gradient-striped($progress-bar-info-bg);
-  }
+  @include progress-bar-variant($progress-bar-info-bg);
 }

data/{vendor → app}/assets/stylesheets/twitter/bootstrap/_responsive-utilities.scss

@@ -29,49 +29,49 @@
 // Hide from screenreaders and browsers
 // Credit: HTML5 Boilerplate
 .hidden {
-  display: none;
-  visibility: hidden;
+  display: none !important;
+  visibility: hidden !important;
 }
 
 // Visibility utilities
 
 // For Phones
-.visible-sm   { display: block !important; }
-.visible-md   { display: none !important; }
-.visible-lg   { display: none !important; }
+@include responsive-visibility(".visible-sm");
+@include responsive-invisibility(".visible-md");
+@include responsive-invisibility(".visible-lg");
 
-.hidden-sm    { display: none !important; }
-.hidden-md    { display: block !important; }
-.hidden-lg    { display: block !important; }
+@include responsive-invisibility(".hidden-sm");
+@include responsive-visibility(".hidden-md");
+@include responsive-visibility(".hidden-lg");
 
 
 // Tablets & small desktops only
 @media (min-width: $screen-tablet) and (max-width: $screen-tablet-max) {
-  .visible-sm   { display: none !important; }
-  .visible-md   { display: block !important; }
-  .visible-lg   { display: none !important; }
+  @include responsive-invisibility(".visible-sm");
+  @include responsive-visibility(".visible-md");
+  @include responsive-invisibility(".visible-lg");
 
-  .hidden-sm    { display: block !important; }
-  .hidden-md    { display: none !important; }
-  .hidden-lg    { display: block !important; }
+  @include responsive-visibility(".hidden-sm");
+  @include responsive-invisibility(".hidden-md");
+  @include responsive-visibility(".hidden-lg");
 }
 
 // For desktops
 @media (min-width: $screen-desktop) {
-  .visible-sm   { display: none !important; }
-  .visible-md   { display: none !important; }
-  .visible-lg   { display: block !important; }
+  @include responsive-invisibility(".visible-sm");
+  @include responsive-invisibility(".visible-md");
+  @include responsive-visibility(".visible-lg");
 
-  .hidden-sm    { display: block !important; }
-  .hidden-md    { display: block !important; }
-  .hidden-lg    { display: none !important; }
+  @include responsive-visibility(".hidden-sm");
+  @include responsive-visibility(".hidden-md");
+  @include responsive-invisibility(".hidden-lg");
 }
 
 // Print utilities
-.visible-print  { display: none !important; }
-.hidden-print   { }
+@include responsive-invisibility(".visible-print");
+.hidden-print  { }
 
 @media print {
-  .visible-print  { display: block !important; }
-  .hidden-print   { display: none !important; }
-}
+  @include responsive-visibility(".visible-print");
+  @include responsive-invisibility(".hidden-print");
+}

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

@@ -16,8 +16,6 @@
 
 html {
   font-size: 62.5%;
-  // Touch the Mobile Magic™
-  -webkit-overflow-scrolling: touch;
   -webkit-tap-highlight-color: rgba(0,0,0,0);
 }
 
@@ -29,7 +27,7 @@ body {
   background-color: $body-bg;
 }
 
-// Reset fonts for revelant elements
+// Reset fonts for relevant elements
 input,
 button,
 select,
@@ -61,17 +59,23 @@ a:focus {
 // -------------------------
 
 img {
-  // Responsive images (ensure images don't scale beyond their parents)
-  max-width: 100%; // Part 1: Set a maxium relative to the parent
+  vertical-align: middle;
+}
+
+// Responsive images (ensure images don't scale beyond their parents)
+@mixin img-responsive {
+  display: inline-block;
+  max-width: 100%; // Part 1: Set a maximum relative to the parent
   height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching
+}
 
-  // Match vertical alignment with other comment elements
-  vertical-align: middle;
+.img-responsive {
+  @include img-responsive;
 }
 
 // Rounded corners
 .img-rounded {
-  border-radius: 6px;
+  border-radius: $border-radius-large;
 }
 
 // Image thumbnails
@@ -81,3 +85,15 @@ img {
 .img-circle {
   border-radius: 500px; // crank the border-radius so it works with most reasonably sized images
 }
+
+
+// Horizontal rules
+// -------------------------
+
+hr {
+  margin-top:    $line-height-computed;
+  margin-bottom: $line-height-computed;
+  border: 0;
+  border-top: 1px solid $hr-border;
+}
+