compass_twitter_bootstrap 2.0.1.2 → 2.0.3

data/README.md

@@ -76,6 +76,23 @@ Demo App at https://github.com/vwall/Compass-Twitter-Bootstrap-Demo-App
     @import "compass_twitter_bootstrap"
 
 
+## Using [Font Awesome](http://fortawesome.github.com/Font-Awesome/)
+
+To use the font awesome font and icons simply change the standard import to:
+
+    @import "compass_twitter_bootstrap_awesome"
+
+## Using Javascripts with Rails Asset Pipeline
+
+Javascript Libraries are located in vendor/assets/javascripts
+
+Include them individually or 
+
+    //=require bootstrap-all
+
+to include all files
+
+
 ## TWITTER BOOTSTRAP
 
 Bootstrap is Twitter's toolkit for kickstarting CSS for websites, apps, and more. It includes base CSS styles for typography, forms, buttons, tables, grids, navigation, alerts, and more.

data/build/convert.rb

@@ -51,23 +51,13 @@ private
     sha = nil
     trees = open('https://api.github.com/repos/twitter/bootstrap/git/trees/master').read
     trees = JSON.parse trees
-
-    trees['tree'].select do |t|
-      if t['path'] == 'less'
-        sha = t['sha']
-      end
-    end
-
-    sha
+    trees['tree'].find{|t| t['path'] == 'less'}['sha']
   end
 
   def get_less_files
-    file_list = []
     files = open("https://api.github.com/repos/twitter/bootstrap/git/trees/#{get_tree_sha}").read
     files = JSON.parse files
-    files['tree'].each{|f| file_list << f['path']}
-
-    file_list
+    files['tree'].map{|f| f['path']}
   end
 
 

data/lib/compass_twitter_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module CompassTwitterBootstrap
-  VERSION = "2.0.1.2"
+  VERSION = "2.0.3"
 end

data/stylesheets/_compass_twitter_bootstrap.scss

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v2.0.0
+ * Bootstrap v2.0.3
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0
@@ -56,7 +56,7 @@
 
 // Components: Misc
 @import "compass_twitter_bootstrap/thumbnails";
-@import "compass_twitter_bootstrap/labels";
+@import "compass_twitter_bootstrap/labels-badges";
 @import "compass_twitter_bootstrap/progress-bars";
 @import "compass_twitter_bootstrap/accordion";
 @import "compass_twitter_bootstrap/carousel";

data/stylesheets/_compass_twitter_bootstrap_awesome.scss

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

data/stylesheets/_compass_twitter_bootstrap_responsive.scss

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Responsive v2.0.1
+ * Bootstrap Responsive v2.0.3
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0
@@ -8,6 +8,7 @@
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
  */
 
+
 // Responsive
 // For phone and tablet devices
 // -------------------------------------------------------------
@@ -24,304 +25,24 @@
 // 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 "compass_twitter_bootstrap/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) {
+// Phones to portrait tablets and narrow desktops
+@import "compass_twitter_bootstrap/responsive-767px-max";
 
-  // Fixed grid
-  @include gridSystem-generate(12, 70px, 30px);
+// Tablets to regular desktops
+@import "compass_twitter_bootstrap/responsive-768px-979px";
 
-  // Fluid grid
-  @include fluidGridSystem-generate(12, 5.982905983%, 2.564102564%);
+// Large desktops
+@import "compass_twitter_bootstrap/responsive-1200px-min";
 
-  // 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 "compass_twitter_bootstrap/responsive-navbar";