about summary refs log tree commit diff
path: root/app/javascript/styles
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-07-01 04:12:34 +0200
committerGitHub <noreply@github.com>2018-07-01 04:12:34 +0200
commit2092d5c0ad099e8f60eb001ee0cd647fc759aefc (patch)
treef5e6dfdd44ebf18bd648fdfbe5bd9b446ee1d5b3 /app/javascript/styles
parent8fea9cc3112968d90ba4df02a90aa3a031a5f3a9 (diff)
Improve embeds (#7919)
* Make embeds cacheable by reverse proxy

* Make follow button on embeds open remote follow modal

Instead of web+mastodon://, also, turn the button blue, and add a
sign up prompt to the remote follow modal
Diffstat (limited to 'app/javascript/styles')
-rw-r--r--app/javascript/styles/mastodon/accounts.scss1
-rw-r--r--app/javascript/styles/mastodon/stream_entries.scss13
2 files changed, 10 insertions, 4 deletions
diff --git a/app/javascript/styles/mastodon/accounts.scss b/app/javascript/styles/mastodon/accounts.scss
index 14dc5dd62..8033e6418 100644
--- a/app/javascript/styles/mastodon/accounts.scss
+++ b/app/javascript/styles/mastodon/accounts.scss
@@ -464,6 +464,7 @@
   background: $simple-background-color;
 
   &__header {
+    background: $base-shadow-color;
     background-size: cover;
     background-position: center center;
     height: 90px;
diff --git a/app/javascript/styles/mastodon/stream_entries.scss b/app/javascript/styles/mastodon/stream_entries.scss
index 281cbaf83..369bb4479 100644
--- a/app/javascript/styles/mastodon/stream_entries.scss
+++ b/app/javascript/styles/mastodon/stream_entries.scss
@@ -324,6 +324,9 @@
         .button.button-secondary.logo-button {
           flex: 0 auto;
           font-size: 14px;
+          background: $ui-highlight-color;
+          color: $primary-text-color;
+          border: 0;
 
           svg {
             width: 20px;
@@ -332,19 +335,21 @@
             margin-right: 5px;
 
             path:first-child {
-              fill: $ui-primary-color;
+              fill: $primary-text-color;
             }
 
             path:last-child {
-              fill: $simple-background-color;
+              fill: $ui-highlight-color;
             }
           }
 
           &:active,
           &:focus,
           &:hover {
-            svg path:first-child {
-              fill: lighten($ui-primary-color, 4%);
+            background: lighten($ui-highlight-color, 10%);
+
+            svg path:last-child {
+              fill: lighten($ui-highlight-color, 10%);
             }
           }
         }