condense the stylesheets

18 files changed, 66 insertions, 69 deletions

diff --git a/app/assets/stylesheets/alerts.css.scss b/app/assets/stylesheets/alerts.css.scss
deleted file mode 100644
index e69de29..0000000
--- a/app/assets/stylesheets/alerts.css.scss
+++ /dev/null
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
deleted file mode 100644
index 4c4405c..0000000
--- a/app/assets/stylesheets/application.css
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- *
- *= require_self
- *= require ./application/main
- */
-
-/* If you put any styles in this file directly, I will knife you. */
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
new file mode 100644
index 0000000..c6020bd
--- /dev/null
+++ b/app/assets/stylesheets/application.css.scss
@@ -0,0 +1,8 @@
+/*
+ * This is a manifest file that'll be compiled into application.css.
+ */
+/* If you put any styles in this file directly, I will knife you. */
+
+@import "colors";
+@import "bootstrapify";
+@import "scaffolds";
diff --git a/app/assets/stylesheets/application/bootstrapify.scss b/app/assets/stylesheets/bootstrapify.scss
index 08421f9..08421f9 100644
--- a/app/assets/stylesheets/application/bootstrapify.scss
+++ b/app/assets/stylesheets/bootstrapify.scss
diff --git a/app/assets/stylesheets/brackets.css.scss b/app/assets/stylesheets/brackets.css.scss
deleted file mode 100644
index e69de29..0000000
--- a/app/assets/stylesheets/brackets.css.scss
+++ /dev/null
diff --git a/app/assets/stylesheets/colors.css.scss b/app/assets/stylesheets/colors.css.scss
index 7ab3024..8e0b3de 100644
--- a/app/assets/stylesheets/colors.css.scss
+++ b/app/assets/stylesheets/colors.css.scss
@@ -1,5 +1,24 @@
+/*
 $darker-orange: #9D4102;
 $link-yellow: #FFC50D;
 $orange: #DD9125;
-/*$page-color: #444;*/
-/*$toolbar-color: black;*/
+$page-color: #444;
+$toolbar-color: black;
+*/
+
+// See this file for a complete list of variables:
+//    vendor/bundle/ruby/2.0.0/gems/bootstrap-sass-3.1.1.1/vendor/assets/stylesheets/bootstrap/_variables.scss
+/*
+$gray-darker:            lighten(#000, 13.5%) !default; // #222
+$gray-dark:              lighten(#000, 20%) !default;   // #333
+$gray:                   lighten(#000, 33.5%) !default; // #555
+$gray-light:             lighten(#000, 60%) !default;   // #999
+$gray-lighter:           lighten(#000, 93.5%) !default; // #eee
+
+$brand-primary:         #428bca !default;
+$brand-success:         #5cb85c !default;
+$brand-info:            #5bc0de !default;
+$brand-warning:         #f0ad4e !default;
+$brand-danger:          #d9534f !default;
+*/
+$legend-border-color: #ccc; // matches the default $input-border and $btn-default-border
diff --git a/app/assets/stylesheets/games.css.scss b/app/assets/stylesheets/games.css.scss
deleted file mode 100644
index e69de29..0000000
--- a/app/assets/stylesheets/games.css.scss
+++ /dev/null
diff --git a/app/assets/stylesheets/main.css.scss b/app/assets/stylesheets/main.css.scss
deleted file mode 100644
index e69de29..0000000
--- a/app/assets/stylesheets/main.css.scss
+++ /dev/null
diff --git a/app/assets/stylesheets/matches.css.scss b/app/assets/stylesheets/matches.css.scss
deleted file mode 100644
index e3ad6e7..0000000
--- a/app/assets/stylesheets/matches.css.scss
+++ /dev/null
@@ -1,36 +0,0 @@
-#peer_review_boxes li {
-    cursor: move;
-    position: relative;
-    float: left;
-    margin: 5px;
-    width: 180px;
-    height: 240px;
-    border: 1px solid rgb(0, 0, 0);
-    text-align: center;
-    padding-top: 10px;
-    background-color: rgb(238, 238, 255);
-}
-
-// Nothing uses this one right now
-#peer_review_numeric li {
-    cursor: move;
-    position: relative;
-    float: left;
-    margin: 5px;
-    width: 180px;
-    height: 240px;
-    border: 1px solid rgb(0, 0, 0);
-    text-align: center;
-    padding-top: 10px;
-    background-color: rgb(238, 238, 255);
-}
-
-/**** INDEX PAGE - TABLE AND GRAPH ****/
-#matches-table {
-    @extend .table;
-    color: #FFF;
-
-    form {
-        color: #333;
-    }
-}
diff --git a/app/assets/stylesheets/pms.css.scss b/app/assets/stylesheets/pms.css.scss
deleted file mode 100644
index e69de29..0000000
--- a/app/assets/stylesheets/pms.css.scss
+++ /dev/null
diff --git a/app/assets/stylesheets/application/main.css.scss b/app/assets/stylesheets/scaffolds.scss
index 655700d..8fe3cc9 100644
--- a/app/assets/stylesheets/application/main.css.scss
+++ b/app/assets/stylesheets/scaffolds.scss
@@ -1,21 +1,3 @@
-// See this file for a complete list of variables:
-//    vendor/bundle/ruby/2.0.0/gems/bootstrap-sass-3.1.1.1/vendor/assets/stylesheets/bootstrap/_variables.scss
-/*
-$gray-darker:            lighten(#000, 13.5%) !default; // #222
-$gray-dark:              lighten(#000, 20%) !default;   // #333
-$gray:                   lighten(#000, 33.5%) !default; // #555
-$gray-light:             lighten(#000, 60%) !default;   // #999
-$gray-lighter:           lighten(#000, 93.5%) !default; // #eee
-
-$brand-primary:         #428bca !default;
-$brand-success:         #5cb85c !default;
-$brand-info:            #5bc0de !default;
-$brand-warning:         #f0ad4e !default;
-$brand-danger:          #d9534f !default;
-*/
-$legend-border-color: #ccc; // matches the default $input-border and $btn-default-border
-@import "bootstrapify";
-
 /* Mixins ***********************************************************/
 /* These are just here for other things to @extend. */
 /* Ok, they're really classes, but we don't use them like it. */
