about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorLynx Kotoura <lynx@lv9.org>2017-09-17 22:23:44 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-09-17 15:23:44 +0200
commit4c14ff659b8a03c69123ef7b78f4db5c137deeb0 (patch)
treeefb3c78c77ecdfee537f37f1b975f5a8ebce7626 /app
parentdd6f9a1b827226346d0fff22a79538351fb33028 (diff)
Oauth code in input form and add description message (#4986)
* Oauth code in a input form and add description

* New authcode description
Diffstat (limited to 'app')
-rw-r--r--app/javascript/styles/forms.scss37
-rw-r--r--app/views/oauth/authorizations/show.html.haml3
2 files changed, 39 insertions, 1 deletions
diff --git a/app/javascript/styles/forms.scss b/app/javascript/styles/forms.scss
index 747610237..0526f174c 100644
--- a/app/javascript/styles/forms.scss
+++ b/app/javascript/styles/forms.scss
@@ -349,9 +349,46 @@ code {
   box-shadow: 0 0 5px rgba($base-shadow-color, 0.2);
   text-align: center;
 
+  p {
+    margin-bottom: 15px;
+  }
+
+  .oauth-code {
+    color: $ui-secondary-color;
+    outline: 0;
+    box-sizing: border-box;
+    display: block;
+    width: 100%;
+    border: none;
+    padding: 10px;
+    font-family: 'mastodon-font-monospace', monospace;
+    background: $ui-base-color;
+    color: $ui-primary-color;
+    font-size: 14px;
+    margin: 0;
+
+    &::-moz-focus-inner {
+      border: 0;
+    }
+
+    &::-moz-focus-inner,
+    &:focus,
+    &:active {
+      outline: 0 !important;
+    }
+
+    &:focus {
+      background: lighten($ui-base-color, 4%);
+    }
+  }
+
   strong {
     font-weight: 500;
   }
+
+  @media screen and (max-width: 740px) and (min-width: 441px) {
+    margin-top: 40px;
+  }
 }
 
 .form-footer {
diff --git a/app/views/oauth/authorizations/show.html.haml b/app/views/oauth/authorizations/show.html.haml
index b56667f35..ad5236007 100644
--- a/app/views/oauth/authorizations/show.html.haml
+++ b/app/views/oauth/authorizations/show.html.haml
@@ -1,3 +1,4 @@
 .form-container
   .flash-message
-    %code= params[:code]
+    %p= t('doorkeeper.authorizations.show.title')
+    %input{ type: 'text', class: 'oauth-code', readonly: true, value: params[:code], onClick: 'select()' }