From cff4df1b3fbda0cdaec0fe4bc222d40687688d4a Mon Sep 17 00:00:00 2001
From: Alex Coles <alex@alexbcoles.com>
Date: Mon, 11 Aug 2014 12:17:33 +0200
Subject: [PATCH] Reapply consolidation of avatar styles in Sass

See 874b08c1. Changes lost in previous merge.

Signed-off-by: Alex Coles <alex@alexbcoles.com>
---
 app/assets/stylesheets/legacy/_01_tables.sass |  8 ----
 .../stylesheets/legacy/_06_progress_bar.sass  |  2 +-
 .../legacy/_11_my_page_layout.sass            | 37 -------------------
 .../legacy/_15_single_issue_page.sass         |  3 --
 .../legacy/_17_behavior_styles.sass           |  4 --
 app/assets/stylesheets/legacy/_19_misc.sass   |  8 +---
 6 files changed, 3 insertions(+), 59 deletions(-)

diff --git a/app/assets/stylesheets/legacy/_01_tables.sass b/app/assets/stylesheets/legacy/_01_tables.sass
index ce7b84aa5f..2af77f3ee5 100644
--- a/app/assets/stylesheets/legacy/_01_tables.sass
+++ b/app/assets/stylesheets/legacy/_01_tables.sass
@@ -322,11 +322,6 @@ td.center, th.center
   ul
     margin: 0
     padding: 0
-  li
-    list-style-type: none
-    margin: 0px 10px 0px 0px
-    padding: 0px 0px 0px 0px
-    float: left
   select
     width: 200px
     display: block
@@ -336,9 +331,6 @@ td.center, th.center
     opacity: 0.4
     &:hover
       opacity: 1
-  img.gravatar
-    vertical-align: middle
-    margin: 0 10px 0px 0
 
 .highlight
   background-color: #FCFD8D
diff --git a/app/assets/stylesheets/legacy/_06_progress_bar.sass b/app/assets/stylesheets/legacy/_06_progress_bar.sass
index e386a78b4d..31f380546c 100644
--- a/app/assets/stylesheets/legacy/_06_progress_bar.sass
+++ b/app/assets/stylesheets/legacy/_06_progress_bar.sass
@@ -33,7 +33,7 @@
   empty-cells: show
   text-align: center
   float: left
-  margin: 1px 6px 1px 0px
+  margin: 3px 6px 1px 0px
   border: 1px solid #BBBBBB
   border-collapse: separate
   -moz-border-radius: 3px
diff --git a/app/assets/stylesheets/legacy/_11_my_page_layout.sass b/app/assets/stylesheets/legacy/_11_my_page_layout.sass
index 8c01e39c52..1248d5a9de 100644
--- a/app/assets/stylesheets/legacy/_11_my_page_layout.sass
+++ b/app/assets/stylesheets/legacy/_11_my_page_layout.sass
@@ -28,43 +28,6 @@
 
 /***** My page layout ****
 
-img.gravatar
-  background: #fff
-
-div.issue
-  img.gravatar
-    float: right
-    margin: 0 0 0 1em
-    padding: 5px
-  table img.gravatar
-    height: 14px
-    width: 14px
-    padding: 2px
-    float: left
-    margin: 0 0.5em 0 0
-
-h2 img.gravatar
-  margin: -2px 4px -4px 0
-  vertical-align: top
-
-h4 img.gravatar
-  margin: -6px 0 -4px 0
-  vertical-align: top
-
-td.username img.gravatar
-  margin: 0 0.5em 0 0
-  vertical-align: top
-
-#activity dt img.gravatar
-  float: left
-  margin: 0 1em 1em 0
-
-/* Used on 12px Gravatar img tags without the icon background
-
-.icon-gravatar
-  float: left
-  margin-right: 4px
-
 #activity dt
   clear: left
 
diff --git a/app/assets/stylesheets/legacy/_15_single_issue_page.sass b/app/assets/stylesheets/legacy/_15_single_issue_page.sass
index 4d8f64f4e3..eb17e52f48 100644
--- a/app/assets/stylesheets/legacy/_15_single_issue_page.sass
+++ b/app/assets/stylesheets/legacy/_15_single_issue_page.sass
@@ -55,9 +55,6 @@ div.issue hr
     padding-left: 0px
     font-weight: bold
 
-.issue p
-  margin-bottom: 5px
-
 .attachments h4
   margin-bottom: 6px
   background: image-url("files-showhide.png") no-repeat right bottom
diff --git a/app/assets/stylesheets/legacy/_17_behavior_styles.sass b/app/assets/stylesheets/legacy/_17_behavior_styles.sass
index 1248ca3cd8..a605569f56 100644
--- a/app/assets/stylesheets/legacy/_17_behavior_styles.sass
+++ b/app/assets/stylesheets/legacy/_17_behavior_styles.sass
@@ -65,10 +65,6 @@
       border-top: 0
     &:last-child
       border-bottom: 0
-  .gravatar
-    border: 0
-    float: left
-    margin-right: 6px
 
 /* file table hovers
 
diff --git a/app/assets/stylesheets/legacy/_19_misc.sass b/app/assets/stylesheets/legacy/_19_misc.sass
index 46f05149c7..86978d9be9 100644
--- a/app/assets/stylesheets/legacy/_19_misc.sass
+++ b/app/assets/stylesheets/legacy/_19_misc.sass
@@ -152,14 +152,10 @@ div.issue hr
   h2 + h3
     margin-top: 12px
 
-div.issue img.gravatar
-  float: none
-  margin: 0
-  padding: 0
-
 p.author
-  margin-bottom: 15px
   font-style: italic
+  /* to accomodate the .profile-wrap class */
+  height: 42px
 
 /* add filter select box on non-issue pages