bootstrapped-rails 2.0.7.1 → 2.0.7.2

data/lib/bootstrapped-rails/version.rb

@@ -1,5 +1,5 @@
 module Bootstrapped
   module Rails
-    VERSION = "2.0.7.1"
+    VERSION = "2.0.7.2"
   end
 end

data/readme.md

@@ -1,4 +1,4 @@
-# This is a hacked-together version of the gem 'bootstrap-rails', with the generators from 'twitter-bootstrap-rails', has also replaced the Glyphicons icons with [Font Awesome](http://fortawesome.github.com/Font-Awesome/), since svg icons are resizable and colorable and such. There are also some custom scss helpers in a folder called 'custom_partials', which are just a byproduct of trying not to hate css. Feel free to muck around with this as you please. 
+# This is a hacked-together version of the gem 'bootstrap-sass', with the generators from 'twitter-bootstrap-rails', has also replaced the Glyphicons icons with [Font Awesome](http://fortawesome.github.com/Font-Awesome/), since svg icons are resizable and colorable and such. There are also some custom scss helpers in a folder called 'custom_partials', which are just a byproduct of trying not to hate css. Feel free to muck around with this as you please. 
 
 ---------
 I have no idea why the font above looks so big..
@@ -9,14 +9,6 @@ Feel free to fork and mess around with this.
 (uses bootstrap v2)
 
 
-
-## License
-Copyright (c) 2011 AnjLab
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 ## License
 Copyright (c) 2011 Seyhun Akyürek
 

data/vendor/assets/stylesheets/{bootstrapped/responsive.scss → _bootstrap-responsive.scss}

@@ -1,14 +1,15 @@
 /*!
- * Bootstrap Responsive v2.0.0
+ * Bootstrap Responsive v2.0.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 Thomas McDonald
  */
 
-// Responsive.scss
+// Responsive.css.scss
 // For phone and tablet devices
 // -------------------------------------------------------------
 
@@ -17,8 +18,8 @@
 // -------------------------
 // Required since we compile the responsive stuff separately
 
-@import "variables.scss"; // Modify this for custom colors, font-sizes, etc
-@import "mixins.scss";
+@import "bootstrapped-sass/variables"; // Modify this for custom colors, font-sizes, etc
+@import "bootstrapped-sass/mixins";
 
 
 // RESPONSIVE CLASSES
@@ -50,13 +51,10 @@
   }
 
   // Make span* classes full width
