about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-03-13 08:14:08 +0100
committerGitHub <noreply@github.com>2018-03-13 08:14:08 +0100
commit8bf3e750ab1d4f4ffa7063b088870d7a82ad548c (patch)
treef50dade469cf4e0ab3c4371aa81b36ddc35fa6b0
parent18241ccbe1778f67f657c8346a2dda1b131ee852 (diff)
Fix #6757: Adjust RTL styles for landing page (#6768)
-rw-r--r--app/javascript/mastodon/components/status_content.js2
-rw-r--r--app/javascript/styles/mastodon/rtl.scss16
-rw-r--r--app/views/about/show.html.haml2
3 files changed, 18 insertions, 2 deletions
diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js
index 701b5702c..b6082f008 100644
--- a/app/javascript/mastodon/components/status_content.js
+++ b/app/javascript/mastodon/components/status_content.js
@@ -154,7 +154,7 @@ export default class StatusContent extends React.PureComponent {
       }
 
       return (
-        <div className={classNames} ref={this.setRef} tabIndex='0' onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp}>
+        <div className={classNames} ref={this.setRef} tabIndex='0' style={directionStyle} onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp}>
           <p style={{ marginBottom: hidden && status.get('mentions').isEmpty() ? '0px' : null }}>
             <span dangerouslySetInnerHTML={spoilerContent} />
             {' '}
diff --git a/app/javascript/styles/mastodon/rtl.scss b/app/javascript/styles/mastodon/rtl.scss
index 77420c84b..e9099a9e9 100644
--- a/app/javascript/styles/mastodon/rtl.scss
+++ b/app/javascript/styles/mastodon/rtl.scss
@@ -1,6 +1,22 @@
 body.rtl {
   direction: rtl;
 
+  .column-header > button {
+    text-align: right;
+    padding-left: 0;
+    padding-right: 15px;
+  }
+
+  .landing-page__logo {
+    margin-right: 0;
+    margin-left: 20px;
+  }
+
+  .landing-page .features-list .features-list__row .visual {
+    margin-left: 0;
+    margin-right: 15px;
+  }
+
   .column-link__icon,
   .column-header__icon {
     margin-right: 0;
diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml
index dbb914f11..85e5442af 100644
--- a/app/views/about/show.html.haml
+++ b/app/views/about/show.html.haml
@@ -50,7 +50,7 @@
 
               %p= @instance_presenter.site_description.html_safe.presence || t('about.generic_description', domain: site_hostname)
 
-          .landing-page__call-to-action
+          .landing-page__call-to-action{ dir: 'ltr' }
             .row
               .row__information-board
                 .information-board__section