sass-twitter-bootstrap 2.0.1 → 2.1.1

data/vendor/assets/stylesheets/twitter/_wells.scss

@@ -1,13 +1,15 @@
-// WELLS
-// -----
+//
+// Wells
+// --------------------------------------------------
 
+
+// Base class
 .well {
   min-height: 20px;
   padding: 19px;
   margin-bottom: 20px;
-  background-color: #f5f5f5;
-  border: 1px solid #eee;
-  border: 1px solid rgba(0,0,0,.05);
+  background-color: $wellBackground;
+  border: 1px solid darken($wellBackground, 7%);
   @include border-radius(4px);
   @include box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
   blockquote {
@@ -15,3 +17,13 @@
     border-color: rgba(0,0,0,.15);
   }
 }
+
+// Sizes
+.well-large {
+  padding: 24px;
+  @include border-radius(6px);
+}
+.well-small {
+  padding: 9px;
+  @include border-radius(3px);
+}

data/vendor/assets/stylesheets/twitter/bootstrap.scss

@@ -1,15 +1,11 @@
 /*!
- * Bootstrap v2.0.1
+ * Bootstrap v2.1.0
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- *
- * Converted to Sass by @johnwlong / @m5o.
- *
- * Date: @DATE
  */
 
 // Core variables and mixins
@@ -40,7 +36,7 @@
 // Components: Buttons & Alerts
 @import "buttons";
 @import "button-groups";
-@import "alerts"; // Note: alerts share common CSS with buttons and thus have styles in buttons.scss
+@import "alerts"; // Note: alerts share common CSS with buttons and thus have styles in buttons
 
 // Components: Nav
 @import "navs";
@@ -56,7 +52,7 @@
 
 // Components: Misc
 @import "thumbnails";
-@import "labels";
+@import "labels-badges";
 @import "progress-bars";
 @import "accordion";
 @import "carousel";

data/vendor/assets/stylesheets/twitter/responsive.scss

@@ -1,18 +1,15 @@
 /*!
- * Bootstrap Responsive v2.0.1
+ * Bootstrap Responsive v2.0.4
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- *
- * Converted to Sass by @johnwlong / @m5o.
- *
- * Date: @DATE
  */
 
-// Responsive.scss
+
+// Responsive
 // For phone and tablet devices
 // -------------------------------------------------------------
 
@@ -24,311 +21,28 @@
 @import "variables"; // Modify this for custom colors, font-sizes, etc
 @import "mixins";
 
-.clearfix {
-  @include clearfix();
-}
 
 // RESPONSIVE CLASSES
 // ------------------
 
