Merge tootsuite/master at 3023725936

app/javascript/styles/mastodon/_mixins.scss

@@ -1,5 +1,5 @@
 @mixin avatar-radius() {
-  border-radius: 4px;
+  border-radius: $ui-avatar-border-size;
   background: transparent no-repeat;
   background-position: 50%;
   background-clip: padding-box;
@@ -10,3 +10,33 @@
   height: $size;
   background-size: $size $size;
 }
+
+@mixin single-column($media, $parent: '&') {
+  .auto-columns #{$parent} {
+    @media #{$media} {
+      @content;
+    }
+  }
+  .single-column #{$parent} {
+    @content;
+  }
+}
+
+@mixin limited-single-column($media, $parent: '&') {
+  .auto-columns #{$parent}, .single-column #{$parent} {
+    @media #{$media} {
+      @content;
+    }
+  }
+}
+
+@mixin multi-columns($media, $parent: '&') {
+  .auto-columns #{$parent} {
+    @media #{$media} {
+      @content;
+    }
+  }
+  .multi-columns #{$parent} {
+    @content;
+  }
+}

app/javascript/styles/mastodon/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;
         }
       }
 

app/javascript/styles/mastodon/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);
     }
   }
@@ -207,6 +206,50 @@
     color: $ui-secondary-color;
   }
 
+  .metadata {
+    $meta-table-border: darken($classic-highlight-color, 20%);//#174f77;
+
+    border-collapse: collapse;
+    padding: 0;
+    margin: 15px -15px -10px -15px;
+    border: 0 none;
+    border-top: 1px solid $meta-table-border;
+    border-bottom: 1px solid $meta-table-border;
+
+    td, th {
+      padding: 10px;
+      border: 0 none;
+      border-bottom: 1px solid $meta-table-border;
+      vertical-align: middle;
+    }
+
+    tr:last-child {
+      td, th {
+        border-bottom: 0 none;
+      }
+    }
+
+    td {
+      color: $ui-primary-color;
+      width:100%; // makes it stretch
+      padding-left: 0;
+    }
+
+    th {
+      padding-left: 15px;
+      font-weight: bold;
+      text-align: left;
+      width: 94px;
+      color: $ui-secondary-color;
+      background: darken($ui-base-color, 8%);
+      //background: #131415;
+    }
+
+    a {
+      color: $classic-highlight-color;
+    }
+  }
+
   @media screen and (max-width: 480px) {
     display: block;
 
@@ -364,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;
       }
@@ -451,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 {

app/javascript/styles/mastodon/stream_entries.scss

@@ -93,28 +93,25 @@
 
     .status__avatar {
       position: absolute;
-      left: 14px;
-      top: 14px;
-      width: 48px;
-      height: 48px;
+      @include avatar-size(48px);
+      margin-left: -62px;
 
       & > div {
-        width: 48px;
-        height: 48px;
+        @include avatar-size(48px);
       }
 
       img {
+        @include avatar-radius();
         display: block;
-        border-radius: 4px;
       }
     }
 
     .display-name {
       display: block;
       max-width: 100%;
-      overflow: hidden;
-      white-space: nowrap;
-      text-overflow: ellipsis;
+      //overflow: hidden;
+      //white-space: nowrap;
+      //text-overflow: ellipsis;
 
       strong {
         font-weight: 500;
@@ -180,12 +177,11 @@
     }
 
     .avatar {
-      width: 48px;
-      height: 48px;
+      @include avatar-size(48px);
 
       img {
+        @include avatar-radius();
         display: block;
-        border-radius: 4px;
       }
     }
 

app/javascript/styles/mastodon/variables.scss

@@ -27,3 +27,6 @@ $ui-base-lighter-color: lighten($ui-base-color, 26%) !default; // Lighter darkes
 $ui-primary-color: $classic-primary-color !default;            // Lighter
 $ui-secondary-color: $classic-secondary-color !default;        // Lightest
 $ui-highlight-color: $classic-highlight-color !default;        // Vibrant
+
+// Avatar border size (8% default, 100% for rounded avatars)
+$ui-avatar-border-size: 8%;