@@ -91,6 +73,43 @@ form#search {
 
 }
 
+#peer_review_boxes li {
+    cursor: move;
+    position: relative;
+    float: left;
+    margin: 5px;
+    width: 180px;
+    height: 240px;
+    border: 1px solid rgb(0, 0, 0);
+    text-align: center;
+    padding-top: 10px;
+    background-color: rgb(238, 238, 255);
+}
+
+// Nothing uses this one right now
+#peer_review_numeric li {
+    cursor: move;
+    position: relative;
+    float: left;
+    margin: 5px;
+    width: 180px;
+    height: 240px;
+    border: 1px solid rgb(0, 0, 0);
+    text-align: center;
+    padding-top: 10px;
+    background-color: rgb(238, 238, 255);
+}
+
+/**** INDEX PAGE - TABLE AND GRAPH ****/
+#matches-table {
+    @extend .table;
+    color: #FFF;
+
+    form {
+        color: #333;
+    }
+}
+
 /* Classes **********************************************************/
 
 /*
diff --git a/app/assets/stylesheets/search.css.scss b/app/assets/stylesheets/search.css.scss
deleted file mode 100644
index e69de29..0000000
--- a/app/assets/stylesheets/search.css.scss
+++ /dev/null
diff --git a/app/assets/stylesheets/servers.css.scss b/app/assets/stylesheets/servers.css.scss
deleted file mode 100644
index e69de29..0000000
--- a/app/assets/stylesheets/servers.css.scss
+++ /dev/null
diff --git a/app/assets/stylesheets/sessions.css.scss b/app/assets/stylesheets/sessions.css.scss
deleted file mode 100644
index e69de29..0000000
--- a/app/assets/stylesheets/sessions.css.scss
+++ /dev/null
diff --git a/app/assets/stylesheets/teams.css.scss b/app/assets/stylesheets/teams.css.scss
deleted file mode 100644
index e69de29..0000000
--- a/app/assets/stylesheets/teams.css.scss
+++ /dev/null
diff --git a/app/assets/stylesheets/tournaments.css.scss b/app/assets/stylesheets/tournaments.css.scss
deleted file mode 100644
index e69de29..0000000
--- a/app/assets/stylesheets/tournaments.css.scss
+++ /dev/null
diff --git a/app/assets/stylesheets/users.css.scss b/app/assets/stylesheets/users.css.scss
deleted file mode 100644
index e69de29..0000000
--- a/app/assets/stylesheets/users.css.scss
+++ /dev/null
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 7cb7e0f..92ca6ad 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -4,7 +4,6 @@
 	<title>Leaguer</title>
 
 	<%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true %>
-	<%= stylesheet_link_tag "#{params[:controller]}", media: "all", "data-turbolinks-track" => true %>
 
 	<%= javascript_include_tag "application", "data-turbolinks-track" => true %>
 	<%= javascript_include_tag "#{params[:controller]}", "data-turbolinks-track" => true %>