about summary refs log tree commit diff
path: root/app/assets/stylesheets
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-03-06 17:52:23 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-03-06 17:52:23 +0100
commit3824c588533f481011d2be19ff9476c001ffbee9 (patch)
tree96203d48ec3d8f54d69591d6b8616c9b4ac7a03b /app/assets/stylesheets
parent831a187d74791a34270ecdc94df62bcc86dedd03 (diff)
Adding GNU Public license, adding home timeline, reblog/favourite counters
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r--app/assets/stylesheets/accounts.scss1
-rw-r--r--app/assets/stylesheets/application.scss1
-rw-r--r--app/assets/stylesheets/stream_entries.scss52
3 files changed, 47 insertions, 7 deletions
diff --git a/app/assets/stylesheets/accounts.scss b/app/assets/stylesheets/accounts.scss
index b9633f074..d659cbcb3 100644
--- a/app/assets/stylesheets/accounts.scss
+++ b/app/assets/stylesheets/accounts.scss
@@ -4,6 +4,7 @@
   padding: 60px 0;
   padding-bottom: 10px;
   border-radius: 4px 4px 0 0;
+  box-shadow: 0 0 15px rgba(0, 0, 0, 0.2);
 
   .name {
     display: block;
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 3a35ab997..a091d79ff 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -71,6 +71,7 @@ body {
   font-family: 'Roboto', sans-serif;
   background: #282c37 image-url('background-photo.jpeg');
   background-size: cover;
+  background-attachment: fixed;
   font-size: 13px;
   line-height: 18px;
   font-weight: 400;
diff --git a/app/assets/stylesheets/stream_entries.scss b/app/assets/stylesheets/stream_entries.scss
index ce5c7f4ba..31bec6374 100644
--- a/app/assets/stylesheets/stream_entries.scss
+++ b/app/assets/stylesheets/stream_entries.scss
@@ -1,7 +1,6 @@
-
 .activity-stream {
   clear: both;
-  box-shadow: 4px 3px 0 rgba(0, 0, 0, 0.1);
+  box-shadow: 0 0 15px rgba(0, 0, 0, 0.2);
 
   .entry {
     border-bottom: 1px solid #d9e1e8;
@@ -49,14 +48,14 @@
   }
 
   .avatar {
-    width: 48px;
+    width: 56px;
     padding: 15px;
 
     img {
-      width: 48px;
-      height: 48px;
+      width: 56px;
+      height: 56px;
       display: block;
-      border-radius: 48px;
+      border-radius: 56px;
     }
   }
 
@@ -65,10 +64,39 @@
   }
 
   .header {
-    margin-bottom: 5px;
+    margin-bottom: 10px;
     padding: 15px;
     padding-bottom: 0;
     padding-left: 8px;
+    display: flex;
+
+    .header__left {
+      flex: 1;
+    }
+
+    .header__right {
+      .counter-btn {
+        color: #d9e1e8;
+        display: inline-block;
+        padding: 0 10px;
+        cursor: default;
+
+        .counter-number {
+          font-weight: 500;
+          display: inline-block;
+          margin-left: 3px;
+          font-size: 12px;
+        }
+
+        &.reblogged {
+          color: #2b90d9;
+        }
+
+        &.favourited {
+          color: #df405a;
+        }
+      }
+    }
 
     .name {
       text-decoration: none;
@@ -119,6 +147,16 @@
       &:hover {
         text-decoration: underline;
       }
+
+      &.mention {
+        &:hover {
+          text-decoration: none;
+
+          span {
+            text-decoration: underline;
+          }
+        }
+      }
     }
   }