speedo 0.3.4 → 0.4.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: speedo
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-13 00:00:00.000000000Z
+date: 2012-08-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2165588680 !ruby/object:Gem::Requirement
+  requirement: &2157155620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2165588680
+  version_requirements: *2157155620
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2165587800 !ruby/object:Gem::Requirement
+  requirement: &2157154920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165587800
+  version_requirements: *2157154920
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &2165586940 !ruby/object:Gem::Requirement
+  requirement: &2157154440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165586940
+  version_requirements: *2157154440
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &2165585540 !ruby/object:Gem::Requirement
+  requirement: &2157153740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165585540
+  version_requirements: *2157153740
+- !ruby/object:Gem::Dependency
+  name: bootstrap-sass
+  requirement: &2157153140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2157153140
 - !ruby/object:Gem::Dependency
   name: bourbon
-  requirement: &2165584240 !ruby/object:Gem::Requirement
+  requirement: &2157152600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165584240
+  version_requirements: *2157152600
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &2165583020 !ruby/object:Gem::Requirement
+  requirement: &2157152060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +88,10 @@ dependencies:
         version: 2.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2165583020
+  version_requirements: *2157152060
 - !ruby/object:Gem::Dependency
   name: speedo-formstrap
-  requirement: &2165581920 !ruby/object:Gem::Requirement
+  requirement: &2157151480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +99,10 @@ dependencies:
         version: 1.2.8
   type: :runtime
   prerelease: false
-  version_requirements: *2165581920
+  version_requirements: *2157151480
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2165580760 !ruby/object:Gem::Requirement
+  requirement: &2157150960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +110,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165580760
+  version_requirements: *2157150960
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2165579200 !ruby/object:Gem::Requirement
+  requirement: &2157150240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,7 +121,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165579200
+  version_requirements: *2157150240
 description: This is a layout gem intended as a backdrop for developing rails applications
   quickly. Its intention is to speed initial development, removing the need for any
   intensive front-end development until the app is functional.
@@ -127,12 +138,12 @@ files:
 - app/assets/stylesheets/application.css.scss
 - app/assets/stylesheets/speedo/base.css.scss
 - app/assets/stylesheets/speedo/helpers.css.scss
-- app/assets/stylesheets/speedo/layout.css.scss
 - app/assets/stylesheets/speedo/plugins.css.scss
 - app/assets/stylesheets/speedo/speedo.css.scss
 - app/assets/stylesheets/speedo/theme.css.scss
 - app/controllers/speedo/application_controller.rb
 - app/controllers/speedo/home_controller.rb
+- app/views/layouts/speedo/_navbar.html.haml
 - app/views/layouts/speedo/application.html.haml
 - app/views/speedo/home/examples.html.haml
 - config/locales/speedo.en.yml
@@ -144,7 +155,6 @@ files:
 - lib/speedo/version.rb
 - lib/speedo.rb
 - lib/tasks/speedo_tasks.rake
-- vendor/assets/javascripts/speedo/bootstrap.js
 - vendor/assets/javascripts/speedo/chosen.jquery.js
 - vendor/assets/javascripts/speedo/jquery.autogrow.js
 - vendor/assets/javascripts/speedo/jquery.autoSuggest.js
@@ -158,10 +168,6 @@ files:
 - vendor/assets/javascripts/speedo/respond.js
 - vendor/assets/javascripts/speedo/spin.js
 - vendor/assets/stylesheets/speedo/autoSuggest.css
-- vendor/assets/stylesheets/speedo/bootstrap/glyphicons-halflings-white.png
-- vendor/assets/stylesheets/speedo/bootstrap/glyphicons-halflings.png
-- vendor/assets/stylesheets/speedo/bootstrap-responsive.css
-- vendor/assets/stylesheets/speedo/bootstrap.css
 - vendor/assets/stylesheets/speedo/chosen-sprite.png
 - vendor/assets/stylesheets/speedo/chosen.css
 - vendor/assets/stylesheets/speedo/dataTables/back_disabled.png
