1.6 changed files for unified avatar styling -- updated to restore unity

diff --git a/app/javascript/styles/about.scss b/app/javascript/styles/about.scss
index a15afc32c95b3d7a1ecd6226258de6e3d70b5aac..8c37310e8f5c4529324938ccceae4b33b159dce4 100644 (file)
--- a/app/javascript/styles/about.scss
+++ b/app/javascript/styles/about.scss
@@ -424,16 +424,14 @@
       text-align: center;
 
       .avatar {
-        width: 80px;
-        height: 80px;
+        @include avatar-size(80px);
         margin: 0 auto;
         margin-bottom: 15px;
 
         img {
+          @include avatar-radius();
+          @include avatar-size(80px);
           display: block;
-          width: 80px;
-          height: 80px;
-          border-radius: 48px;
         }
       }
 

diff --git a/app/javascript/styles/accounts.scss b/app/javascript/styles/accounts.scss
index e2db9992df91316fe1e7c8c099b3c189d6a9e8ac..b00dd8c1ea3eec63e4a8fda9a7723bc7a7cb32c9 100644 (file)
--- a/app/javascript/styles/accounts.scss
+++ b/app/javascript/styles/accounts.scss
@@ -83,16 +83,15 @@
   }
 
   .avatar {
-    width: 120px;
+    @include avatar-size(120px);
     margin: 0 auto;
     position: relative;
     z-index: 2;
 
     img {
-      width: 120px;
-      height: 120px;
+      @include avatar-radius();
+      @include avatar-size(120px);
       display: block;
-      border-radius: 120px;
       box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
     }
   }
@@ -408,14 +407,12 @@
     }
 
     .avatar {
-      width: 80px;
-      height: 80px;
+      @include avatar-size(80px);
 
       img {
         display: block;
-        width: 80px;
-        height: 80px;
-        border-radius: 80px;
+        @include avatar-radius();
+        @include avatar-size(80px);
         border: 2px solid $simple-background-color;
         background: $simple-background-color;
       }
@@ -495,15 +492,14 @@
     }
 
     & > div {
+      @include avatar-size(48px);
       float: left;
       margin-right: 10px;
-      width: 48px;
-      height: 48px;
     }
 
     .avatar {
+      @include avatar-radius();
       display: block;
-      border-radius: 4px;
     }
 
     .display-name {