From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 27 Jan 2017 19:38:35 +0000 (+0100)
Subject: Clean up
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=04bce0cdf28402c3433403f399ee10113f6f5fdf;p=mastodon.git

Clean up
---

diff --git a/app/assets/javascripts/components/locales/en.jsx b/app/assets/javascripts/components/locales/en.jsx
index 92dcbaeb9..ac1c1a7d5 100644
--- 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
index 6b95484fe..0bdff6186 100644
--- 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%;