From 969c6685187defb8c7ba97967bf69c646cdc92e4 Mon Sep 17 00:00:00 2001
From: danielvincent <danielgrippi@gmail.com>
Date: Sat, 13 Nov 2010 12:10:09 -0800
Subject: [PATCH] translation fix on _person.haml.  button tweak

---
 .../requests/_new_request_to_person.haml      |  2 +-
 config/locales/diaspora/en.yml                |  2 +-
 public/stylesheets/sass/application.sass      |  2 +-
 public/stylesheets/sass/ui.sass               | 33 +++++++++----------
 4 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/app/views/requests/_new_request_to_person.haml b/app/views/requests/_new_request_to_person.haml
index 564d4e4f7..204ca1488 100644
--- a/app/views/requests/_new_request_to_person.haml
+++ b/app/views/requests/_new_request_to_person.haml
@@ -5,4 +5,4 @@
 = form_tag(requests_path) do
   = select_tag(:aspect_id, options_from_collection_for_select(aspects, "id", "name"))
   = hidden_field_tag :destination_handle, person.diaspora_handle
-  = submit_tag t('people.person.add_connection')
+  = submit_tag t('people.person.add_contact')
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index f79c8d43a..ff904c28d 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -252,7 +252,7 @@ en:
   people:
       person:
           pending_request: "pending request"
-          already_friends: "Already friends"
+          already_connected: "Already connected"
           thats_you: "thats you!"
           add_contact: "add contact"
       index:
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 9cd4f4df5..a33be907a 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -107,7 +107,7 @@ header
 
   :background
     :color #333
-  :background -webkit-gradient( linear, left bottom, left top, color-stop(0.01, rgb(21,21,21)), color-stop(0.12, rgb(51,51,51)))
+  :background -webkit-gradient(linear, 0% 0%, 0% 100%, from(#080808), to(#191919), color-stop(.9,#262626),color-stop(.1,#333333),color-stop(.75,#343434))
   :background -moz-linear-gradient( center bottom, rgb(21,21,21) 1%, rgb(51,51,51) 12%)
 
   :padding 0
diff --git a/public/stylesheets/sass/ui.sass b/public/stylesheets/sass/ui.sass
index 81cbb2c59..c8ebacb80 100644
--- a/public/stylesheets/sass/ui.sass
+++ b/public/stylesheets/sass/ui.sass
@@ -21,36 +21,33 @@
   :min-height 10px
 
   :background -webkit-gradient(linear, 0% 39%, 0% 100%, from(#FCFCFC), to(#d0d0d0))
-  :background -moz-linear-gradient(top, #FCFCFC, #e0e0e0)
+  :background -moz-linear-gradient(top, #FCFCFC, #d0d0d0)
 
-  :border 1px solid #cecece
-    :bottom 1px solid #777
-    :left 1px solid #aaa
-    :right 1px solid #aaa
+  :border 1px solid #aaa
+    :top 1px solid #bbb
+    :bottom 1px solid #888
 
   :border-radius 4px
   :-moz-border-radius 4px
   :-webkit-border-radius 4px
 
-  :cursor pointer
-
-  :box-shadow 0 1px 1px #ccc
-  :-webkit-box-shadow 0 1px 1px #ccc
-  :-moz-box-shadow 0 1px 1px #ccc
+  :cursor default
 
   :color #444
 
   &:hover
-    :color #666
-    :background -webkit-gradient(linear, 0% 29%, 0% 85%, from(#FAFAFA), to(#F0F0F0))
-    :background -moz-linear-gradient(top, #FAFAFA, #F0F0F0)
+    :color #444
+    :background -webkit-gradient(linear, 0% 39%, 0% 100%, from(#DCDCDC), to(#b0b0b0))
+    :background -moz-linear-gradient(top, #DCDCDC, #b0b0b0)
 
   &:active
-    :color #666
-    :background -webkit-gradient(linear, 0% 29%, 0% 85%, from(#F0F0F0), to(#FAFAFA))
-    :background -moz-linear-gradient(top, #F0F0F0, #FAFAFA)
-    :border
-      :top 1px solid #ccc
+    :color #111
+    :text-shadow 0 1px 0 #ccc
+    :background -webkit-gradient(linear, 0% 39%, 0% 100%, from(#ACACAC), to(#808080))
+    :background -moz-linear-gradient(top, #ACACAC, #808080)
+    :border 1px solid #666
+      :top 1px solid #333
+      :bottom 1px solid #888
 
 ul.button_set