about summary refs log tree commit diff
path: root/app/assets
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-03-11 01:58:55 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-03-11 01:58:55 +0100
commitb919f39b3186c5f022d3965cf6023ff9041e91ca (patch)
tree797d63419822cb63a24e403ea47ab8b8f304fff9 /app/assets
parentd4b9b289e8a4db61dbed9c725ee602ee63515d15 (diff)
Customizing doorkeeper views for authorizing app
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/mastodon-logo.coffee2
-rw-r--r--app/assets/stylesheets/application.scss36
2 files changed, 37 insertions, 1 deletions
diff --git a/app/assets/javascripts/mastodon-logo.coffee b/app/assets/javascripts/mastodon-logo.coffee
index 3fb8c0a13..bcf52f378 100644
--- a/app/assets/javascripts/mastodon-logo.coffee
+++ b/app/assets/javascripts/mastodon-logo.coffee
@@ -45,4 +45,4 @@ work = ->
     stop()
 
 $ ->
-  setTimeout(start, 500)
+  setTimeout(start, 100)
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 187c08311..d4b462cab 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -154,6 +154,29 @@ body {
     }
   }
 
+  .prompt {
+    font-size: 16px;
+    color: #9baec8;
+    text-align: center;
+
+    .prompt-highlight {
+      font-weight: 500;
+      color: #fff;
+    }
+  }
+
+  code.copypasteable {
+    display: block;
+    font-family: 'Roboto Mono', monospace;
+    font-weight: 400;
+    font-size: 12px;
+    margin-top: 20px;
+    background: #282c37;
+    border-radius: 4px;
+    padding: 2px;
+    word-wrap: break-word;
+  }
+
   .actions {
     margin-top: 30px;
 
@@ -170,6 +193,7 @@ body {
       cursor: pointer;
       font-weight: 500;
       outline: 0;
+      margin-bottom: 10px;
 
       &:hover {
         background-color: lighten(#2b90d9, 5%);
@@ -180,6 +204,18 @@ body {
         top: 1px;
         background-color: darken(#2b90d9, 5%);
       }
+
+      &.negative {
+        background: #df405a;
+
+        &:hover {
+          background-color: lighten(#df405a, 5%);
+        }
+
+        &:active, &:focus {
+          background-color: darken(#df405a, 5%);
+        }
+      }
     }
   }