new homepage, better css

4 files changed, 47 insertions, 4 deletions

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 3192ec8..355c0d4 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -9,5 +9,16 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require_self
- *= require_tree .
+ *= require_tree
+
  */
+
+#query{
+	background-color: #888;
+	border: 2px solid #ED9C28;
+	border-radius: 5px;
+	color: #FFF;
+	font-weight: bold;
+	height: 30px;
+
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss
index 7561529..8279f4f 100644
--- a/app/assets/stylesheets/scaffolds.css.scss
+++ b/app/assets/stylesheets/scaffolds.css.scss
@@ -1,12 +1,12 @@
 body {
-  background-color: #909090;
+  background-color: #EEEEEE;
   color: #333;
   font-family: verdana, arial, helvetica, sans-serif;
   font-size: 13px;
   line-height: 18px;
 
   h1, h2, h3, h4, h5{
-    color: #F0F0F0;
+    color: #0f0f0f;
   }
 }
 
@@ -72,6 +72,17 @@ div {
   }
 }
 
+hr {
+  -moz-border-bottom-colors: none;
+  -moz-border-image: none;
+  -moz-border-left-colors: none;
+  -moz-border-right-colors: none;
+  -moz-border-top-colors: none;
+  border-color: #999 -moz-use-text-color #FFFFFF;
+  border-style: solid none;
+  border-width: 1px 0;
+  margin: 18px 0;
+}
 
 #footer{
   text-align: center;
diff --git a/app/assets/stylesheets/static.css.scss b/app/assets/stylesheets/static.css.scss
new file mode 100644
index 0000000..9457e7f
--- /dev/null
+++ b/app/assets/stylesheets/static.css.scss
@@ -0,0 +1,12 @@
+// Place all the styles related to the static controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: 
+
+.jumbotron {
+	background-color: #FFF;
+
+	p {
+		line-height: 1.5em;
+	}
+
+}
\ No newline at end of file
diff --git a/app/views/static/homepage.html.erb b/app/views/static/homepage.html.erb
index 1d999b8..bca440a 100644
--- a/app/views/static/homepage.html.erb
+++ b/app/views/static/homepage.html.erb
@@ -1 +1,10 @@
-<h1>Welcome to Leauger</h1>
\ No newline at end of file
+<div role="main" class="container theme-showcase">
+
+      <!-- Main jumbotron for a primary marketing message or call to action -->
+      <div class="jumbotron">
+        <h1>Welcome to Leauger</h1>
+        <p>This is a tournment management system designed to be used for any team sport. Our peer review system ensures that the best players move on to the next round! Try creating a new tournament and having people sign up for it. </p>
+        <p id="jumbo-buttons"><%= link_to 'Log In / Sign Up', "#", :class => "btn btn-warning btn-lg", :role => "button" %> <%= link_to 'See Ongoing Tournaments', tournaments_path, :class => "btn btn-warning btn-lg", :role => "button" %> </p>
+      </div>
+
+    </div>
\ No newline at end of file