bootstrap-sass 2.1.1.0 → 2.2.1.0

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

@@ -10,8 +10,8 @@
   margin-bottom: 20px;
   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)});
+  @include border-radius($baseBorderRadius);
+  @include box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
   blockquote {
     border-color: #ddd;
     border-color: rgba(0,0,0,.15);
@@ -21,9 +21,9 @@
 // Sizes
 .well-large {
   padding: 24px;
-  @include border-radius(6px);
+  @include border-radius($borderRadiusLarge);
 }
 .well-small {
   padding: 9px;
-  @include border-radius(3px);
-}
+  @include border-radius($borderRadiusSmall);
+}

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

@@ -0,0 +1,63 @@
+/*!
+ * Bootstrap v2.2.1
+ *
+ * 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.
+ */
+
+// Core variables and mixins
+@import "variables"; // Modify this for custom colors, font-sizes, etc
+@import "mixins";
+
+// CSS Reset
+@import "reset";
+
+// Grid system and page structure
+@import "scaffolding";
+@import "grid";
+@import "layouts";
+
+// Base CSS
+@import "type";
+@import "code";
+@import "forms";
+@import "tables";
+
+// Components: common
+@import "sprites";
+@import "dropdowns";
+@import "wells";
+@import "component-animations";
+@import "close";
+
+// Components: Buttons & Alerts
+@import "buttons";
+@import "button-groups";
+@import "alerts"; // Note: alerts share common CSS with buttons and thus have styles in buttons
+
+// Components: Nav
+@import "navs";
+@import "navbar";
+@import "breadcrumbs";
+@import "pagination";
+@import "pager";
+
+// Components: Popovers
+@import "modals";
+@import "tooltip";
+@import "popovers";
+
+// Components: Misc
+@import "thumbnails";
+@import "media";
+@import "labels-badges";
+@import "progress-bars";
+@import "accordion";
+@import "carousel";
+@import "hero-unit";
+
+// Utility classes
+@import "utilities"; // Has to be last to override when necessary

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

@@ -0,0 +1,48 @@
+/*!
+ * Bootstrap Responsive v2.2.1
+ *
+ * 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.
+ */
+
+
+// Responsive
+// For phone and tablet devices
+// -------------------------------------------------------------
+
+
+// REPEAT VARIABLES & MIXINS
+// -------------------------
+// Required since we compile the responsive stuff separately
+
+@import "variables"; // Modify this for custom colors, font-sizes, etc
+@import "mixins";
+
+
+// RESPONSIVE CLASSES
+// ------------------
+
+@import "responsive-utilities";
+
+
+// MEDIA QUERIES
+// ------------------
+
+// Large desktops
+@import "responsive-1200px-min";
+
+// Tablets to regular desktops
+@import "responsive-768px-979px";
+
+// Phones to portrait tablets and narrow desktops
+@import "responsive-767px-max";
+
+
+// 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: bootstrap-sass
 version: !ruby/object:Gem::Version
-  version: 2.1.1.0
+  version: 2.2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-31 00:00:00.000000000 Z
+date: 2012-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,15 +42,29 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
 description: 
 email: tom@conceptcoding.co.uk
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- vendor/assets/stylesheets/_bootstrap-responsive.scss
-- vendor/assets/stylesheets/_bootstrap.scss
 - vendor/assets/stylesheets/bootstrap/_accordion.scss
 - vendor/assets/stylesheets/bootstrap/_alerts.scss
 - vendor/assets/stylesheets/bootstrap/_breadcrumbs.scss
@@ -66,6 +80,7 @@ files:
 - vendor/assets/stylesheets/bootstrap/_hero-unit.scss
 - vendor/assets/stylesheets/bootstrap/_labels-badges.scss
 - vendor/assets/stylesheets/bootstrap/_layouts.scss
+- vendor/assets/stylesheets/bootstrap/_media.scss
 - vendor/assets/stylesheets/bootstrap/_mixins.scss
 - vendor/assets/stylesheets/bootstrap/_modals.scss
 - vendor/assets/stylesheets/bootstrap/_navbar.scss