@@ -373,7 +379,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3825462101128013981
+      hash: 2736315222714374532
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -382,7 +388,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3825462101128013981
+      hash: 2736315222714374532
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10

data/app/assets/stylesheets/speedo/layout.css.scss

@@ -1,220 +0,0 @@
-/* 
-  Column Layout
-  =============
-  This layout is designed for mobile-first, so that the 'side' columns go below the main 
-  content on narrower screen-widths.
-  
-  IMPORTANT: Most of the styles that will be seen by the typical browser (i.e. the 960 design) 
-  are in the @media queries below.
-  
-  Set the column background colours using the variables (top of file) for consistent 
-  column colouration.
-*/
-
-#wrapper {
-  max-width: 960px;      /* Set the width of the page here */
-  padding:0;
-  margin: 0 auto 20px;
-  @include border-bottom-radius(3px);
-  @include box-shadow(0 2px 2px rgba(0,0,0,0.5));
-}
-
-/* Layout for mobile < 480px width screens (see below for media queries) */
-.colmask {
-  position:relative;     /* This fixes the IE7 overflow hidden bug */
-  clear:both;
-  float:left;
-  width:100%;            /* width of whole page */
-  @include border-radius(0 0 3px 3px);
-  background:#fff;
-  overflow:hidden;       /* This chops off any overhanging divs, including the leftcol bg */
-}
-.colright,.colmid,.colleft {
-  float:left;
-  width:100%;
-  position:relative;
-}
-.col1,.col2,.col3 {
-  float:left;
-  position:relative;
-  padding:0 0 5em;
-}
-.onecol {                         /* Full page settings */
-  background:$maincolbg;          /* page background colour */
-  .col1 {
-    width:96%;                    /* page width minus left and right padding */
-    left:2%;                      /* page left padding */
-  }
-}
-.threecol, .leftcol, .rightcol {
-  background:$maincolbg;          /* main column background colour */
-  .col1, .col2, .col3 {
-    width:100%;                   /* page width minus left and right padding */
-    padding:0 2% 50px;            /* page left padding */
-  }
-  .col2 {background:$leftcolbg;}  /* left column background colour */
-  .col3 {background:$rightcolbg;} /* right column background colour */
-}
-.rightcol .col2, .leftcol .col3, .onecol .col2, .onecol .col3 { display:none; }
-
-
-/* Media Queries for Responsive Design. These override the primary ('mobile first') styles */
-
-@media only screen and (min-width: 480px) {
- /* Style adjustments for viewports 480px and over go here */
- /* 2 Column (double page) settings */
- .threecol {
-   .col2 {
-     width:46%;     /* left column content width (column width minus left and right padding) */
-     left:0%;       /* right column width plus left column left padding */
-   }
-   .col3 {
-     width:46%;     /* right column content width (column width minus left and right padding) */
-     left:0%;       /* (right column width) plus (left column left and right padding) plus (right column left padding) */
-   }
- }
-}
-
-@media only screen and (min-width: 768px) {
-  /* Style adjustments for viewports 768px and over (most desktop browsers) go here */
-  .colmask {
-    .col1, .col2, .col3 {
-      padding:0 0 5em;
-      background:transparent
-    }
-  }
-  .col1 { min-height:400px; }
-  .leftcol {                  /* 2 Column (left menu) settings */
-    background:$maincolbg;    /* right column background colour */
-    .colleft {
-      right:75%;              /* right column width */
-      background:$leftcolbg;  /* left column background colour */
-      @include box-shadow(inset -1px 0 0 #ccc); /* 0 spread so it isn't visible at the top and bottom */
-    }
-    .col1 {
-      width:71%;              /* right column content width */
-      left:102%;              /* 100% plus left column left padding */
-    }
-    .col2 {
-      width:21%;              /* left column content width (column width minus left and right padding) */
-      left:6%;                /* (right column left and right padding) plus (left column left padding) */
-    }
-    .col3 {
-      display:none;
-    }
-  }
-  .rightcol {                 /* 2 Column (right menu) settings */
-    background:$rightcolbg;   /* right column background colour */
-    .colleft {
-      right:25%;              /* right column width */
-      background:$maincolbg;  /* left column background colour */
-      @include box-shadow(inset -1px 0 0 #ccc); /* 0 spread so it isn't visible at the top and bottom */
-    }
-    .col1 {
-      width:71%;              /* left column content width (left column width minus left and right padding) */
-      left:27%;               /* (right column width) plus (left column left padding) */
-    }
-    .col2 {
-      display:none;
-    }
-    .col3 {
-      width:21%;              /* right column content width (right column width minus left and right padding) */
-      left:31%;               /* (right column width) plus (left column left and right padding) plus (right column left padding) */
-    }
-  }
-  .threecol {                 /* 3 Column settings */
-    background:$rightcolbg;   /* right column background colour */
-    .colmid {
-      right:25%;              /* width of the right column */
-      background:$maincolbg;  /* left column background colour */
-      @include box-shadow(1px 0 0 #ccc); /* Use box-shadow for 'borders' so the layout isn't affected */
-    }
-    .colleft {
-      right:50%;              /* width of the middle column */
-      background:$leftcolbg;  /* left column background colour */
-      @include box-shadow(inset -1px 0 0 #ccc); /* 0 spread so it isn't visible at the top and bottom */
-    }
-    .col1 {
-      width:46%;              /* width of center column content (column width minus padding on either side) */
-      left:102%;              /* 100% plus left padding of center column */
-    }
-    .col2 {
-      width:21%;              /* Width of left column content (column width minus padding on either side) */
-      left:31%;               /* width of (right column) plus (center column left and right padding) plus (left column left padding) */
-    }
-    .col3 {
-      width:21%;              /* Width of right column content (column width minus padding on either side) */
-      left:85%;               /* Please make note of the brackets here:
-      (100% - left column width) plus (center column left and right padding) plus (left column left and right padding) plus (right column left padding) */
-    }
-  }
-}
-
-
-
-/* Below are three options for variations on theming:
-  1. Web-app mode: Full-width, full-height page that doesn't scroll (the columns scroll instead) - also requires JS
-  2. Full-width page, fixed-position header, with scrolling content
-  3. Fixed-position header, with scrolling content (2 sections of CSS to uncomment)
-*/
-
-
-
-@media only screen and (min-width: 768px) {
-  /* For Web-app mode, uncomment this (and the JS in home.coffee) * /
-  #wrapper {
-    max-width: 100%;
-    width:100%;
-    margin:0;
-    padding:0;
-  }
-  .col1,.col2,.col3 {
-    overflow-y:auto;
-  }
-  /* */
-
-  /* For full-width fixed header+nav, uncomment this * /
-  #wrapper {
-    max-width: 100%;
-    width:100%;
-    margin:0;
-    padding:0;
-  }
-  .branding, .main_nav {
-    position:fixed;
-    width:100%;
-    top:0;
-    margin:0 auto;
-    z-index:1000;
-  }
-  .main_nav {
-    top:50px;         // Height of .branding
-  }
-  .col1,.col2,.col3 {
-    margin-top:83px;  // Height of .branding + .main_nav
-  }
-  /* */
-
-  /* For fixed header+nav, uncomment this (and 963 CSS below) * /
-  .branding, .main_nav {
-    position:fixed;
-    width:964px;
-    top:0;
-    margin:0 auto;
-    z-index:1000;
-  }
-  .main_nav {
-    top:50px;         // Height of .branding
-  }
-  .col1,.col2,.col3 {
-    margin-top:83px;  // Height of .branding + .main_nav
-  }
-  /* */  
-}
-@media only screen and (max-width: 963px) {
-  /* For fixed header+nav, uncomment this (and above) * /
-  .branding, .main_nav {
-    width:100%;
-  }
-  /* */
-}