Moved to less-rails-bootstrap from twitter-bootstrap-rails and fixed LESS errors.HEADmaster

5 files changed, 40 insertions, 43 deletions

diff --git a/Gemfile b/Gemfile
index c64c0f0..43ad04b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -31,7 +31,7 @@ end
 
 # Use LESS for stylesheets
 gem 'less-rails'
-gem 'twitter-bootstrap-rails'
+gem 'less-rails-bootstrap'
 
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier', '>= 1.3.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index f82a32d..9bb6f24 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -42,40 +42,41 @@ GEM
     coffee-script-source (1.8.0)
     commonjs (0.2.7)
     daemons (1.1.9)
-    delayed_job (4.0.3)
-      activesupport (>= 3.0, < 4.2)
-    delayed_job_active_record (4.0.2)
-      activerecord (>= 3.0, < 4.2)
+    delayed_job (4.0.6)
+      activesupport (>= 3.0, < 5.0)
+    delayed_job_active_record (4.0.3)
+      activerecord (>= 3.0, < 5.0)
       delayed_job (>= 3.0, < 4.1)
     erubis (2.7.0)
-    execjs (2.2.1)
-    figaro (0.7.0)
-      bundler (~> 1.0)
-      rails (>= 3, < 5)
-    foreigner (1.6.1)
+    execjs (2.2.2)
+    figaro (1.0.0)
+      thor (~> 0.14)
+    foreigner (1.7.2)
       activerecord (>= 3.0.0)
     hike (1.2.3)
-    httparty (0.13.1)
+    httparty (0.13.3)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
-    i18n (0.6.11)
+    i18n (0.7.0)
     jbuilder (1.5.3)
       activesupport (>= 3.0.0)
       multi_json (>= 1.2.0)
     jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.1)
-    less (2.5.1)
+    json (1.8.2)
+    less (2.6.0)
       commonjs (~> 0.2.7)
-    less-rails (2.5.0)
+    less-rails (2.6.0)
       actionpack (>= 3.1)
-      less (~> 2.5.0)
-    libv8 (3.16.14.3)
+      less (~> 2.6.0)
+    less-rails-bootstrap (3.3.2.0)
+      less-rails (~> 2.6.0)
+    libv8 (3.16.14.7)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mailboxer (0.12.3)
+    mailboxer (0.12.5)
       carrierwave (>= 0.5.8)
       foreigner (>= 0.9.1)
       rails (>= 3.2.0)
@@ -83,10 +84,10 @@ GEM
     minitest (4.7.5)
     multi_json (1.10.1)
     multi_xml (0.5.5)
-    pg (0.17.1)
+    pg (0.18.1)
     polyglot (0.3.5)
     rack (1.5.2)
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.0.2)
       actionmailer (= 4.0.2)
@@ -101,16 +102,15 @@ GEM
       activesupport (= 4.0.2)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
-    rdoc (4.1.1)
-      json (~> 1.4)
+    rake (10.4.2)
+    rdoc (4.2.0)
     ref (1.0.5)
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
     simple_captcha2 (0.2.2)
       rails (>= 3.1, < 4.1)
-    sprockets (2.12.2)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -119,7 +119,7 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
-    sqlite3 (1.3.9)
+    sqlite3 (1.3.10)
     therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
       ref
@@ -129,15 +129,10 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    turbolinks (2.3.0)
+    turbolinks (2.5.3)
       coffee-rails
-    twitter-bootstrap-rails (2.2.8)
-      actionpack (>= 3.1)
-      execjs
-      rails (>= 3.1)
-      railties (>= 3.1)
-    tzinfo (0.3.41)
-    uglifier (2.5.3)
+    tzinfo (0.3.42)
+    uglifier (2.7.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
 
@@ -156,6 +151,7 @@ DEPENDENCIES
   jbuilder (~> 1.2)
   jquery-rails
   less-rails
+  less-rails-bootstrap
   mailboxer
   pg
   rails (= 4.0.2)
@@ -165,6 +161,5 @@ DEPENDENCIES
   therubyracer
   therubyrhino
   turbolinks
-  twitter-bootstrap-rails
   uglifier (>= 1.3.0)
   warbler
diff --git a/app/assets/stylesheets/bootstrapify.less b/app/assets/stylesheets/bootstrapify.less
index eb3b86b..5e4cdbf 100644
--- a/app/assets/stylesheets/bootstrapify.less
+++ b/app/assets/stylesheets/bootstrapify.less
@@ -21,12 +21,12 @@
  * along with Leaguer.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-@import "bootstrap";
+@import "twitter/bootstrap";
 
 // Connect Bootstrap classes to reasonable defaults
 
 .btn {
-	&:extend(.btn-default);
+	 &:extend(.btn-default);
 }
 
 button,
diff --git a/app/assets/stylesheets/colors.less b/app/assets/stylesheets/colors.less
index 61e1e57..be17cf8 100644
--- a/app/assets/stylesheets/colors.less
+++ b/app/assets/stylesheets/colors.less
@@ -1,3 +1,5 @@
+// Our color scheme was horrific.
+
 /*
 @darker-orange: #9D4102;
 @link-yellow: #FFC50D;
diff --git a/app/assets/stylesheets/scaffolds.less b/app/assets/stylesheets/scaffolds.less
index bbdd989..06cf8e3 100644
--- a/app/assets/stylesheets/scaffolds.less
+++ b/app/assets/stylesheets/scaffolds.less
@@ -40,15 +40,16 @@
 		/* .simple-input-group .btn:not(:last-child),
 		 * .simple-input-group .form-control:not(:last-child) { ... } */
 		&:not(:last-child) {
-			@include border-right-radius(0);
+			.border-right-radius(0);
 		}
 		&:not(:first-child) {
-			@include border-left-radius(0);
+			.border-left-radius(0);
 			border-left: 0;
 		}
 	}
 }
 
+
 /* IDs **************************************************************/
 /* Specific page elements */
 
@@ -172,15 +173,14 @@ div.field span.help-block {
 
 /* Elements *********************************************************/
 
-footer {
-	&:extend(.container);
+footer:extend(.container) {
 	margin-top: 1em;
-	border-top: solid 1px $hr-border;
+	border-top: solid 1px @hr-border;
 	text-align: center;
 }
 
 fieldset {
-	border: solid 1px $legend-border-color;
+	border: solid 1px @legend-border-color;
 	border-radius: .5em;
 	padding: 1em;
 	margin: 1em 0;
@@ -189,7 +189,7 @@ fieldset {
 		margin: 0;
 		padding: .25em .5em;
 		width: auto;
-		border: solid 1px $legend-border-color;
+		border: solid 1px @legend-border-color;
 		border-radius: .5em;
 	}
 }