-  input[class*="span"],
-  select[class*="span"],
-  textarea[class*="span"],
-  .uneditable-input {
+  input[class*="span"], select[class*="span"], textarea[class*="span"], .uneditable-input {
     display: block;
     width: 100%;
-    height: 28px; /* Make inputs at least the height of their button counterpart */
+    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 */
@@ -64,14 +62,12 @@
             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"] {
+  .input-prepend input[class*="span"], .input-append input[class*="span"] {
     width: auto;
   }
 
   // Update checkboxes for iOS
-  input[type="checkbox"],
-  input[type="radio"] {
+  input[type="checkbox"], input[type="radio"] {
     border: 1px solid #ccc;
   }
 
@@ -123,7 +119,7 @@
 // LANDSCAPE PHONE TO SMALL DESKTOP & PORTRAIT TABLET
 // --------------------------------------------------
 
-@media (max-width: 768px) {
+@media (max-width: 767px) {
   // GRID & CONTAINERS
   // -----------------
   // Remove width from containers
@@ -140,8 +136,7 @@
     margin-left: 0;
   }
   // Make all columns even
-  .row > [class*="span"],
-  .row-fluid > [class*="span"] {
+  .row > [class*="span"], .row-fluid > [class*="span"] {
     float: none;
     display: block;
     width: auto;
@@ -154,16 +149,16 @@
 // PORTRAIT TABLET TO DEFAULT DESKTOP
 // ----------------------------------
 
-@media (min-width: 768px) and (max-width: 980px) {
+@media (min-width: 768px) and (max-width: 979px) {
 
   // Fixed grid
-  @include grid-system-generate(12, 42px, 20px);
+  @include gridSystemGenerate(12, 42px, 20px);
 
   // Fluid grid
-  @include fluid-grid-system-generate(12, 5.801104972%, 2.762430939%);
+  @include fluidGridSystemGenerate(12, 5.801104972%, 2.762430939%);
 
   // Input grid
-  @include input-grid-system-generate(12, 42px, 20px);
+  @include inputGridSystemGenerate(12, 42px, 20px);
 
 }
 
@@ -171,7 +166,7 @@
 
 // TABLETS AND BELOW
 // -----------------
-@media (max-width: 980px) {
+@media (max-width: 979px) {
 
   // UNFIX THE TOPBAR
   // ----------------
@@ -215,9 +210,12 @@
   .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 {
+  .navbar .nav > li > a, .navbar .dropdown-menu a {
     padding: 6px 15px;
     font-weight: bold;
     color: $navbarLinkColor;
@@ -226,8 +224,7 @@
   .navbar .dropdown-menu li + li a {
     margin-bottom: 2px;
   }
-  .navbar .nav > li > a:hover,
-  .navbar .dropdown-menu a:hover {
+  .navbar .nav > li > a:hover, .navbar .dropdown-menu a:hover {
     background-color: $navbarBackground;
   }
   // Dropdowns in the navbar
@@ -245,16 +242,14 @@
     @include border-radius(0);
     @include box-shadow(none);
   }
-  .navbar .dropdown-menu:before,
-  .navbar .dropdown-menu:after {
+  .navbar .dropdown-menu:before, .navbar .dropdown-menu:after {
     display: none;
   }
   .navbar .dropdown-menu .divider {
     display: none;
   }
   // Forms in navbar
-  .navbar-form,
-  .navbar-search {
+  .navbar-form, .navbar-search {
     float: none;
     padding: ($baseLineHeight / 2) 15px;
     margin: ($baseLineHeight / 2) 0;
@@ -304,13 +299,13 @@
 @media (min-width: 1200px) {
 
   // Fixed grid
-  @include grid-system-generate(12, 70px, 30px);
+  @include gridSystemGenerate(12, 70px, 30px);
 
   // Fluid grid
-  @include fluid-grid-system-generate(12, 5.982905983%, 2.564102564%);
+  @include fluidGridSystemGenerate(12, 5.982905983%, 2.564102564%);
 
   // Input grid
-  @include input-grid-system-generate(12, 70px, 30px);
+  @include inputGridSystemGenerate(12, 70px, 30px);
 
   // Thumbnails
   .thumbnails {
@@ -320,4 +315,4 @@
     margin-left: 30px;
   }
 
-}
+}

data/vendor/assets/stylesheets/_bootstrap.scss

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

data/vendor/assets/stylesheets/bootstrapped-responsive.css.scss

@@ -0,0 +1 @@
+@import 'bootstrap-responsive';

data/vendor/assets/stylesheets/{bootstrapped/accordion.scss → bootstrapped-sass/_accordion.scss}

@@ -25,4 +25,4 @@
 .accordion-inner {
   padding: 9px 15px;
   border-top: 1px solid #e5e5e5;
-}
+}

data/vendor/assets/stylesheets/{bootstrapped/alerts.scss → bootstrapped-sass/_alerts.scss}

@@ -10,8 +10,7 @@
   border: 1px solid $warningBorder;
   @include border-radius(4px);
 }
-.alert,
-.alert-heading {
+.alert, .alert-heading {
   color: $warningText;
 }
 
@@ -28,29 +27,23 @@
 
 .alert-success {
   background-color: $successBackground;
-  border-color: $successBorder;  
+  border-color: $successBorder;
 }
-.alert-success,
-.alert-success .alert-heading {
+.alert-success, .alert-success .alert-heading {
   color: $successText;
 }
-.alert-danger,
-.alert-error {
+.alert-danger, .alert-error {
   background-color: $errorBackground;
   border-color: $errorBorder;
 }
-.alert-danger,
-.alert-error,
-.alert-danger .alert-heading,
-.alert-error .alert-heading {
+.alert-danger, .alert-error, .alert-danger .alert-heading, .alert-error .alert-heading {
   color: $errorText;
 }
 .alert-info {
   background-color: $infoBackground;
   border-color: $infoBorder;
 }
-.alert-info,
-.alert-info .alert-heading {
+.alert-info, .alert-info .alert-heading {
   color: $infoText;
 }
 
@@ -61,10 +54,9 @@
   padding-top: 14px;
   padding-bottom: 14px;
 }
-.alert-block > p,
-.alert-block > ul {
+.alert-block > p, .alert-block > ul {
   margin-bottom: 0;
 }
 .alert-block p + p {
   margin-top: 5px;
-}
+}

data/vendor/assets/stylesheets/{bootstrapped/breadcrumbs.scss → bootstrapped-sass/_breadcrumbs.scss}

@@ -9,7 +9,7 @@
   @include border-radius(3px);
   @include box-shadow(inset 0 1px 0 $white);
   li {
-    display: inline;
+    display: inline-block;
     text-shadow: 0 1px 0 $white;
   }
   .divider {
@@ -19,4 +19,4 @@
   .active a {
     color: $grayDark;
   }
-}
+}

data/vendor/assets/stylesheets/{bootstrapped/button-groups.scss → bootstrapped-sass/_button-groups.scss}

@@ -41,8 +41,7 @@
       -moz-border-radius-bottomleft: 4px;
           border-bottom-left-radius: 4px;
 }
-.btn-group .btn:last-child,
-.btn-group .dropdown-toggle {
+.btn-group .btn:last-child, .btn-group .dropdown-toggle {
      -webkit-border-top-right-radius: 4px;
          -moz-border-radius-topright: 4px;
              border-top-right-radius: 4px;
@@ -60,8 +59,7 @@
       -moz-border-radius-bottomleft: 6px;
           border-bottom-left-radius: 6px;
 }
-.btn-group .btn.large:last-child,
-.btn-group .large.dropdown-toggle {
+.btn-group .btn.large:last-child, .btn-group .large.dropdown-toggle {
      -webkit-border-top-right-radius: 6px;
          -moz-border-radius-topright: 6px;
              border-top-right-radius: 6px;
@@ -71,16 +69,12 @@
 }
 
 // On hover/focus/active, bring the proper btn to front
-.btn-group .btn:hover,
-.btn-group .btn:focus,
-.btn-group .btn:active,
-.btn-group .btn.active {
+.btn-group .btn:hover, .btn-group .btn:focus, .btn-group .btn:active, .btn-group .btn.active {
   z-index: 2;
 }
 
 // On active and open, don't show outline
-.btn-group .dropdown-toggle:active,
-.btn-group.open .dropdown-toggle {
+.btn-group .dropdown-toggle:active, .btn-group.open .dropdown-toggle {
   outline: 0;
 }
 
@@ -123,20 +117,16 @@
   margin-top: 7px;
   margin-left: 0;
 }
-.btn:hover .caret,
-.open.btn-group .caret {
-  @include opacity(100);
+.btn:hover .caret, .open.btn-group .caret {
+  @include opacity(1);
 }
 
 
 // Account for other colors
-.btn-primary,
-.btn-danger,
-.btn-info,
-.btn-success {
+.btn-primary, .btn-danger, .btn-info, .btn-success, .btn-inverse {
   .caret {
     border-top-color: $white;
-    @include opacity(75);
+    @include opacity(0.75);
   }
 }
 
@@ -144,4 +134,3 @@
 .btn-small .caret {
   margin-top: 4px;
 }
-

data/vendor/assets/stylesheets/bootstrapped-sass/_buttons.scss

@@ -0,0 +1,163 @@
+// BUTTON STYLES
+// -------------
+
+
+// Base styles
+// --------------------------------------------------
+
+// Core
+.btn {
+  display: inline-block;
+  padding: 4px 10px 4px;
+  margin-bottom: 0; // For input.btn
+  font-size: $baseFontSize;
+  line-height: $baseLineHeight;
+  color: $grayDark;
+  text-align: center;
+  text-shadow: 0 1px 1px rgba(255,255,255,.75);
+  vertical-align: middle;
+  @include buttonBackground($white, darken($white, 10%));
+  border: 1px solid #ccc;
+  border-bottom-color: #bbb;
+  @include border-radius(4px);
+  $shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+  @include box-shadow($shadow);
+  cursor: pointer;
+
+  // Give IE7 some love
+  @include reset-filter();
+  @include ie7-restore-left-whitespace();
+}
+
+// Hover state
+.btn:hover {
+  color: lighten($grayDark, 5%);
+  text-decoration: none;
+  background-color: darken($white, 10%);
+  background-position: 0 -15px;
+
+  // transition is only when going to hover, otherwise the background
+  // behind the gradient (there for IE<=9 fallback) gets mismatched
+  @include transition(background-position .1s linear);
+}
+
+// Focus state for keyboard and accessibility
+.btn:focus {
+  @include tab-focus();
+}
+
+// Active state
+.btn.active, .btn:active {
+  background-image: none;
+  $shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+  @include box-shadow($shadow);
+  background-color: darken($white, 10%);
+  background-color: darken($white, 15%) \9;
+  outline: 0;
+}
+
+// Disabled state
+.btn.disabled, .btn[disabled] {
+  cursor: default;
+  background-image: none;
+  background-color: darken($white, 10%);
+  @include opacity(0.65);
+  @include box-shadow(none);
+}
+
+
+// Button Sizes
+// --------------------------------------------------
+
+// Large
+.btn-large {
+  padding: 9px 14px;
+  font-size: $baseFontSize + 2px;
+  line-height: normal;
+  @include border-radius(5px);
+}
+.btn-large [class^="icon-"] {
+  margin-top: 1px;
+}
+
+// Small
+.btn-small {
+  padding: 5px 9px;
+  font-size: $baseFontSize - 2px;
+  line-height: $baseLineHeight - 2px;
+}
+.btn-small [class^="icon-"] {
+  margin-top: -1px;
+}
+
+// Mini
+.btn-mini {
+  padding: 2px 6px;
+  font-size: $baseFontSize - 2px;
+  line-height: $baseLineHeight - 4px;
+}
+
+
+// Alternate buttons
+// --------------------------------------------------
+
+// Set text color
+// -------------------------
+.btn-primary, .btn-primary:hover, .btn-warning, .btn-warning:hover, .btn-danger, .btn-danger:hover, .btn-success, .btn-success:hover, .btn-info, .btn-info:hover, .btn-inverse, .btn-inverse:hover {
+  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+  color: $white;
+}
+// Provide *some* extra contrast for those who can get it
+.btn-primary.active, .btn-warning.active, .btn-danger.active, .btn-success.active, .btn-info.active, .btn-inverse.active {
+  color: rgba(255,255,255,.75);
+}
+
+// Set the backgrounds
+// -------------------------
+.btn-primary {
+  @include buttonBackground($primaryButtonBackground, adjust-hue($primaryButtonBackground, 20));
+}
+// Warning appears are orange
+.btn-warning {
+  @include buttonBackground(lighten($orange, 15%), $orange);
+}
+// Danger and error appear as red
+.btn-danger {
+  @include buttonBackground(#ee5f5b, #bd362f);
+}
+// Success appears as green
+.btn-success {
+  @include buttonBackground(#62c462, #51a351);
+}
+// Info appears as a neutral blue
+.btn-info {
+  @include buttonBackground(#5bc0de, #2f96b4);
+}
+.btn-inverse {
+  @include buttonBackground(#454545, #262626);
+}
+
+
+// Cross-browser Jank
+// --------------------------------------------------
+
+button.btn, input[type="submit"].btn {
+
+  // Firefox 3.6 only I believe
+  &::-moz-focus-inner {
+    padding: 0;
+    border: 0;
+  }
+
+  // IE7 has some default padding on button controls
+  *padding-top: 2px;
+  *padding-bottom: 2px;
+  &.large {
+    *padding-top: 7px;
+    *padding-bottom: 7px;
+  }
+  &.small {
+    *padding-top: 3px;
+    *padding-bottom: 3px;
+  }
+}