From e1253c4018564683ef027b0622ba68f4d9741784 Mon Sep 17 00:00:00 2001
From: Ilya Zhitomirskiy <iz268@nyu.edu>
Date: Mon, 7 Nov 2011 23:11:48 -0800
Subject: [PATCH] fade in on hover, larger x on the welcome div

---
 app/views/aspects/index.html.haml        |   2 +-
 public/images/close_label.png            | Bin 0 -> 212 bytes
 public/stylesheets/sass/application.sass |  28 +++++++++++++++++++----
 3 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 public/images/close_label.png

diff --git a/app/views/aspects/index.html.haml b/app/views/aspects/index.html.haml
index 948273dd8..425a53d81 100644
--- a/app/views/aspects/index.html.haml
+++ b/app/views/aspects/index.html.haml
@@ -10,7 +10,7 @@
   #welcome-to-diaspora
     .container{:style => "position: relative;"}
       .right
-        = link_to image_tag('deletelabel.png'), getting_started_completed_path, :id => "gs-skip-x"
+        = link_to image_tag('close_label.png'), getting_started_completed_path, :id => "gs-skip-x"
       .span-23
         %h1
           = t('.welcome_to_diaspora', :name => current_user.first_name)
diff --git a/public/images/close_label.png b/public/images/close_label.png
new file mode 100644
index 0000000000000000000000000000000000000000..53aa1d3cec080029079c4aec00ff8d8d63610d1e
GIT binary patch
literal 212
zcmeAS@N?(olHy`uVBq!ia0vp^QXtI11|(N{`J4k%k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5X$~;{hLn>~)nd;5eU?AY!E&j>F@|H~L8z=KcD<4mZSkm~$
zDL%1osn1`>?BzUDL#s_a*s70h5>PjoV>GQb=3v3(jUK*pBv^`m6rPRZ-)bi$Br?I=
zASGJHR^hZpG~?o{?zajPXOtwUYJ2PoS(@%t^<&w->uLuWZbvL`bZmI=0_Xw;Pgg&e
IbxsLQ03X6kmjD0&

literal 0
HcmV?d00001

diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 449da2ffb..ee2511bda 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -3418,17 +3418,27 @@ a.toggle_selector
   h1,h3
     :color #fff
   :background orange
+  &:hover
+    #gs-skip-x
+      @include opacity(0.4)
+      @include transition(opacity, 0.25s)
+
+      &:hover
+        @include opacity(1)
 
 #gs-shim
   :position absolute
   :top 380px
 
 #gs-skip-x
-  @include opacity(0.5)
-  @include transition(opacity)
+  @include opacity(0)
+  @include transition(opacity, 0.25s)
+
+  img
+    :position relative
+    :right 4px
+    :height 20px
 
-  &:hover
-    @include opacity(1)
 
 .likes_list
   .avatar
@@ -3456,7 +3466,17 @@ a.toggle_selector
 
 .popover
   .close
+    @include opacity(0)
+    @include transition(opacity, 0.2s)
+
     :float right
     :position relative
     :top -9px
     :right -5px
+
+  &:hover
+    .close
+      @include opacity(0.5)
+
+      &:hover
+        @include opacity(1)