From 4348fc070d4240c34c7aa23ee56c54c6fe708e9b Mon Sep 17 00:00:00 2001
From: Srihari Sriraman <srihari@c42.in>
Date: Thu, 29 Aug 2013 22:15:39 +0530
Subject: [PATCH] Add border-dark-grey

Substituting -grey for #999

Moving #888 text color to -grey

Adding border-dark-grey

Removing border-dark-grey from places where it isn't appropriate
---
 app/assets/stylesheets/application.css.sass   | 34 +++++++++----------
 app/assets/stylesheets/colors.css.scss        |  1 +
 app/assets/stylesheets/header.css.scss        |  6 ++--
 app/assets/stylesheets/hovercard.css.scss     |  2 +-
 app/assets/stylesheets/mentions.css.scss      |  2 +-
 app/assets/stylesheets/mobile.css.scss        | 12 +++----
 app/assets/stylesheets/new_styles/_forms.scss |  8 ++---
 .../stylesheets/new_styles/_landing.scss      |  4 +--
 app/assets/stylesheets/new_styles/_login.scss |  2 +-
 app/assets/stylesheets/sessions.css.scss      |  2 +-
 app/assets/stylesheets/ui.css.scss            |  4 +--
 app/assets/stylesheets/vendor/facebox.css     |  2 +-
 12 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/app/assets/stylesheets/application.css.sass b/app/assets/stylesheets/application.css.sass
index 46fbc2283..838bfa687 100644
--- a/app/assets/stylesheets/application.css.sass
+++ b/app/assets/stylesheets/application.css.sass
@@ -69,7 +69,7 @@ h1, h2, h3, h4
 
   small
     :font-size small
-    :color #999
+    :color $text-grey
 
 ul > li
   :list-style none
@@ -292,7 +292,7 @@ ul.as-selections
 
 .grey,
 .grey *
-  :color #999
+  :color $text-grey
 
 .details,
 .details *
@@ -307,7 +307,7 @@ ul.as-selections
 .via
   :color #aaa
   a
-    :color #999
+    :color $text-grey
   :text
     :decoration none
   :border none
@@ -334,7 +334,7 @@ ul.as-selections
     :size small
     :font
       :weight normal
-    :color #999
+    :color $text-grey
   #latest_message_time
     :font-style italic
   ul
@@ -514,7 +514,7 @@ form p.checkbox_select
     :top 6px
 
 @mixin placeholder_styles
-  :color #999
+  :color $text-grey
   :text-shadow 0 1px 1px #eee
   :font-weight normal
 
@@ -530,7 +530,7 @@ form p.checkbox_select
 
 #publisher
   :z-index 1
-  :color #999
+  :color $text-grey
   :position relative
   :margin
     :top 0
@@ -686,7 +686,7 @@ form p.checkbox_select
   :background #fff
 
   &.active
-    :border 1px solid #999
+    :border 1px solid $border-dark-grey
 
   :position relative
   :padding
@@ -891,7 +891,7 @@ input[type="search"]
       :top 10px
 
 .photo_options
-  :color #888
+  :color $text-grey
   :text
     :align center
 
@@ -1083,7 +1083,7 @@ ul#request_result
         :right 5px
 
       :padding 5px
-      :border 1px solid #999
+      :border 1px solid $border-dark-grey
 
       > .name
         :white-space nowrap
@@ -1144,7 +1144,7 @@ ul#request_result
     :font
       :size 12px
     :display block
-    :color #888
+    :color $text-grey
     :text-shadow 0 1px 0 #fff
 
     #mce-error-response
@@ -1227,7 +1227,7 @@ ul#request_result
   :margin
     :top 14px
     :left 540px
-  :color #888
+  :color $text-grey
 
 
 ul#press_logos
@@ -1341,7 +1341,7 @@ ul#press_logos
 .show_comments,
 .likes_container
   a
-    :color #999
+    :color $text-grey
 
 .likes
   .icons-heart
@@ -1769,11 +1769,11 @@ h1.tag
       :color #efefef
     :color $text-grey
     :border
-      :bottom 1px dotted #999
+      :bottom 1px dotted $border-dark-grey
 
     &:hover
       :border
-        :bottom 1px solid #999
+        :bottom 1px solid $border-dark-grey
 
 .diaspora_handle
   :font
@@ -1918,7 +1918,7 @@ h1.tag
       @include box-sizing(border-box)
 
 .subtle
-  :color #888
+  :color $text-grey
   :font
     :style italic
 
