Adjusting design of public pages, optimizing account page queries

3 files changed, 54 insertions, 21 deletions

diff --git a/app/assets/stylesheets/accounts.scss b/app/assets/stylesheets/accounts.scss
index 89fa8f5bc..b9633f074 100644
--- a/app/assets/stylesheets/accounts.scss
+++ b/app/assets/stylesheets/accounts.scss
@@ -1,14 +1,10 @@
 .card {
   background: $primary-color image-url('background-photo.jpeg');
   background-size: cover;
-  padding: 80px 0;
-  padding-bottom: 30px;
+  padding: 60px 0;
+  padding-bottom: 10px;
   border-radius: 4px 4px 0 0;
 
-  .bio {
-
-  }
-
   .name {
     display: block;
     font-size: 20px;
@@ -37,4 +33,38 @@
       border-radius: 120px;
     }
   }
+
+  .details {
+    display: flex;
+    margin-top: 30px;
+  }
+
+  .counter {
+    width: 80px;
+    color: #9baec8;
+    padding: 0 10px;
+    border-right: 1px solid #9baec8;
+    cursor: default;
+
+    .counter-label {
+      font-size: 12px;
+      text-transform: uppercase;
+      display: block;
+      margin-bottom: 5px;
+    }
+
+    .counter-number {
+      font-weight: 500;
+      font-size: 18px;
+      color: #fff;
+    }
+  }
+
+  .bio {
+    flex: 1;
+    font-size: 14px;
+    line-height: 18px;
+    padding: 5px 10px;
+    color: #d9e1e8;
+  }
 }
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 42fae02e1..3a35ab997 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -181,7 +181,6 @@ body {
     margin-top: 30px;
     text-align: center;
 
-
     a {
       color: #9baec8;
       text-decoration: none;
diff --git a/app/assets/stylesheets/stream_entries.scss b/app/assets/stylesheets/stream_entries.scss
index 5fc6e66cd..ce5c7f4ba 100644
--- a/app/assets/stylesheets/stream_entries.scss
+++ b/app/assets/stylesheets/stream_entries.scss
@@ -9,34 +9,38 @@
     border-left: 2px solid #fff;
 
     &.entry-reblog {
-      border-left: 2px solid $tertiary-color;
-
-      .content {
-        a {
-          color: $tertiary-color;
-        }
-      }
+      border-left-color: #2b90d9;
     }
 
     &.entry-predecessor, &.entry-successor {
-
-      .content {
-        a {
-
-        }
-      }
+      background: #d9e1e8;
+      border-left-color: #d9e1e8;
     }
 
     &.entry-follow, &.entry-favourite {
       .content {
         padding-top: 10px;
         padding-bottom: 10px;
+
+        strong {
+          font-weight: 500;
+        }
       }
     }
 
     &:last-child {
       border-bottom: 0;
-      border-radius: 0 0 4px 0;
+      border-radius: 0 0 4px 4px;
+    }
+  }
+
+  &.activity-stream-headless {
+    .entry:first-child {
+      border-radius: 4px 4px 0 0;
+
+      &:last-child {
+        border-radius: 4px;
+      }
     }
   }