@@ -89,6 +104,10 @@ files:
 - vendor/assets/stylesheets/bootstrap/_utilities.scss
 - vendor/assets/stylesheets/bootstrap/_variables.scss
 - vendor/assets/stylesheets/bootstrap/_wells.scss
+- vendor/assets/stylesheets/bootstrap/bootstrap.scss
+- vendor/assets/stylesheets/bootstrap/responsive.scss
+- vendor/assets/stylesheets/bootstrap-responsive.scss
+- vendor/assets/stylesheets/bootstrap.scss
 - vendor/assets/javascripts/bootstrap-affix.js
 - vendor/assets/javascripts/bootstrap-alert.js
 - vendor/assets/javascripts/bootstrap-button.js

data/vendor/assets/stylesheets/_bootstrap-responsive.scss

@@ -1,42 +0,0 @@
-//
-// Bootstrap Responsive v2.1.1
-//
-// 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 @thomasmcdonald_, and distributed as bootstrap-sass
-
-// REPEAT VARIABLES & MIXINS
-// -------------------------
-// Required since we compile the responsive stuff separately
-
-@import "bootstrap/variables"; // Modify this for custom colors, font-sizes, etc
-@import "bootstrap/mixins";
-
-
-// RESPONSIVE CLASSES
-// ------------------
-
-@import "bootstrap/responsive-utilities";
-
-
-// MEDIA QUERIES
-// ------------------
-
-// Large desktops
-@import "bootstrap/responsive-1200px-min";
-
-// Tablets to regular desktops
-@import "bootstrap/responsive-768px-979px";
-
-// Phones to portrait tablets and narrow desktops
-@import "bootstrap/responsive-767px-max";
-
-
-// RESPONSIVE NAVBAR
-// ------------------
-
-// From 979px and below, show a button to toggle navbar contents
-@import "bootstrap/responsive-navbar";

data/vendor/assets/stylesheets/_bootstrap.scss

@@ -1,62 +0,0 @@
-//
-// Bootstrap v2.1.1
-//
-// 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 @thomasmcdonald_, and distributed as bootstrap-sass
-
-// Core variables and mixins
-@import "bootstrap/variables"; // Modify this for custom colors, font-sizes, etc
-@import "bootstrap/mixins";
-
-// CSS Reset
-@import "bootstrap/reset";
-
-// Grid system and page structure
-@import "bootstrap/scaffolding";
-@import "bootstrap/grid";
-@import "bootstrap/layouts";
-
-// Base CSS
-@import "bootstrap/type";
-@import "bootstrap/code";
-@import "bootstrap/forms";
-@import "bootstrap/tables";
-
-// Components: common
-@import "bootstrap/sprites";
-@import "bootstrap/dropdowns";
-@import "bootstrap/wells";
-@import "bootstrap/component-animations";
-@import "bootstrap/close";
-
-// Components: Buttons & Alerts
-@import "bootstrap/buttons";
-@import "bootstrap/button-groups";
-@import "bootstrap/alerts"; // Note: alerts share common CSS with buttons and thus have styles in _buttons.scss
-
-// Components: Nav
-@import "bootstrap/navs";
-@import "bootstrap/navbar";
-@import "bootstrap/breadcrumbs";
-@import "bootstrap/pagination";
-@import "bootstrap/pager";
-
-// Components: Popovers
-@import "bootstrap/modals";
-@import "bootstrap/tooltip";
-@import "bootstrap/popovers";
-
-// Components: Misc
-@import "bootstrap/thumbnails";
-@import "bootstrap/labels-badges";
-@import "bootstrap/progress-bars";
-@import "bootstrap/accordion";
-@import "bootstrap/carousel";
-@import "bootstrap/hero-unit";
-
-// Utility classes
-@import "bootstrap/utilities"; // Has to be last to override when necessary