From 964c78c118e76f9595328625f2f9975d3cec7cf5 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Wed, 17 Jul 2019 17:55:09 +0200 Subject: Fix some SCSS for RTL behavior --- .../flavours/glitch/styles/components/composer.scss | 2 +- .../flavours/glitch/styles/components/status.scss | 20 ++++++++------------ app/javascript/flavours/glitch/styles/rtl.scss | 5 +++++ 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/app/javascript/flavours/glitch/styles/components/composer.scss b/app/javascript/flavours/glitch/styles/components/composer.scss index 3eb5551c6..1044b13c1 100644 --- a/app/javascript/flavours/glitch/styles/components/composer.scss +++ b/app/javascript/flavours/glitch/styles/components/composer.scss @@ -605,7 +605,7 @@ & > .side_arm { display: inline-block; - margin: 0 2px 0 0; + margin: 0 2px; padding: 0; width: 36px; text-align: center; diff --git a/app/javascript/flavours/glitch/styles/components/status.scss b/app/javascript/flavours/glitch/styles/components/status.scss index 4ffbb2c21..3c4d28368 100644 --- a/app/javascript/flavours/glitch/styles/components/status.scss +++ b/app/javascript/flavours/glitch/styles/components/status.scss @@ -370,9 +370,7 @@ .status__relative-time { display: inline-block; - margin-left: auto; - padding-left: 18px; - width: 120px; + flex-grow: 1; color: $dark-text-color; font-size: 14px; text-align: right; @@ -382,7 +380,6 @@ } .status__display-name { - margin: 0 auto 0 0; color: $dark-text-color; overflow: hidden; } @@ -394,6 +391,7 @@ .status__info { display: flex; + justify-content: space-between; font-size: 15px; > span { @@ -407,25 +405,23 @@ } .status__info__icons { - margin-left: auto; display: flex; align-items: center; height: 1em; color: $action-button-color; - .status__media-icon { - padding-left: 6px; - padding-right: 1px; - } - - .status__visibility-icon { - padding-left: 4px; + .status__media-icon, + .status__visibility-icon, + .status__reply-icon { + padding-left: 2px; + padding-right: 2px; } } .status__info__account { display: flex; align-items: center; + justify-content: flex-start; } .status-check-box { diff --git a/app/javascript/flavours/glitch/styles/rtl.scss b/app/javascript/flavours/glitch/styles/rtl.scss index 350f86acf..e4ef01330 100644 --- a/app/javascript/flavours/glitch/styles/rtl.scss +++ b/app/javascript/flavours/glitch/styles/rtl.scss @@ -28,6 +28,10 @@ body.rtl { margin-left: 4px; } + .composer--publisher { + text-align: left; + } + .navigation-bar__profile { margin-left: 0; margin-right: 8px; @@ -136,6 +140,7 @@ body.rtl { .status__relative-time, .activity-stream .status.light .status__header .status__meta { float: left; + text-align: left; } .status__action-bar { -- cgit