-// Hide from screenreaders and browsers
-// Credit: HTML5 Boilerplate
-.hidden {
-  display: none;
-  visibility: hidden;
-}
-
-
-
-// UP TO LANDSCAPE PHONE
-// ---------------------
-
-@media (max-width: 480px) {
-
-  // Smooth out the collapsing/expanding nav
-  .nav-collapse {
-    -webkit-transform: translate3d(0, 0, 0); // activate the GPU
-  }
-
-  // Block level the page header small tag for readability
-  .page-header h1 small {
-    display: block;
-    line-height: $baseLineHeight;
-  }
-
-  // Make span* classes full width
-  input[class*="span"],
-  select[class*="span"],
-  textarea[class*="span"],
-  .uneditable-input {
-    display: block;
-    width: 100%;
-    min-height: 28px; /* Make inputs at least the height of their button counterpart */
-    /* Makes inputs behave like true block-level elements */
-    -webkit-box-sizing: border-box; /* Older Webkit */
-       -moz-box-sizing: border-box; /* Older FF */
-        -ms-box-sizing: border-box; /* IE8 */
-            box-sizing: border-box; /* CSS3 spec*/
-  }
-  // But don't let it screw up prepend/append inputs
-  .input-prepend input[class*="span"],
-  .input-append input[class*="span"] {
-    width: auto;
-  }
-
-  // Update checkboxes for iOS
-  input[type="checkbox"],
-  input[type="radio"] {
-    border: 1px solid #ccc;
-  }
-
-  // Remove the horizontal form styles
-  .form-horizontal .control-group > label {
-    float: none;
-    width: auto;
-    padding-top: 0;
-    text-align: left;
-  }
-  // Move over all input controls and content
-  .form-horizontal .controls {
-    margin-left: 0;
-  }
-  // Move the options list down to align with labels
-  .form-horizontal .control-list {
-    padding-top: 0; // has to be padding because margin collaspes
-  }
-  // Move over buttons in .form-actions to align with .controls
-  .form-horizontal .form-actions {
-    padding-left: 10px;
-    padding-right: 10px;
-  }
-
-  // Modals
-  .modal {
-    position: absolute;
-    top:   10px;
-    left:  10px;
-    right: 10px;
-    width: auto;
-    margin: 0;
-    &.fade.in { top: auto; }
-  }
-  .modal-header .close {
-    padding: 10px;
-    margin: -10px;
-  }
-
-  // Carousel
-  .carousel-caption {
-    position: static;
-  }
-
-}
-
-
-
-// LANDSCAPE PHONE TO SMALL DESKTOP & PORTRAIT TABLET
-// --------------------------------------------------
-
-@media (max-width: 767px) {
-  // GRID & CONTAINERS
-  // -----------------
-  // Remove width from containers
-  .container {
-    width: auto;
-    padding: 0 20px;
-  }
-  // Fluid rows
-  .row-fluid {
-    width: 100%;
-  }
-  // Undo negative margin on rows
-  .row {
-    margin-left: 0;
-  }
-  // Make all columns even
-  .row > [class*="span"],
-  .row-fluid > [class*="span"] {
-    float: none;
-    display: block;
-    width: auto;
-    margin: 0;
-  }
-}
+@import "responsive-utilities";
 
 
-
-// PORTRAIT TABLET TO DEFAULT DESKTOP
-// ----------------------------------
-
-@media (min-width: 768px) and (max-width: 979px) {
-
-  // Fixed grid
-  @include gridSystem-generate(12, 42px, 20px);
-
-  // Fluid grid
-  @include fluidGridSystem-generate(12, 5.801104972%, 2.762430939%);
-
-  // Input grid
-  @include inputGridSystem-generate(12, 42px, 20px);
-
-}
-
-
-
-// TABLETS AND BELOW
-// -----------------
-@media (max-width: 979px) {
-
-  // UNFIX THE TOPBAR
-  // ----------------
-  // Remove any padding from the body
-  body {
-    padding-top: 0;
-  }
-  // Unfix the navbar
-  .navbar-fixed-top {
-    position: static;
-    margin-bottom: $baseLineHeight;
-  }
-  .navbar-fixed-top .navbar-inner {
-    padding: 5px;
-  }
-  .navbar .container {
-    width: auto;
-    padding: 0;
-  }
-  // Account for brand name
-  .navbar .brand {
-    padding-left: 10px;
-    padding-right: 10px;
-    margin: 0 0 0 -5px;
-  }
-  // Nav collapse clears brand
-  .navbar .nav-collapse {
-    clear: left;
-  }
-  // Block-level the nav
-  .navbar .nav {
-    float: none;
-    margin: 0 0 ($baseLineHeight / 2);
-  }
-  .navbar .nav > li {
-    float: none;
-  }
-  .navbar .nav > li > a {
-    margin-bottom: 2px;
-  }
-  .navbar .nav > .divider-vertical {
-    display: none;
-  }
-  .navbar .nav .nav-header {
-    color: $navbarText;
-    text-shadow: none;
-  }
-  // Nav and dropdown links in navbar
-  .navbar .nav > li > a,
-  .navbar .dropdown-menu a {
-    padding: 6px 15px;
-    font-weight: bold;
-    color: $navbarLinkColor;
-    @include border-radius(3px);
-  }
-  .navbar .dropdown-menu li + li a {
-    margin-bottom: 2px;
-  }
-  .navbar .nav > li > a:hover,
-  .navbar .dropdown-menu a:hover {
-    background-color: $navbarBackground;
-  }
-  // Dropdowns in the navbar
-  .navbar .dropdown-menu {
-    position: static;
-    top: auto;
-    left: auto;
-    float: none;
-    display: block;
-    max-width: none;
-    margin: 0 15px;
-    padding: 0;
-    background-color: transparent;
-    border: none;
-    @include border-radius(0);
-    @include box-shadow(none);
-  }
-  .navbar .dropdown-menu:before,
-  .navbar .dropdown-menu:after {
-    display: none;
-  }
-  .navbar .dropdown-menu .divider {
-    display: none;
-  }
-  // Forms in navbar
-  .navbar-form,
-  .navbar-search {
-    float: none;
-    padding: ($baseLineHeight / 2) 15px;
-    margin: ($baseLineHeight / 2) 0;
-    border-top: 1px solid $navbarBackground;
-    border-bottom: 1px solid $navbarBackground;
-    $shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
-    @include box-shadow($shadow);
-  }
-  // Pull right (secondary) nav content
-  .navbar .nav.pull-right {
-    float: none;
-    margin-left: 0;
-  }
-  // Static navbar
-  .navbar-static .navbar-inner {
-    padding-left:  10px;
-    padding-right: 10px;
-  }
-  // Navbar button
-  .btn-navbar {
-    display: block;
-  }
-
-  // Hide everything in the navbar save .brand and toggle button */
-  .nav-collapse {
-    overflow: hidden;
-    height: 0;
-  }
-}
-
-
-
-// DEFAULT DESKTOP
-// ---------------
-
-@media (min-width: 980px) {
-  .nav-collapse.collapse {
-    height: auto !important;
-  }
-}
-
-
-
-// LARGE DESKTOP & UP
+// MEDIA QUERIES
 // ------------------
 
