twitter-bootstrap-rails 2.0 → 2.0.1.0

data/vendor/toolkit/twitter/bootstrap/thumbnails.less

@@ -2,13 +2,13 @@
 // ----------
 
 .thumbnails {
-  margin-left: -20px;
+  margin-left: -@gridGutterWidth;
   list-style: none;
   .clearfix();
 }
 .thumbnails > li {
   float: left;
-  margin: 0 0 @baseLineHeight 20px;
+  margin: 0 0 @baseLineHeight @gridGutterWidth;
 }
 .thumbnail {
   display: block;
@@ -27,6 +27,8 @@ a.thumbnail:hover {
 .thumbnail > img {
   display: block;
   max-width: 100%;
+  margin-left: auto;
+  margin-right: auto;
 }
 .thumbnail .caption {
   padding: 9px;

data/vendor/toolkit/twitter/bootstrap/type.less

@@ -75,6 +75,17 @@ h6 {
   text-transform: uppercase;
 }
 
+// Page header
+.page-header {
+  padding-bottom: @baseLineHeight - 1;
+  margin: @baseLineHeight 0;
+  border-bottom: 1px solid @grayLighter;
+}
+.page-header h1 {
+  line-height: 1;
+}
+
+
 
 // LISTS
 // -----
@@ -99,7 +110,8 @@ ol {
 li {
   line-height: @baseLineHeight;
 }
-ul.unstyled {
+ul.unstyled,
+ol.unstyled {
   margin-left: 0;
   list-style: none;
 }
@@ -126,7 +138,7 @@ dd {
 hr {
   margin: @baseLineHeight 0;
   border: 0;
-  border-top: 1px solid #e5e5e5;
+  border-top: 1px solid @hrBorder;
   border-bottom: 1px solid @white;
 }
 
@@ -197,51 +209,10 @@ address {
   font-style: normal;
 }
 
-// Inline and block code styles
-code,
-pre {
-  padding: 0 3px 2px;
-  #font > #family > .monospace;
-  font-size: @baseFontSize - 1;
-  color: @grayDark;
-  .border-radius(3px);
-}
-code {
-  padding: 3px 4px;
-  color: #d14;
-  background-color: #f7f7f9;
-  border: 1px solid #e1e1e8;
-}
-pre {
-  display: block;
-  padding: (@baseLineHeight - 1) / 2;
-  margin: 0 0 @baseLineHeight / 2;
-  font-size: 12px;
-  line-height: @baseLineHeight;
-  background-color: #f5f5f5;
-  border: 1px solid #ccc; // fallback for IE7-8
-  border: 1px solid rgba(0,0,0,.15);
-  .border-radius(4px);
-  white-space: pre;
-  white-space: pre-wrap;
-  word-break: break-all;
-
-  // Make prettyprint styles more spaced out for readability
-  &.prettyprint {
-    margin-bottom: @baseLineHeight;
-  }
-
-  // Account for some code outputs that place code tags in pre tags
-  code {
-    padding: 0;
-    background-color: transparent;
-  }
-}
-
+// Misc
 small {
   font-size: 100%;
 }
-
 cite {
   font-style: normal;
 }

data/vendor/toolkit/twitter/bootstrap/variables.less

@@ -30,22 +30,14 @@
 @pink:                  #c3325f;
 @purple:                #7a43b6;
 
-// Grid system
-// Modify the grid styles in mixins.less
-@gridColumns:           12;
-@gridColumnWidth:       60px;
-@gridGutterWidth:       20px;
-@siteWidth:             (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
-// Fluid width sidebar
-@fluidSidebarWidth:     220px;
-
 // Typography
 @baseFontSize:          13px;
 @baseFontFamily:        "Helvetica Neue", Helvetica, Arial, sans-serif;
 @baseLineHeight:        18px;
+@textColor:             @grayDark;
 
 // Buttons
-@primaryButtonColor:    @blue;
+@primaryButtonBackground:    @linkColor;
 
 
 
@@ -55,36 +47,61 @@
 // Z-index master list
 // Used for a bird's eye view of components dependent on the z-axis
 // Try to avoid customizing these :)
-@zindexDropdown:        1000;
-@zindexPopover:         1010;
-@zindexTooltip:         1020;
-@zindexFixedNavbar:     1030;
-@zindexModalBackdrop:   1040;
-@zindexModal:           1050;
+@zindexDropdown:          1000;
+@zindexPopover:           1010;
+@zindexTooltip:           1020;
+@zindexFixedNavbar:       1030;
+@zindexModalBackdrop:     1040;
+@zindexModal:             1050;
+
+// Sprite icons path
+@iconSpritePath:          "../img/glyphicons-halflings.png";
+@iconWhiteSpritePath:     "../img/glyphicons-halflings-white.png";
 
 // Input placeholder text color
-@placeholderText:       @grayLight;
+@placeholderText:         @grayLight;
+
+// Hr border color
+@hrBorder:                @grayLighter;
 
 // Navbar
 @navbarHeight:                    40px;
 @navbarBackground:                @grayDarker;
 @navbarBackgroundHighlight:       @grayDark;
+@navbarLinkBackgroundHover:       transparent;
+
+@navbarText:                      @grayLight;
+@navbarLinkColor:                 @grayLight;
+@navbarLinkColorHover:            @white;
 
 // Form states and alerts
 @warningText:             #c09853;
 @warningBackground:       #fcf8e3;
-@warningBorder:           #f3edd2;
+@warningBorder:           darken(spin(@warningBackground, -10), 3%);
 
 @errorText:               #b94a48;
 @errorBackground:         #f2dede;
-@errorBorder:             #e9c7c7;
+@errorBorder:             darken(spin(@errorBackground, -10), 3%);
 
 @successText:             #468847;
 @successBackground:       #dff0d8;
-@successBorder:           #cfe8c4;
+@successBorder:           darken(spin(@successBackground, -10), 5%);
 
 @infoText:                #3a87ad;
 @infoBackground:          #d9edf7;
-@infoBorder:              #bfe1f2;
+@infoBorder:              darken(spin(@infoBackground, -10), 7%);
+
+
+
+// GRID
+// --------------------------------------------------
 
+// Default 940px grid
+@gridColumns:             12;
+@gridColumnWidth:         60px;
+@gridGutterWidth:         20px;
+@gridRowWidth:            (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
 
+// Fluid grid
+@fluidGridColumnWidth:    6.382978723%;
+@fluidGridGutterWidth:    2.127659574%;

data/vendor/toolkit/twitter/bootstrap_base.less

@@ -0,0 +1,2 @@
+@import "bootstrap/variables.less";
+@import "bootstrap/mixins.less";

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twitter-bootstrap-rails
 version: !ruby/object:Gem::Version
-  version: '2.0'
+  version: 2.0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,54 +9,54 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-28 00:00:00.000000000 Z
+date: 2012-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &79576780 !ruby/object:Gem::Requirement
+  requirement: &72451470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *79576780
+  version_requirements: *72451470
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &79576160 !ruby/object:Gem::Requirement
+  requirement: &72451060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *79576160
+  version_requirements: *72451060
 - !ruby/object:Gem::Dependency
   name: less-rails
-  requirement: &79575560 !ruby/object:Gem::Requirement
+  requirement: &72450830 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 2.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *79575560
+  version_requirements: *72450830
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &79574900 !ruby/object:Gem::Requirement
+  requirement: &72905200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *79574900
+  version_requirements: *72905200
 description: twitter-bootstrap-rails project integrates Bootstrap CSS toolkit for
-  Rails 3.2 Asset Pipeline
+  Rails 3.1 Asset Pipeline
 email:
 - seyhunak@gmail.com
 executables: []
@@ -64,23 +64,36 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/generators/bootstrap/layout/layout_generator.rb
+- lib/generators/bootstrap/layout/templates/layout.html.slim
 - lib/generators/bootstrap/layout/templates/layout.html.erb
+- lib/generators/bootstrap/layout/templates/layout.html.haml
 - lib/generators/bootstrap/themed/themed_generator.rb
+- lib/generators/bootstrap/themed/templates/new.html.slim
 - lib/generators/bootstrap/themed/templates/show.html.erb
+- lib/generators/bootstrap/themed/templates/show.html.slim
 - lib/generators/bootstrap/themed/templates/new.html.erb
+- lib/generators/bootstrap/themed/templates/show.html.haml
+- lib/generators/bootstrap/themed/templates/edit.html.haml
+- lib/generators/bootstrap/themed/templates/_form.html.haml
+- lib/generators/bootstrap/themed/templates/_form.html.slim
+- lib/generators/bootstrap/themed/templates/edit.html.slim
+- lib/generators/bootstrap/themed/templates/new.html.haml
 - lib/generators/bootstrap/themed/templates/index.html.erb
 - lib/generators/bootstrap/themed/templates/_form.html.erb
 - lib/generators/bootstrap/themed/templates/edit.html.erb
+- lib/generators/bootstrap/themed/templates/index.html.haml
+- lib/generators/bootstrap/themed/templates/index.html.slim
 - lib/generators/bootstrap/install/templates/bootstrap.coffee
+- lib/generators/bootstrap/install/templates/bootstrap_and_overrides.less
 - lib/generators/bootstrap/install/templates/application.js
 - lib/generators/bootstrap/install/templates/application.css
-- lib/generators/bootstrap/install/templates/bootstrap.less
 - lib/generators/bootstrap/install/install_generator.rb
 - lib/twitter-bootstrap-rails.rb
 - lib/twitter/bootstrap/rails/bootstrap.rb
 - lib/twitter/bootstrap/rails/version.rb
 - lib/twitter/bootstrap/rails/engine.rb
-- vendor/assets/stylesheets/twitter/bootstrap.css.less
+- vendor/assets/images/twitter/bootstrap/glyphicons-halflings-white.png
+- vendor/assets/images/twitter/bootstrap/glyphicons-halflings.png
 - vendor/assets/javascripts/twitter/bootstrap.js
 - vendor/assets/javascripts/twitter/bootstrap/bootstrap-modal.js
 - vendor/assets/javascripts/twitter/bootstrap/bootstrap-button.js
@@ -94,15 +107,16 @@ files:
 - vendor/assets/javascripts/twitter/bootstrap/bootstrap-tooltip.js
 - vendor/assets/javascripts/twitter/bootstrap/bootstrap-alert.js
 - vendor/assets/javascripts/twitter/bootstrap/bootstrap-scrollspy.js
-- vendor/toolkit/twitter/bootstrap.less
+- vendor/toolkit/twitter/bootstrap_base.less
 - vendor/toolkit/twitter/bootstrap/thumbnails.less
+- vendor/toolkit/twitter/bootstrap/code.less
 - vendor/toolkit/twitter/bootstrap/navbar.less
-- vendor/toolkit/twitter/bootstrap/patterns.less
 - vendor/toolkit/twitter/bootstrap/pagination.less
 - vendor/toolkit/twitter/bootstrap/close.less
 - vendor/toolkit/twitter/bootstrap/utilities.less
 - vendor/toolkit/twitter/bootstrap/carousel.less
 - vendor/toolkit/twitter/bootstrap/tables.less
+- vendor/toolkit/twitter/bootstrap/grid.less
 - vendor/toolkit/twitter/bootstrap/labels.less
 - vendor/toolkit/twitter/bootstrap/tooltip.less
 - vendor/toolkit/twitter/bootstrap/component-animations.less
@@ -111,10 +125,11 @@ files:
 - vendor/toolkit/twitter/bootstrap/alerts.less
 - vendor/toolkit/twitter/bootstrap/scaffolding.less
 - vendor/toolkit/twitter/bootstrap/navs.less
-- vendor/toolkit/twitter/bootstrap/print.less
+- vendor/toolkit/twitter/bootstrap/hero-unit.less
 - vendor/toolkit/twitter/bootstrap/sprites.less
 - vendor/toolkit/twitter/bootstrap/forms.less
 - vendor/toolkit/twitter/bootstrap/button-groups.less
+- vendor/toolkit/twitter/bootstrap/layouts.less
 - vendor/toolkit/twitter/bootstrap/progress-bars.less
 - vendor/toolkit/twitter/bootstrap/breadcrumbs.less
 - vendor/toolkit/twitter/bootstrap/reset.less
@@ -153,5 +168,5 @@ rubyforge_project: twitter-bootstrap-rails
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: Bootstrap CSS toolkit for Rails 3.2 Asset Pipeline
+summary: Bootstrap CSS toolkit for Rails 3.1 Asset Pipeline
 test_files: []

data/lib/generators/bootstrap/install/templates/bootstrap.less

@@ -1,5 +0,0 @@
-@import "twitter/bootstrap";
-
-// Baseline grid
-@basefont:          13px;
-@baseline:          18px;

data/vendor/assets/stylesheets/twitter/bootstrap.css.less

@@ -1 +0,0 @@
-@import "twitter/bootstrap/bootstrap";

data/vendor/toolkit/twitter/bootstrap.less

@@ -1 +0,0 @@
-@import "bootstrap/bootstrap.less";

data/vendor/toolkit/twitter/bootstrap/patterns.less

@@ -1,30 +0,0 @@
-// Patterns.less
-// Repeatable UI elements outside the base styles provided from the scaffolding
-// ----------------------------------------------------------------------------
-
-
-// PAGE HEADERS
-// ------------
-
-.hero-unit {
-  padding: 60px;
-  margin-bottom: 30px;
-  background-color: #f5f5f5;
-  .border-radius(6px);
-  h1 {
-    margin-bottom: 0;
-    font-size: 60px;
-    line-height: 1;
-    letter-spacing: -1px;
-  }
-  p {
-    font-size: 18px;
-    font-weight: 200;
-    line-height: @baseLineHeight * 1.5;
-  }
-}
-footer {
-  padding-top: @baseLineHeight - 1;
-  margin-top: @baseLineHeight - 1;
-  border-top: 1px solid #eee;
-}

data/vendor/toolkit/twitter/bootstrap/print.less

@@ -1,18 +0,0 @@
-/*!
- * Bootstrap @VERSION for Print
- *
- * 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.
- * Date: @DATE
- */
-
-
-// HIDE UNECESSARY COMPONENTS
-// --------------------------
-
-.navbar-fixed {
-  display: none;
-}