@@ -2385,7 +2385,7 @@ a.toggle_selector
 
     .tags
       a
-        :color #999
+        :color $text-grey
 
     .avatar
       :height 30px
@@ -2669,7 +2669,7 @@ body
     :width 19px
 
 #location
-  :border 1px solid #999
+  :border 1px solid $border-dark-grey
   :height 20px
   #location_address
     :border none
diff --git a/app/assets/stylesheets/colors.css.scss b/app/assets/stylesheets/colors.css.scss
index 98f6d4fc0..1d6b454ae 100644
--- a/app/assets/stylesheets/colors.css.scss
+++ b/app/assets/stylesheets/colors.css.scss
@@ -7,6 +7,7 @@ $border-grey: #DDDDDD;
 $background-grey: #EEEEEE;
 $header-grey: #939393;
 $link-grey: #777777;
+$border-dark-grey: #999999;
 $link-disabled-grey: #999999;
 $text-grey: #999999;
 
diff --git a/app/assets/stylesheets/header.css.scss b/app/assets/stylesheets/header.css.scss
index f69e1e965..e9d5bdb4f 100644
--- a/app/assets/stylesheets/header.css.scss
+++ b/app/assets/stylesheets/header.css.scss
@@ -104,7 +104,7 @@ body > header {
     #notification_badge.active {
       z-index: 10;
       background-color: #fff;
-      border: 1px solid #888;
+      border: 1px solid $border-dark-grey;
       border-bottom: 0px;
       margin-left: 0px;
       padding-bottom: 12px;
@@ -114,7 +114,7 @@ body > header {
       @include dropdown-shadow;
 
       background: white;
-      border: solid #888 1px;
+      border: solid $border-dark-grey 1px;
       left: 300px;
       width: 380px;
       display: none;
@@ -235,7 +235,7 @@ body > header {
       margin-top: -3px;
       @include dropdown-shadow;
       background-color: rgb(34,30,30);
-      border: 1px solid #999;
+      border: 1px solid $border-dark-grey;
     }
   }
 
diff --git a/app/assets/stylesheets/hovercard.css.scss b/app/assets/stylesheets/hovercard.css.scss
index 77a2296d2..24ec49fd5 100644
--- a/app/assets/stylesheets/hovercard.css.scss
+++ b/app/assets/stylesheets/hovercard.css.scss
@@ -12,7 +12,7 @@
 
   background-color: $background-white;
   height: 70px;
-  border: 1px solid #999999;
+  border: 1px solid $border-dark-grey;
   font-size: small;
 
   .avatar {
diff --git a/app/assets/stylesheets/mentions.css.scss b/app/assets/stylesheets/mentions.css.scss
index 04fc2c8cc..3e911f695 100644
--- a/app/assets/stylesheets/mentions.css.scss
+++ b/app/assets/stylesheets/mentions.css.scss
@@ -33,7 +33,7 @@
     z-index: 10000;
 
     ul {
-      border: 1px solid #999;
+      border: 1px solid $border-dark-grey;
       margin: 0;
       padding: 0;
 
diff --git a/app/assets/stylesheets/mobile.css.scss b/app/assets/stylesheets/mobile.css.scss
index 5592cd1f7..27fcf9264 100644
--- a/app/assets/stylesheets/mobile.css.scss
+++ b/app/assets/stylesheets/mobile.css.scss
@@ -392,7 +392,7 @@ footer {
   text-align: center;
   a,
   a:visited {
-    color: #999;
+    color: $text-grey;
     margin: 10px;
   }
   padding: {
@@ -422,7 +422,7 @@ footer {
   > a,
   .show_comments {
     @include transition(color);
-    color: #999;
+    color: $text-grey;
     font-weight: bold;
   }
 
@@ -433,7 +433,7 @@ footer {
   }
 
   a.show_comments {
-    color: #999;
+    color: $text-grey;
 
     &.active:not(.bottom_collapse) {
       color: #444;
@@ -574,7 +574,7 @@ footer {
     background-color: #fff;
     padding: 5px;
     border: {
-      bottom: 1px solid #999;
+      bottom: 1px solid $border-dark-grey;
     }
     .counter {
       font-size: 14px;
@@ -799,7 +799,7 @@ textarea#message_text {
 
 form#new_conversation.new_conversation {
   background-color: #FFFFFF;
-  border-bottom: 1px solid #999999;
+  border-bottom: 1px solid $border-dark-grey;
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
   border-radius: 5px;
   margin: 5px 0 5px 15px;
@@ -1155,7 +1155,7 @@ input#q.search {
   background: #fff;
 
   &.active {
-    border: 1px solid #999;
+    border: 1px solid $border-dark-grey;
   }
   position: relative;
   padding-right: 10px;
diff --git a/app/assets/stylesheets/new_styles/_forms.scss b/app/assets/stylesheets/new_styles/_forms.scss
index 81bb128c8..2ed0d9f49 100644
--- a/app/assets/stylesheets/new_styles/_forms.scss
+++ b/app/assets/stylesheets/new_styles/_forms.scss
@@ -35,7 +35,7 @@ form.block-form {
 
     background-color : #fff;
 
-    border : 1px solid #888;
+    border : 1px solid $border-dark-grey;
 
     input[type=text],
     input[type=email],
@@ -95,8 +95,8 @@ form.block-form {
   @include box-shadow(0, 1px, 2px, rgba(0,0,0,0));
 
   background-color : rgb(233,233,233);
-  color : #888;
-  border : 1px solid #888;
+  color : $text-grey;
+  border : 1px solid $border-dark-grey;
 
   //font-family : Roboto-Bold;
   font-size : 14px;
@@ -109,4 +109,4 @@ form.block-form {
   &:active {
     box-shadow : inset 0 1px 3px rgba(0,0,0,0.3), 0 1px 2px rgba(255,255,255,0.7);
   }
-}
\ No newline at end of file
+}
diff --git a/app/assets/stylesheets/new_styles/_landing.scss b/app/assets/stylesheets/new_styles/_landing.scss
index 551460a00..18390f0cb 100644
--- a/app/assets/stylesheets/new_styles/_landing.scss
+++ b/app/assets/stylesheets/new_styles/_landing.scss
@@ -31,7 +31,7 @@
         background : #99CC00;
         color : #fff;
         text-shadow : 0 -1px 0 #669900;
-        border : 1px solid #999;
+        border : 1px solid $border-dark-grey;
 
         &:hover {
           background : desaturate(#99CC00, 15%);
@@ -98,7 +98,7 @@
 
       &:hover {
         background:#222;
-        border:1px solid #999;
+        border:1px solid $border-dark-grey;
         text-decoration:none;
       }
     }
diff --git a/app/assets/stylesheets/new_styles/_login.scss b/app/assets/stylesheets/new_styles/_login.scss
index afe9d543d..9b9de1a58 100644
--- a/app/assets/stylesheets/new_styles/_login.scss
+++ b/app/assets/stylesheets/new_styles/_login.scss
@@ -22,7 +22,7 @@
 
   #forgot_password_link {
     margin : 40px;
-    color : #999;
+    color : $text-grey;
     clear : all;
   }
 }
diff --git a/app/assets/stylesheets/sessions.css.scss b/app/assets/stylesheets/sessions.css.scss
index 9b005337f..f693641f0 100644
--- a/app/assets/stylesheets/sessions.css.scss
+++ b/app/assets/stylesheets/sessions.css.scss
@@ -122,7 +122,7 @@ form p {
 }
 
 label {
-  color: $text-grey;
+  color: #999;
   position: absolute;
   padding-top: 7px;
   left: 8px;
diff --git a/app/assets/stylesheets/ui.css.scss b/app/assets/stylesheets/ui.css.scss
index bff7baa23..d2ec3e8dd 100644
--- a/app/assets/stylesheets/ui.css.scss
+++ b/app/assets/stylesheets/ui.css.scss
@@ -123,7 +123,7 @@ input.button {
     padding: 4px 0;
     margin-top: 2px;
     background-color: #fff;
-    border: 1px solid #999;
+    border: 1px solid $border-dark-grey;
 
     ul {
       @include user-select(none);
@@ -175,7 +175,7 @@ input.button {
 
         &.newItem {
           a {
-            color: #999;
+            color: $text-grey;
             font-style: italic;
 
             &:hover {
diff --git a/app/assets/stylesheets/vendor/facebox.css b/app/assets/stylesheets/vendor/facebox.css
index bfa2ed16e..bd754e51b 100755
--- a/app/assets/stylesheets/vendor/facebox.css
+++ b/app/assets/stylesheets/vendor/facebox.css
@@ -8,7 +8,7 @@
 
 #facebox .popup{
   position:relative;
-  border:1px solid #888;
+  border:1px solid #999;
   -webkit-border-radius:2px;
   -moz-border-radius:2px;
   border-radius:2px;