-@media (min-width: 1200px) {
+// Large desktops
+@import "responsive-1200px-min";
 
-  // Fixed grid
-  @include gridSystem-generate(12, 70px, 30px);
+// Tablets to regular desktops
+@import "responsive-768px-979px";
 
-  // Fluid grid
-  @include fluidGridSystem-generate(12, 5.982905983%, 2.564102564%);
+// Phones to portrait tablets and narrow desktops
+@import "responsive-767px-max";
 
-  // Input grid
-  @include inputGridSystem-generate(12, 70px, 30px);
 
-  // Thumbnails
-  .thumbnails {
-    margin-left: -30px;
-  }
-  .thumbnails > li {
-    margin-left: 30px;
-  }
+// RESPONSIVE NAVBAR
+// ------------------
 
-}
+// From 979px and below, show a button to toggle navbar contents
+@import "responsive-navbar";

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass-twitter-bootstrap
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-24 00:00:00.000000000 Z
+date: 2012-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -56,6 +56,7 @@ files:
 - lib/sass/twitter/bootstrap.rb
 - vendor/assets/images/glyphicons-halflings-white.png
 - vendor/assets/images/glyphicons-halflings.png
+- vendor/assets/javascripts/twitter/bootstrap-affix.js
 - vendor/assets/javascripts/twitter/bootstrap-alert.js
 - vendor/assets/javascripts/twitter/bootstrap-button.js
 - vendor/assets/javascripts/twitter/bootstrap-carousel.js
@@ -68,13 +69,10 @@ files:
 - vendor/assets/javascripts/twitter/bootstrap-tooltip.js
 - vendor/assets/javascripts/twitter/bootstrap-transition.js
 - vendor/assets/javascripts/twitter/bootstrap-typeahead.js
-- vendor/assets/stylesheets/tests/buttons.html
+- vendor/assets/javascripts/twitter/bootstrap.js
 - vendor/assets/stylesheets/tests/css-tests.css
 - vendor/assets/stylesheets/tests/css-tests.html
-- vendor/assets/stylesheets/tests/forms-responsive.html
 - vendor/assets/stylesheets/tests/forms.html
-- vendor/assets/stylesheets/tests/navbar-fixed-top.html
-- vendor/assets/stylesheets/tests/navbar-static-top.html
 - vendor/assets/stylesheets/tests/navbar.html
 - vendor/assets/stylesheets/twitter/_accordion.scss
 - vendor/assets/stylesheets/twitter/_alerts.scss
@@ -89,7 +87,7 @@ files:
 - vendor/assets/stylesheets/twitter/_forms.scss
 - vendor/assets/stylesheets/twitter/_grid.scss
 - vendor/assets/stylesheets/twitter/_hero-unit.scss
-- vendor/assets/stylesheets/twitter/_labels.scss
+- vendor/assets/stylesheets/twitter/_labels-badges.scss
 - vendor/assets/stylesheets/twitter/_layouts.scss
 - vendor/assets/stylesheets/twitter/_mixins.scss
 - vendor/assets/stylesheets/twitter/_modals.scss
@@ -100,6 +98,11 @@ files:
 - vendor/assets/stylesheets/twitter/_popovers.scss
 - vendor/assets/stylesheets/twitter/_progress-bars.scss
 - vendor/assets/stylesheets/twitter/_reset.scss
+- vendor/assets/stylesheets/twitter/_responsive-1200px-min.scss
+- vendor/assets/stylesheets/twitter/_responsive-767px-max.scss
+- vendor/assets/stylesheets/twitter/_responsive-768px-979px.scss
+- vendor/assets/stylesheets/twitter/_responsive-navbar.scss
+- vendor/assets/stylesheets/twitter/_responsive-utilities.scss
 - vendor/assets/stylesheets/twitter/_scaffolding.scss
 - vendor/assets/stylesheets/twitter/_sprites.scss
 - vendor/assets/stylesheets/twitter/_tables.scss