From 2825991e09272d6e7227da9d9b8dc387614a83df Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 28 Feb 2016 14:02:53 +0100
Subject: Improving status display design, including replies and threads

---
 app/assets/images/avatars/missing.png    | Bin 3890 -> 909 bytes
 app/assets/images/background-pattern.png | Bin 0 -> 29274 bytes
 app/assets/stylesheets/application.scss  |  23 +++++++--------------
 app/assets/stylesheets/profile.scss      |  33 +++++++++++++++++++------------
 4 files changed, 27 insertions(+), 29 deletions(-)
 create mode 100644 app/assets/images/background-pattern.png

(limited to 'app/assets')

diff --git a/app/assets/images/avatars/missing.png b/app/assets/images/avatars/missing.png
index 40353039f..223b4ed2c 100644
Binary files a/app/assets/images/avatars/missing.png and b/app/assets/images/avatars/missing.png differ
diff --git a/app/assets/images/background-pattern.png b/app/assets/images/background-pattern.png
new file mode 100644
index 000000000..9afda79fe
Binary files /dev/null and b/app/assets/images/background-pattern.png differ
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 068480994..9787c6be1 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -3,6 +3,9 @@ $secondary-color: #ffc952;
 $tertiary-color: #47b8e0;
 $quaternary-color: #34314c;
 $background-color: #fff;
+$darker-background-color: #e3dede;
+$text-color: #333030;
+$lighter-text-color: #8b8687;
 
 @import url("https://fonts.googleapis.com/css?family=Noto+Sans:400,700,400italic");
 @import "font-awesome-sprockets";
@@ -10,35 +13,23 @@ $background-color: #fff;
 
 body {
   font-family: 'Noto Sans', sans-serif;
-  background: $secondary-color;
+  background: $background-color image-url('background-pattern.png');
   font-size: 13px;
   line-height: 18px;
-  color: $quaternary-color;
-
-  &::before {
-    display: block;
-    content: "";
-    position: absolute;
-    background: $secondary-color;
-    width: 100%;
-    height: 200px;
-    z-index: -1;
-    top: 0;
-    left: 0;
-  }
+  color: $text-color;
 }
 
 .container {
   width: 800px;
   margin: 0 auto;
-  z-index: 2;
+  margin-top: 40px;
 }
 
 .footer {
   text-align: center;
   padding: 100px 0;
   font-size: 12px;
-  color: lighten($quaternary-color, 15%);
+  color: $text-color;
 
   .mastodon-link {
     color: $quaternary-color;
diff --git a/app/assets/stylesheets/profile.scss b/app/assets/stylesheets/profile.scss
index e2b59268a..71466527e 100644
--- a/app/assets/stylesheets/profile.scss
+++ b/app/assets/stylesheets/profile.scss
@@ -1,8 +1,7 @@
 .card {
-  margin-top: 40px;
   display: flex;
-  background: darken($background-color, 10%);
-  border-bottom: 1px solid darken($background-color, 15%);
+  background: $darker-background-color;
+  border: 1px solid darken($darker-background-color, 15%);
   box-shadow: 4px 3px 0 rgba(0, 0, 0, 0.1);
 
   .bio {
@@ -12,11 +11,12 @@
   .name {
     font-size: 24px;
     line-height: 18px * 1.5;
+    color: $text-color;
 
     small {
       display: block;
       font-size: 14px;
-      color: lighten($quaternary-color, 15%);
+      color: $lighter-text-color;
     }
   }
 
@@ -25,13 +25,15 @@
     float: left;
     margin-right: 10px;
     padding: 10px;
+    padding-left: 9px;
     margin-top: -30px;
 
     img {
       width: 94px;
       height: 94px;
       display: block;
-      border: 2px solid $background-color;
+      border: 2px solid $lighter-text-color;
+      border-radius: 5px;
     }
   }
 }
@@ -49,12 +51,17 @@
       border-left: 2px solid $tertiary-color;
     }
 
+    &.entry-predecessor, &.entry-successor {
+      border-left: 2px solid $lighter-text-color;
+      background: darken($background-color, 5%);
+    }
+
     &:last-child {
       border-bottom: 0;
     }
   }
 
-  .entry-container {
+  .entry__container {
     display: flex;
   }
 
@@ -69,11 +76,11 @@
       width: 48px;
       height: 48px;
       display: block;
-      box-shadow: 2px 2px 0 rgba(0, 0, 0, 0.1);
+      border-radius: 5px;
     }
   }
 
-  .container {
+  .entry__container__container {
     flex-grow: 1;
   }
 
@@ -84,10 +91,10 @@
 
     .name {
       text-decoration: none;
-      color: lighten($quaternary-color, 15%);
+      color: $lighter-text-color;
 
       strong {
-        color: $quaternary-color;
+        color: $text-color;
       }
 
       &:hover {
@@ -124,7 +131,7 @@
 
   .time {
     text-decoration: none;
-    color: lighten($quaternary-color, 15%);
+    color: $lighter-text-color;
 
     &:hover {
       text-decoration: underline;
@@ -133,7 +140,7 @@
 
   .counters {
     margin-top: 15px;
-    color: lighten($quaternary-color, 15%);
+    color: $lighter-text-color;
     cursor: default;
     padding: 10px;
     padding-top: 0;
@@ -141,7 +148,7 @@
     .counter {
       display: inline-block;
       margin-right: 10px;
-      color: lighten($quaternary-color, 50%);
+      color: $lighter-text-color;
     }
 
     .conversation-link {
-- 
cgit