From 899eb145a244c62f875b7342a8f687645230d914 Mon Sep 17 00:00:00 2001
From: AndrewMurrell <ImFromNASA@gmail.com>
Date: Sun, 25 Jan 2015 14:14:52 +0000
Subject: Moved to less-rails-bootstrap from twitter-bootstrap-rails and fixed
 LESS errors.

---
 app/assets/stylesheets/bootstrapify.less |  4 ++--
 app/assets/stylesheets/colors.less       |  2 ++
 app/assets/stylesheets/scaffolds.less    | 14 +++++++-------
 3 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'app/assets')

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;
 	}
 }
-- 
cgit v1.2.3