From 8246d2684377583f1f132347b8bdfb530e1578c7 Mon Sep 17 00:00:00 2001
From: CharlotteGilhooly <charlotte.gilhooly@gmail.com>
Date: Tue, 14 Aug 2012 11:14:17 +0100
Subject: [PATCH] added margins, put url feed at the top

---
 app/assets/stylesheets/scaffolds.css.scss | 56 ++++++++++++++---------
 app/views/feeds/index.html.haml           |  6 +--
 2 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss
index 158a096..d539ec3 100644
--- a/app/assets/stylesheets/scaffolds.css.scss
+++ b/app/assets/stylesheets/scaffolds.css.scss
@@ -18,13 +18,13 @@ pre {
   font-size: 11px; }
 
 a {
-  color: blue;
+  color: #00458f;
   text-decoration: none;
   &:visited {
-    color: #666; }
+    color: #00458f; }
   &:hover {
     color: #fff;
-    background-color: #000; } }
+    background-color: #ccc; } }
 
 div {
   &.field, &.actions {
@@ -57,18 +57,20 @@ div {
   padding-bottom: 0;
   margin-bottom: 20px;
   background-color: #f0f0f0;
-  h2 {
-    text-align: left;
-    font-weight: bold;
-    padding: 5px 5px 5px 15px;
-    font-size: 12px;
-    margin: -7px;
-    margin-bottom: 0px;
-    background-color: #c00;
-    color: #fff; }
-  ul li {
-    font-size: 12px;
-    list-style: square; } }
+  
+h2 {
+  text-align: left;
+  font-weight: bold;
+  padding: 5px 5px 5px 15px;
+  font-size: 12px;
+  margin: -7px;
+  margin-bottom: 0px;
+  background-color: #c00;
+  color: #fff; }
+  
+ul li {
+  font-size: 12px;
+  list-style: square; } }
     
 .button {
   padding: 5px 10px;
@@ -83,6 +85,10 @@ a.button, a.button:visited {
   text-decoration: none;
 }
 
+a.logo  {
+float: right;
+}
+
 #new_feed {
   background-color: beige;
   padding: 5px 10px;
@@ -101,7 +107,11 @@ table {
 
 td {
   padding: 0 20px 30px 0;
-  background-color: #fff;
+/*   background-color: #bbb; */
+}
+
+td:last-child {
+  padding-right: 0;
 }
 
 th {
@@ -117,7 +127,8 @@ h1 {
   font-size: 3.2em;
   font-weight: normal;
   line-height: 1.2em;
-  margin: 10px 0 40px 0;
+  margin: 20px 0 40px 0;
+  text-align: left;
 }
 
 h2 {
@@ -125,10 +136,6 @@ h2 {
   font-weight: normal;
 }
 
-.logo {
-  float: right;
-}
-
 #login input {
   font-size: 1.8em;
   padding: 10px;
@@ -145,5 +152,10 @@ h2 {
 }
 
 #userbar {
-  background-color: #eee;
+  margin-bottom: 40px;
+  margin-top: 40px;
+}
+
+table {
+border-collapse: collapse;
 }
diff --git a/app/views/feeds/index.html.haml b/app/views/feeds/index.html.haml
index 5cc180d..9a21409 100644
--- a/app/views/feeds/index.html.haml
+++ b/app/views/feeds/index.html.haml
@@ -1,5 +1,8 @@
 %h1 Apollo
 
+#new_feed
+  = render 'form'
+
 %p= link_to "Fetch all", :fetch_all, :class => "button"
 
 %table
@@ -34,6 +37,3 @@
     %td
     %td
     %td
-    
-#new_feed
-  = render 'form'