From e5e63b09a33d4611e3e6c8e61ff02b566f8e9ca5 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@online.de>
Date: Tue, 20 Aug 2013 11:55:18 +0200
Subject: [PATCH] fix opacity of control icons

---
 Changelog.md                                |  1 +
 app/assets/stylesheets/application.css.sass | 33 ++++++++++++---------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index d78a0dd8ea..dddc00074f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -41,6 +41,7 @@
 * Do not display photos in the background in the SPV [#4407](https://github.com/diaspora/diaspora/pull/4407)
 * Fix mobile view of deleted reshares [#4397](https://github.com/diaspora/diaspora/issues/4397)
 * Fix the overlapping of embedded youtube videos [#2943](https://github.com/diaspora/diaspora/issues/2943)
+* Fix opacity of control icons [#4414](https://github.com/diaspora/diaspora/issues/4414/)
 
 ## Features
 * Admin: add option to find users under 13 (COPPA) [#4252](https://github.com/diaspora/diaspora/pull/4252)
diff --git a/app/assets/stylesheets/application.css.sass b/app/assets/stylesheets/application.css.sass
index 76e63aae20..d95c635e1b 100644
--- a/app/assets/stylesheets/application.css.sass
+++ b/app/assets/stylesheets/application.css.sass
@@ -242,31 +242,25 @@ ul.as-selections
     :float left
     :margin
       :top 6px
-
+  
+  .controls:first-child
+    .control_icon
+      @include transition(opacity)
+      @include opacity(0)
   &:hover
     .controls:first-child
       .control_icon
-        @include opacity(0.5)
+        @include opacity(0.3)
+      .control_icon:hover
+        @include opacity(1)
 
 .info
   :font-size smaller
 
-  .control_icon
-    @include opacity(0.3)
-    :padding 5px
-
-    &:hover
-      @include opacity(1)
-
 .controls
-  @include transition(opacity)
-  @include opacity(0)
   :z-index 6
   :float right
 
-  &:hover
-    @include opacity(1)
-
   .block_user
     :display inline-block
 
@@ -384,6 +378,17 @@ ul.as-selections
 
     :padding
       :top 10px
+    
+    .controls
+      .comment_delete
+        @include transition(opacity)
+        @include opacity(0)
+    &:hover
+      .controls
+        .comment_delete
+          @include opacity(0.3)
+        .comment_delete:hover
+          @include opacity(1)
 
   .youtube-player, .vimeo-player
     :border none
-- 
GitLab