From 57f268a4f87d73734c49bf9892346cc8cd37ed30 Mon Sep 17 00:00:00 2001
From: Brigitte Warner <brigitte.warner@gmail.com>
Date: Tue, 23 Sep 2014 17:42:15 -0400
Subject: [PATCH] wip fix progress

---
 Gemfile                                       |  6 +--
 Gemfile.lock                                  | 42 ++++++++++++-------
 .../{application.css => application.css.scss} |  5 ++-
 app/views/layouts/application.html.haml       |  2 +-
 app/views/time_entries/new.haml               |  2 +-
 5 files changed, 36 insertions(+), 21 deletions(-)
 rename app/assets/stylesheets/{application.css => application.css.scss} (96%)

diff --git a/Gemfile b/Gemfile
index 4d7db12..4f89180 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,9 +22,9 @@ gem 'jbuilder'
 # in production environments by default.
 group :assets do
   gem 'coffee-rails'
-  # Use SCSS for stylesheets
-  gem 'sass-rails'
-  # Use bootstrap-sass for stylesheets
+  gem 'sprockets-rails', '=2.0.0.backport1'
+  gem 'sprockets', '=2.2.2.backport2'
+  gem 'sass-rails', github: 'guilleiguaran/sass-rails', branch: 'backport'
   gem 'bootstrap-sass'
   gem 'uglifier'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index a4a6a58..0f1e422 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,13 @@
+GIT
+  remote: git://github.com/guilleiguaran/sass-rails.git
+  revision: 0393d9e1a6e4a776e61f16fb75f97971b9f4abd2
+  branch: backport
+  specs:
+    sass-rails (4.0.1)
+      railties (>= 3.2.0, < 5.0)
+      sass (>= 3.2.0)
+      sprockets-rails (~> 2.0.0.backport1)
+
 GIT
   remote: https://github.com/spacemunkay/acts_as_loggable.git
   revision: 8484dc1f7a58699705c5ffb593ebdf700a9f374a
@@ -41,7 +51,7 @@ GEM
     bcrypt (3.1.7)
     bcrypt-ruby (3.1.5)
       bcrypt (>= 3.1.3)
-    bootstrap-sass (3.2.0.0)
+    bootstrap-sass (3.2.0.1)
       sass (~> 3.2)
     bootstrap-will_paginate (0.0.10)
       will_paginate
@@ -81,7 +91,7 @@ GEM
     factory_girl_rails (4.4.1)
       factory_girl (~> 4.4.0)
       railties (>= 3.0.0)
-    faker (1.4.2)
+    faker (1.4.3)
       i18n (~> 0.5)
     ffi (1.9.3)
     formatador (0.2.5)
@@ -147,7 +157,7 @@ GEM
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
     polyglot (0.3.5)
-    pry (0.10.0)
+    pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
@@ -183,12 +193,12 @@ GEM
       rspec-core (~> 3.0.0)
       rspec-expectations (~> 3.0.0)
       rspec-mocks (~> 3.0.0)
-    rspec-core (3.0.3)
+    rspec-core (3.0.4)
       rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.3)
+    rspec-expectations (3.0.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.3)
+    rspec-mocks (3.0.4)
       rspec-support (~> 3.0.0)
     rspec-rails (3.0.2)
       actionpack (>= 3.0)
@@ -198,26 +208,26 @@ GEM
       rspec-expectations (~> 3.0.0)
       rspec-mocks (~> 3.0.0)
       rspec-support (~> 3.0.0)
-    rspec-support (3.0.3)
-    sass (3.3.10)
-    sass-rails (3.2.6)
-      railties (~> 3.2.0)
-      sass (>= 3.1.10)
-      tilt (~> 1.3)
+    rspec-support (3.0.4)
+    sass (3.4.0)
     slop (3.6.0)
     spork (0.9.2)
-    sprockets (2.2.2)
+    sprockets (2.2.2.backport2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.0.backport1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.2.2.backport2)
     thor (0.19.1)
     tilt (1.4.1)
     timers (1.1.0)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.40)
+    tzinfo (0.3.41)
     uglifier (2.5.3)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
@@ -258,7 +268,9 @@ DEPENDENCIES
   rails (= 3.2.19)
   rb-fsevent
   rspec-rails
-  sass-rails
+  sass-rails!
   spork
+  sprockets (= 2.2.2.backport2)
+  sprockets-rails (= 2.0.0.backport1)
   uglifier
   will_paginate
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css.scss
similarity index 96%
rename from app/assets/stylesheets/application.css
rename to app/assets/stylesheets/application.css.scss
index 108df86..def02fa 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css.scss
@@ -15,6 +15,9 @@
  *= require bootstrap_and_overrides
 */
 
+@import 'bootstrap-sprockets';
+@import 'bootstrap';
+
 * {
 	-webkit-box-sizing: border-box;
 	-moz-box-sizing: border-box;
@@ -93,4 +96,4 @@ margin-left: -15px;
 
 .navbar-default a:hover {
   color: #d1b84a !important;
-}
\ No newline at end of file
+}
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index e13e846..dba5822 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -24,7 +24,7 @@
 
         - if user_signed_in?
           /[Collect the nav links, forms, and other content for toggling]
-          %div{class: "collapse navbar-collapse", id:"bs-example-navbar-collapse-1"}
+          #bs-example-navbar-collapse-1.collapse.navbar-collapse
             %ul{class: "nav navbar-nav"}
               %li
                 %a{href: new_time_entry_path} Add Time Entry
diff --git a/app/views/time_entries/new.haml b/app/views/time_entries/new.haml
index 69966ee..6aa4cec 100644
--- a/app/views/time_entries/new.haml
+++ b/app/views/time_entries/new.haml
@@ -2,7 +2,7 @@
 
 %p
   .control-group
-    .controls{ class: "bootstrap-timepicker col-xs-12 col-sm-12 col-md-12 input-group"}
+    .controls.bootstrap-timepicker.col-xs-12.col-sm-12.col-md-12.input-group
       .span{ class: "input-group-addon", style: "min-width: 100px; font-size: large"} Date
       %input{id: "date_id", placeholder: "Date", type: "text", class: "datepicker input-large col-xs-12 col-sm-12 col-md-12 form-control" }
       .help-block