From 6f1a596dff79ab459a6985fb0324dca8b2ad5e7d Mon Sep 17 00:00:00 2001
From: danielvincent <danielgrippi@gmail.com>
Date: Fri, 6 Aug 2010 00:40:44 -0700
Subject: [PATCH] small color changes

---
 app/views/authors/show.html.haml                  |  4 ++--
 app/views/photos/show.html.haml                   |  8 ++++----
 .../status_messages/_status_message.html.haml     |  2 +-
 public/javascripts/view.js                        |  3 +++
 public/stylesheets/application.css                | 15 ++++++++-------
 public/stylesheets/sass/application.sass          | 12 +++++++-----
 6 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/app/views/authors/show.html.haml b/app/views/authors/show.html.haml
index 89b6cd165..fbabf20ce 100644
--- a/app/views/authors/show.html.haml
+++ b/app/views/authors/show.html.haml
@@ -17,5 +17,5 @@
 #content_bottom
   .back
     = link_to "⇧ ostatus", ostatus_path
-  .button.right
-    = link_to 'Unsubscribe', @author, :confirm => 'Are you sure?', :method => :delete
+  .right
+    = link_to 'Unsubscribe', @author, :confirm => 'Are you sure?', :method => :delete, :class => "button"
diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml
index 0714ec692..4da35fd36 100644
--- a/app/views/photos/show.html.haml
+++ b/app/views/photos/show.html.haml
@@ -3,8 +3,8 @@
     = link_to "⇧ #{@album.name}", album_path(@album)
   = @photo.image
 
-  .button.right
-    = link_to 'Edit Photo', edit_photo_path(@photo)
+  .right
+    = link_to 'Edit Photo', edit_photo_path(@photo), :class => "button"
 
 .sub_header
   = link_to "full size", @photo.image.url
@@ -23,8 +23,8 @@
     .back
       = link_to "⇧ #{@album.name}", album_path(@album)
     -if mine? @album
-      .button.right
-        = link_to 'Delete Photo', @photo, :confirm => 'Are you sure?', :method => :delete
+      .right
+        = link_to 'Delete Photo', @photo, :confirm => 'Are you sure?', :method => :delete, :class => "button"
 
   %h4{:class => "show_post_comments"}
     = "comments (#{@photo.comments.count})"
diff --git a/app/views/status_messages/_status_message.html.haml b/app/views/status_messages/_status_message.html.haml
index 5681e9753..954128431 100644
--- a/app/views/status_messages/_status_message.html.haml
+++ b/app/views/status_messages/_status_message.html.haml
@@ -14,4 +14,4 @@
 
   - if mine?(post)
     .destroy_link
-      = link_to 'Delete', status_message_path(post), :confirm => 'Are you sure?', :method => :delete, :remote => true
+      = link_to 'Delete', status_message_path(post), :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "delete"
diff --git a/public/javascripts/view.js b/public/javascripts/view.js
index 5e0f2ef51..c181e3bcc 100644
--- a/public/javascripts/view.js
+++ b/public/javascripts/view.js
@@ -107,5 +107,8 @@ $(document).ready(function(){
     $(this).fadeIn("slow");
   });
 
+  $(".delete").hover(function(){
+    $(this).toggleClass("button");
+  });
 
 });//end document ready
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 6710c853d..437ba0fd7 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -12,10 +12,12 @@ body {
 
 a {
   color: #018790;
+  color: #556270;
   text-decoration: none; }
   a:hover {
     color: white;
-    background-color: #018790; }
+    background-color: #018790;
+    background-color: #556270; }
 
 #flash_notice,
 #flash_error,
@@ -107,13 +109,12 @@ header {
 
 ul#stream, ul#friend_stream {
   margin: 0;
-  padding: 0;
-  color: #666666; }
+  padding: 0; }
   ul#stream > li, ul#friend_stream > li {
     list-style: none;
     padding: 15px 0;
-    border-bottom: 1px solid #f1f1f1;
-    margin-bottom: 5px; }
+    margin-bottom: 5px;
+    border-bottom: 1px solid #eeeeee; }
 
 ul#friend_stream > li {
   padding: 0.2em 0; }
@@ -295,7 +296,8 @@ label {
   color: #999999;
   position: absolute;
   top: 3px;
-  left: 0.48em; }
+  left: 0.48em;
+  font-weight: normal; }
 
 #publisher {
   background-color: rgba(10, 81, 109, 0.05);
@@ -367,7 +369,6 @@ ul#publisher_content_pickers li {
 h1.big_text {
   position: relative;
   line-height: auto;
-  border-top: 2px solid #666666;
   border-bottom: 1px solid #666666;
   text-align: center; }
 
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 223080f2d..f84d8b0c3 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -11,13 +11,14 @@ body
   :margin 0
 a
   :color #018790
+  :color #556270
   :text
     :decoration none
   &:hover
     :color #fff
     :background
       :color #018790
-
+      :color #556270
 
 #flash_notice,
 #flash_error,
@@ -121,13 +122,12 @@ header
 ul#stream, ul#friend_stream
   :margin 0
   :padding 0
-  :color #666
   > li
     :list-style none
     :padding 15px 0
-    :border
-      :bottom 1px solid #f1f1f1
     :margin-bottom 5px
+    :border
+      :bottom 1px solid #eee
 
 ul#friend_stream
   > li
@@ -356,6 +356,8 @@ label
   :position absolute
   :top 3px
   :left 0.48em
+  :font
+    :weight normal
 
 #publisher
   :background
@@ -451,7 +453,7 @@ h1.big_text
   :position relative
   :line-height auto
   :border
-    :top 2px solid #666
+    //:top 2px solid #666
     :bottom 1px solid #666
   :text
     :align center