Merge pull request #153 from hellcp/scss

Migrate away from less to scss

Gemfile

@@ -15,6 +15,8 @@ gem 'sprockets', '< 4.0'
 
 # Use SCSS for stylesheets
 gem 'sass-rails'
+# Bootstrap ui framework
+gem 'bootstrap-sass'
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier'
 # Use CoffeeScript for .js.coffee assets and views
@@ -28,6 +30,8 @@ gem 'turbolinks'
 gem 'haml-rails'
 # To test email with letter opener set the 'async_emails' option in site.yml to false
 gem 'letter_opener_web'
+# mini_racer for execjs
+gem 'mini_racer', platforms: :ruby
 
 group :doc do
   # bundle exec rake doc:rails generates the API under doc/api.
@@ -37,13 +41,6 @@ end
 # Debugger
 gem 'byebug', group: [:development, :test]
 
-# less support
-gem 'less-rails'
-gem 'mini_racer', platforms: :ruby
-# Remove therubyracer as soon as there's no less-rails anymore
-gem 'therubyracer', platforms: :ruby
-gem 'twitter-bootstrap-rails'
-
 gem 'active_hash'
 gem 'cancancan', '~> 1.17'
 gem 'carrierwave'

Gemfile.lock

@@ -43,10 +43,15 @@ GEM
     afm (0.2.2)
     arel (6.0.4)
     ast (2.4.2)
+    autoprefixer-rails (10.4.7.0)
+      execjs (~> 2)
     bcrypt (3.1.18)
     bigdecimal (1.3.5)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
+    bootstrap-sass (3.4.1)
+      autoprefixer-rails (>= 5.2.1)
+      sassc (>= 2.0.0)
     builder (3.2.4)
     byebug (11.1.3)
     cancancan (1.17.0)
@@ -87,7 +92,6 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    commonjs (0.2.7)
     concurrent-ruby (1.1.10)
     crass (1.0.6)
     daemons (1.4.1)
@@ -148,7 +152,7 @@ GEM
       has_scope (~> 0.6)
       railties (>= 4.2, < 5.3)
       responders
-    jquery-rails (4.5.0)
+    jquery-rails (4.5.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -168,19 +172,12 @@ GEM
     kaminari-core (1.2.2)
     launchy (2.5.0)
       addressable (~> 2.7)
-    less (2.6.0)
-      commonjs (~> 0.2.7)
-    less-rails (4.0.0)
-      actionpack (>= 4)
-      less (~> 2.6.0)
-      sprockets (>= 2)
     letter_opener (1.8.1)
       launchy (>= 2.2, < 3)
     letter_opener_web (1.4.1)
       actionmailer (>= 3.2)
       letter_opener (~> 1.0)
       railties (>= 3.2)
-    libv8 (3.16.14.19)
     libv8-node (16.10.0.0)
     localized_country_select (0.9.11)
       actionpack (>= 3.0)
@@ -263,7 +260,6 @@ GEM
       i18n
     rdoc (6.3.3)
     redcarpet (3.5.1)
-    ref (2.0.0)
     regexp_parser (2.6.0)
     request_store (1.5.1)
       rack (>= 1.4)
@@ -356,21 +352,13 @@ GEM
       state_machines-graphviz
       yard
     temple (0.9.1)
-    therubyracer (0.12.3)
-      libv8 (~> 3.16.14.15)
-      ref
     thor (1.2.1)
     thread_safe (0.3.6)
     tilt (2.0.11)
     ttfunk (1.0.3)
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
-    twitter-bootstrap-rails (3.2.2)
-      actionpack (>= 3.1)
-      execjs (>= 2.2.2, >= 2.2)
-      less-rails (>= 2.5.0)
-      railties (>= 3.1)
     tzinfo (1.2.10)
       thread_safe (~> 0.1)
     uglifier (4.2.0)
@@ -397,6 +385,7 @@ PLATFORMS
 DEPENDENCIES
   active_hash
   bigdecimal (= 1.3.5)
+  bootstrap-sass
   bundler (< 2.0)
   byebug
   cancancan (~> 1.17)
@@ -420,7 +409,6 @@ DEPENDENCIES
   jquery-rails
   jquery-ui-rails
   kaminari
-  less-rails
   letter_opener_web
   localized_country_select
   mini_racer
@@ -448,9 +436,7 @@ DEPENDENCIES
   sqlite3 (~> 1.3.13)
   state_machines-activerecord
   state_machines-yard
-  therubyracer
   turbolinks
-  twitter-bootstrap-rails
   uglifier
   web-console (~> 2.0)
   yard (~> 0.9.0)

app/assets/javascripts/application.js.coffee

@@ -13,7 +13,7 @@
 #= require jquery
 #= require jquery_ujs
 #= require jquery-ui
-#= require bootstrap
+#= require bootstrap-init
 #= require cocoon
 #= require additional
 #= require event_emails

app/assets/javascripts/bootstrap.js.coffee → app/assets/javascripts/bootstrap-init.js.coffee

@@ -1,5 +1,5 @@
 #
-#= require twitter/bootstrap
+#= require bootstrap
 #= require datetimepicker/bootstrap-datetimepicker
 #= require bootstrap-fileupload
 #= require bootstrap-multiselect

app/assets/stylesheets/application.css.less → app/assets/stylesheets/application.scss

@@ -9,7 +9,7 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require_self
- *= require bootstrap
+ *= require bootstrap_init
  *= require datetimepicker
  *= require bootstrap-fileupload
  *= require bootstrap-multiselect

app/assets/stylesheets/bootstrap.css.less → app/assets/stylesheets/bootstrap_init.scss

@@ -1,2 +1,2 @@
-@import "bootstrap_init";
+@import "bootstrap";
 @import "bootstrap_overrides";

app/assets/stylesheets/bootstrap_overrides.less → app/assets/stylesheets/bootstrap_overrides.scss

@@ -2,8 +2,8 @@ blockquote.collapse,
 .history blockquote {
     margin-bottom: 0px;
     p {
-        font-size: @font-size-base;
-        line-height: @line-height-base;
+        font-size: $font-size-base;
+        line-height: $line-height-base;
     }
 }
 
@@ -39,7 +39,7 @@ body {
   height: auto !important;
   height: 100%;
   /* Negative indent footer by it's height */
-  margin: 0 auto -@font-size-base*1.5;
+  margin: 0 auto -$font-size-base*1.5;
 }
 
 .navbar
@@ -114,7 +114,7 @@ body {
   text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
 }
 
-@media (min-width: @screen-lg-min) { 
+@media (min-width: $screen-lg-min) { 
   .nav-tsp {
     height:42px;
   }
@@ -133,12 +133,12 @@ body {
 
 #push-footer,
 #footer {
-  height: @font-size-base*1.5;
+  height: $font-size-base*1.5;
 }
 
 #footer {
-  background-color: @navbar-default-bg;
+  background-color: $navbar-default-bg;
   div {
-      font-size: @font-size-small;
+      font-size: $font-size-small;
   }
 }