From e2796a3f26c200123f81a9957b84378aad6fc952 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <shumakl@purdue.edu>
Date: Sat, 3 May 2014 19:26:52 -0400
Subject: foo

---
 app/assets/stylesheets/colors.css.scss | 24 ------------------------
 app/assets/stylesheets/colors.scss     | 32 ++++++++++++++++++++++++++++++++
 app/views/sessions/new.html.erb        |  2 +-
 3 files changed, 33 insertions(+), 25 deletions(-)
 delete mode 100644 app/assets/stylesheets/colors.css.scss
 create mode 100644 app/assets/stylesheets/colors.scss

diff --git a/app/assets/stylesheets/colors.css.scss b/app/assets/stylesheets/colors.css.scss
deleted file mode 100644
index 8e0b3de..0000000
--- a/app/assets/stylesheets/colors.css.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-$darker-orange: #9D4102;
-$link-yellow: #FFC50D;
-$orange: #DD9125;
-$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/colors.scss b/app/assets/stylesheets/colors.scss
new file mode 100644
index 0000000..4a5ca71
--- /dev/null
+++ b/app/assets/stylesheets/colors.scss
@@ -0,0 +1,32 @@
+/*
+$darker-orange: #9D4102;
+$link-yellow: #FFC50D;
+$orange: #DD9125;
+$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
+// Or visit (replace '@' with '$'; less uses '@' for variables)
+//    http://getbootstrap.com/customize/#less-variables
+/*
+$gray-darker:
+$gray-dark:
+$gray:
+$gray-light:
+$gray-lighter:
+
+$brand-primary:
+$brand-success:
+$brand-info:
+$brand-warning:
+$brand-danger:
+*/
+
+/*
+$text-color: #DD9125;
+$body-bg: #333;
+*/
+
+$legend-border-color: #ccc; // matches the default $input-border and $btn-default-border
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index 10adced..1b60ca7 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -3,7 +3,7 @@
 <div>
 	<%= form_tag(sessions_path, method: :post, id: :new_session) do %>
 		<% if params[:action] == "create" %>
-			<div id="error_explanation">
+			<div class="alert-danger">
 				<p>The username/password pair you entered did
 				not match our records.  Check your typing and
 				try again.</p>
-- 
cgit v1.1-4-g5e80