From fdcb55a0a645e8b89d6b094c38a1571291174500 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 26 Apr 2017 04:40:27 +0200
Subject: [PATCH] Fix various regressions (#2466)

---
 .../components/containers/mastodon.jsx            |  2 ++
 app/assets/javascripts/components/locales/fa.jsx  | 10 ----------
 app/assets/javascripts/components/locales/hr.jsx  |  3 ---
 app/assets/stylesheets/components.scss            | 15 +++++++++++++--
 app/assets/stylesheets/rtl.scss                   |  9 ++++++++-
 5 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/app/assets/javascripts/components/containers/mastodon.jsx b/app/assets/javascripts/components/containers/mastodon.jsx
index c85a353eed..e34cf6c926 100644
--- a/app/assets/javascripts/components/containers/mastodon.jsx
+++ b/app/assets/javascripts/components/containers/mastodon.jsx
@@ -47,6 +47,7 @@ import en from 'react-intl/locale-data/en';
 import de from 'react-intl/locale-data/de';
 import eo from 'react-intl/locale-data/eo';
 import es from 'react-intl/locale-data/es';
+import fa from 'react-intl/locale-data/fa';
 import fi from 'react-intl/locale-data/fi';
 import fr from 'react-intl/locale-data/fr';
 import hu from 'react-intl/locale-data/hu';
@@ -81,6 +82,7 @@ addLocaleData([
   ...de,
   ...eo,
   ...es,
+  ...fa,
   ...fi,
   ...fr,
   ...hu,
diff --git a/app/assets/javascripts/components/locales/fa.jsx b/app/assets/javascripts/components/locales/fa.jsx
index ed46a890ba..40a7506187 100644
--- a/app/assets/javascripts/components/locales/fa.jsx
+++ b/app/assets/javascripts/components/locales/fa.jsx
@@ -1,13 +1,3 @@
-/**
- * Note for Contributors:
- * This file (en.jsx) serve as a template for other languages.
- * To make other contributors' life easier, please REMEMBER:
- *   1. to add your new string here; and
- *   2. to remove old strings that are no longer needed; and
- *   3. to sort the strings by the key.
- *   4. To rename the `en` const name and export default name to match your locale.
- * Thanks!
- */
 const fa = {
   "account.block": "@{name} را مسدود کن",
   "account.disclaimer": "این کاربر عضو سرور متفاوتی است. شاید عدد واقعی بیشتر از این باشد.",
diff --git a/app/assets/javascripts/components/locales/hr.jsx b/app/assets/javascripts/components/locales/hr.jsx
index 30eff96272..0ca3ef73ea 100644
--- a/app/assets/javascripts/components/locales/hr.jsx
+++ b/app/assets/javascripts/components/locales/hr.jsx
@@ -1,6 +1,3 @@
-/**
-hrvatski jezik
- */
 const hr = {
   "account.block": "Blokiraj @{name}",
   "account.disclaimer": "Ovaj korisnik je sa druge instance. Ovaj broj bi mogao biti veći.",
diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss
index d4d942f15a..cbbe746c1b 100644
--- a/app/assets/stylesheets/components.scss
+++ b/app/assets/stylesheets/components.scss
@@ -1202,6 +1202,13 @@ a.status__content__spoiler-link {
       padding-right: 10px;
     }
   }
+
+  .columns-area > div {
+    .column, .drawer {
+      padding-left: 5px;
+      padding-right: 5px;
+    }
+  }
 }
 
 @media screen and (min-width: 2560px) {
@@ -1537,9 +1544,13 @@ a.status__content__spoiler-link {
 }
 
 .column-subheading {
-  background: lighten($color1, 20%);
+  background: $color1;
+  color: lighten($color1, 26%);
   padding: 8px 20px;
-  font-size: 16px;
+  font-size: 12px;
+  font-weight: 500;
+  text-transform: uppercase;
+  cursor: default;
 }
 
 .autosuggest-textarea,
diff --git a/app/assets/stylesheets/rtl.scss b/app/assets/stylesheets/rtl.scss
index af7be5f9c8..6abb2d25c4 100644
--- a/app/assets/stylesheets/rtl.scss
+++ b/app/assets/stylesheets/rtl.scss
@@ -33,7 +33,7 @@ body.rtl {
 
   .column-icon {
     right: auto;
-    left: 0;
+    left: 5px;
   }
 
   .setting-toggle {
@@ -125,5 +125,12 @@ body.rtl {
         padding-left: 10px;
       }
     }
+
+    .columns-area > div {
+      .column, .drawer {
+        padding-left: 5px;
+        padding-right: 5px;
+      }
+    }
   }
 }