simplified stylesheet, remove gemfile.lock to force right gems to be …

…installed on vm, tweaked application.html.haml to include a div#main
daben · Jan 14, 2012 · fc70e2c · fc70e2c
1 parent 03b0102
commit fc70e2c
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 165 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
@@ -1,28 +1,61 @@
-/*
- * This is a manifest file that'll automatically include all the stylesheets available in this directory
- * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
- * the top of the compiled file, but it's generally better to create a new file per style scope.
- *= require_self
- *= require_tree . 
-*/
-
-html {
-	font-family: Verdana,Helvetica,sans-serif;
-	color: navy;
-}
-
-body {
-	background-color: silver;
-}
-
-h1, h2 {
-	background-color: #ddd;
-	margin: 0;
+html, body {
+  margin: 0;
+  padding: 0;
+  background: White;
+  color: DarkSlateGrey;
+  font-family: Tahoma, Verdana, sans-serif;
+  font-size: 10pt;
+}
+div#main {
+  margin: 0;
+  padding: 0 20px 20px;
+}
+a {
+  background: transparent;
+  color: maroon;
+  text-decoration: underline;
+  font-weight: bold;
+}
+h1 {
+  color: maroon;
+  font-size: 150%;
+  font-style: italic;
+  display: block;
+  width: 100%;
+  border-bottom: 1px solid DarkSlateGrey;
+}
+h1.title {
+  margin: 0 0 1em;
+  padding: 10px;
+  background-color: orange;
+  color: white;
+  border-bottom: 4px solid gold;
+  font-size: 2em;
+  font-style: normal;
+}
+table#movies {
+  margin: 10px;
+  border-collapse: collapse;
+  width: 100%;
+  border-bottom: 2px solid black;
+}
+table#movies th {
+  border: 2px solid white;
+  font-weight: bold;
+  background-color: wheat;
+}
+table#movies th, table#movies td {
+  padding: 4px;
+  text-align: left;
+}
+#notice #warning {
+  background: rosybrown;
+  margin: 1em 0;
+  padding: 4px;
 }
 form label {
-	display: block;
-	color: #333;
-	font-style: italic;
-        padding-top: 1ex;
-        padding-left: 1ex;
+  display: block;
+  line-height: 25px;
+  font-weight: bold;
+  color: maroon;
 }
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -7,9 +7,11 @@
     = csrf_meta_tags
 
   %body
-    - if flash[:notice]
-      #notice.message= flash[:notice]
-    - elsif flash[:warning]
-      #warning.message= flash[:warning]
+    %h1.title Rotten Potatoes!
+    #main
+      - if flash[:notice]
+        #notice.message= flash[:notice]
+      - elsif flash[:warning]
+        #warning.message= flash[:warning]
 
-    = yield
+      = yield