mastofe

commit: 04bce0cdf28402c3433403f399ee10113f6f5fdf
parent: 76e970c856da5a04ada00ce2c540e5eed57aed50
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Fri, 27 Jan 2017 20:38:35 +0100

Clean up

Diffstat:
M
app/assets/javascripts/components/locales/en.jsx
1
+
M
app/assets/stylesheets/application.scss
8
++++----

2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/app/assets/javascripts/components/locales/en.jsx b/app/assets/javascripts/components/locales/en.jsx
@@ -39,6 +39,7 @@ const en = {
   "compose_form.placeholder": "What is on your mind?",
   "compose_form.publish": "Toot",
   "compose_form.sensitive": "Mark media as sensitive",
+  "compose_form.spoiler": "Hide text behind warning",
   "compose_form.private": "Mark as private",
   "compose_form.unlisted": "Do not display in public timeline",
   "navigation_bar.edit_profile": "Edit profile",
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -110,10 +110,6 @@ body {
   font-feature-settings: "kern";
   text-size-adjust: none;
 
-  button:focus {
-      outline: none !important;
-  }
-
   &.app-body {
     position: fixed;
     width: 100%;
@@ -138,6 +134,10 @@ body {
   }
 }
 
+button:focus {
+  outline: none;
+}
+
 .app-holder {
   display: flex;
   width: 100%;