From 9f1c9b6135717535a48be0584dd777c9c8c34d76 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Mon, 22 Oct 2018 18:20:43 +0200 Subject: [Glitch] Improve style of notice/alert messages Port b972478812316da2f5c0d24c60386d408e027424 to glitch-soc --- app/javascript/flavours/glitch/styles/forms.scss | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'app/javascript/flavours/glitch/styles') diff --git a/app/javascript/flavours/glitch/styles/forms.scss b/app/javascript/flavours/glitch/styles/forms.scss index be2bf7cea..eb94f2273 100644 --- a/app/javascript/flavours/glitch/styles/forms.scss +++ b/app/javascript/flavours/glitch/styles/forms.scss @@ -460,9 +460,20 @@ code { border-radius: 4px; padding: 15px 10px; margin-bottom: 30px; - box-shadow: 0 0 5px rgba($base-shadow-color, 0.2); text-align: center; + &.notice { + border: 1px solid rgba($valid-value-color, 0.5); + background: rgba($valid-value-color, 0.25); + color: $valid-value-color; + } + + &.alert { + border: 1px solid rgba($error-value-color, 0.5); + background: rgba($error-value-color, 0.25); + color: $error-value-color; + } + p { margin-bottom: 15px; } -- cgit From bf9c4b6d98628dacdf5617d86611d4aafbc14921 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Mon, 22 Oct 2018 18:22:01 +0200 Subject: [Glitch] undo part of PR 8202 to fix RTL Port efd09e2ebba7e9f0135bd47c44a77e2fc421aa67 to glitch-soc --- app/javascript/flavours/glitch/styles/stream_entries.scss | 1 - 1 file changed, 1 deletion(-) (limited to 'app/javascript/flavours/glitch/styles') diff --git a/app/javascript/flavours/glitch/styles/stream_entries.scss b/app/javascript/flavours/glitch/styles/stream_entries.scss index c458fcb79..80e2d0ca0 100644 --- a/app/javascript/flavours/glitch/styles/stream_entries.scss +++ b/app/javascript/flavours/glitch/styles/stream_entries.scss @@ -3,7 +3,6 @@ border-radius: 4px; overflow: hidden; margin-bottom: 10px; - text-align: left; @media screen and (max-width: $no-gap-breakpoint) { margin-bottom: 0; -- cgit From 1139b758c5c9ef5526c045da59d2ce6e39d6e1c8 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Mon, 22 Oct 2018 18:30:11 +0200 Subject: [Glitch] RTL: fix admin account margins in about page Port f8c1b325410369806eb77a5c8d259971a87a6852 to glitch-soc --- app/javascript/flavours/glitch/styles/rtl.scss | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'app/javascript/flavours/glitch/styles') diff --git a/app/javascript/flavours/glitch/styles/rtl.scss b/app/javascript/flavours/glitch/styles/rtl.scss index 70aaa5bb1..654d5e27c 100644 --- a/app/javascript/flavours/glitch/styles/rtl.scss +++ b/app/javascript/flavours/glitch/styles/rtl.scss @@ -313,3 +313,15 @@ body.rtl { } } } + +.landing-page__information { + .account__display-name { + margin-right: 0; + margin-left: 5px; + } + + .account__avatar-wrapper { + margin-left: 12px; + margin-right: 0; + } +} -- cgit From e18724363d84f887b797134d1a2ccc7ec26f77c0 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Mon, 22 Oct 2018 18:22:49 +0200 Subject: [Glitch] Fixes 8987 broken alignment at "Remote interaction dialog" Port d35801aaa2ad9d06345efa45cf524113469fdd02 to glitch-soc --- app/javascript/flavours/glitch/styles/forms.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/javascript/flavours/glitch/styles') diff --git a/app/javascript/flavours/glitch/styles/forms.scss b/app/javascript/flavours/glitch/styles/forms.scss index eb94f2273..337941a08 100644 --- a/app/javascript/flavours/glitch/styles/forms.scss +++ b/app/javascript/flavours/glitch/styles/forms.scss @@ -562,12 +562,12 @@ code { .oauth-prompt, .follow-prompt { margin-bottom: 30px; - text-align: center; color: $darker-text-color; h2 { font-size: 16px; margin-bottom: 30px; + text-align: center; } strong { -- cgit From ef9c11e050073dfa6a77f179f5931ab249b73e49 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Mon, 22 Oct 2018 18:24:18 +0200 Subject: [Glitch] RTL: fix domain append at signup form Port 65b3804a6ccd40d359616b6157682ff88f85462f to glitch-soc --- app/javascript/flavours/glitch/styles/rtl.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/javascript/flavours/glitch/styles') diff --git a/app/javascript/flavours/glitch/styles/rtl.scss b/app/javascript/flavours/glitch/styles/rtl.scss index 654d5e27c..7ccec08b3 100644 --- a/app/javascript/flavours/glitch/styles/rtl.scss +++ b/app/javascript/flavours/glitch/styles/rtl.scss @@ -223,7 +223,7 @@ body.rtl { padding-right: 0; } - .simple_form .input-with-append .append { + .simple_form .label_input__append { right: auto; left: 0; -- cgit From aa277ab5fbf078b80e8ab4497cbbf826f20a4b24 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Mon, 22 Oct 2018 18:25:21 +0200 Subject: [Glitch] RTL: fix user stats in about page Port 301cbcc9802ed85c519e67a01133968bc074c8af to glitch-soc --- app/javascript/flavours/glitch/styles/rtl.scss | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'app/javascript/flavours/glitch/styles') diff --git a/app/javascript/flavours/glitch/styles/rtl.scss b/app/javascript/flavours/glitch/styles/rtl.scss index 7ccec08b3..a0c92b751 100644 --- a/app/javascript/flavours/glitch/styles/rtl.scss +++ b/app/javascript/flavours/glitch/styles/rtl.scss @@ -249,6 +249,10 @@ body.rtl { left: auto; } + .landing-page__call-to-action .row__information-board { + direction: rtl; + } + .landing-page .header .hero .floats .float-1 { left: -120px; right: auto; -- cgit From 076f0a0eb67f77a10326376bba70bcd66a4065f2 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Mon, 22 Oct 2018 18:33:35 +0200 Subject: [Glitch] Fix admin account avatar margin Port 065b39e7a460e088fd5afcd48dfc425d0006fee9 to glitch-soc --- app/javascript/flavours/glitch/styles/rtl.scss | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'app/javascript/flavours/glitch/styles') diff --git a/app/javascript/flavours/glitch/styles/rtl.scss b/app/javascript/flavours/glitch/styles/rtl.scss index a0c92b751..7ff8bdf6e 100644 --- a/app/javascript/flavours/glitch/styles/rtl.scss +++ b/app/javascript/flavours/glitch/styles/rtl.scss @@ -321,11 +321,9 @@ body.rtl { .landing-page__information { .account__display-name { margin-right: 0; - margin-left: 5px; } .account__avatar-wrapper { - margin-left: 12px; - margin-right: 0; + margin-left: 0; } } -- cgit From 9950db2e1cf1c06011b25bde2f2f3f9b98ce8941 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Mon, 22 Oct 2018 18:34:48 +0200 Subject: [Glitch] RTL: fix preferences layout Port 029943d59b222e96a2f7839390a5628888249bf6 to glitch-soc --- app/javascript/flavours/glitch/styles/rtl.scss | 29 ++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'app/javascript/flavours/glitch/styles') diff --git a/app/javascript/flavours/glitch/styles/rtl.scss b/app/javascript/flavours/glitch/styles/rtl.scss index 7ff8bdf6e..c66fb5b6d 100644 --- a/app/javascript/flavours/glitch/styles/rtl.scss +++ b/app/javascript/flavours/glitch/styles/rtl.scss @@ -200,6 +200,10 @@ body.rtl { right: -2.14285714em; } + .admin-wrapper { + direction: rtl; + } + .admin-wrapper .sidebar ul a i.fa, a.table-action-link i.fa { margin-right: 0; @@ -218,11 +222,32 @@ body.rtl { right: 0; } + .simple_form .input.radio_buttons .radio { + left: auto; + right: 0; + } + + .simple_form .input.radio_buttons .radio > label { + padding-right: 28px; + padding-left: 0; + } + .simple_form .input-with-append .input input { padding-left: 142px; padding-right: 0; } + .simple_form .input.boolean label.checkbox { + left: auto; + right: 0; + } + + .simple_form .input.boolean .label_input, + .simple_form .input.boolean .hint { + padding-left: 0; + padding-right: 28px; + } + .simple_form .label_input__append { right: auto; left: 0; @@ -234,6 +259,10 @@ body.rtl { } } + .simple_form select { + background: darken($ui-base-color, 10%) url("data:image/svg+xml;utf8,") no-repeat left 8px center / auto 16px; + } + .table th, .table td { text-align: right; -- cgit From a1f512f18bd683d93d1a3dca6ad712fb978ec1f1 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Mon, 22 Oct 2018 18:37:17 +0200 Subject: [Glitch] Fix domain label position and color Port 25f9ead041a3087993059a1398f37dfa21a62610 to glitch-soc --- app/javascript/flavours/glitch/styles/forms.scss | 2 +- app/javascript/flavours/glitch/styles/rtl.scss | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'app/javascript/flavours/glitch/styles') diff --git a/app/javascript/flavours/glitch/styles/forms.scss b/app/javascript/flavours/glitch/styles/forms.scss index 337941a08..8c4c934ea 100644 --- a/app/javascript/flavours/glitch/styles/forms.scss +++ b/app/javascript/flavours/glitch/styles/forms.scss @@ -427,7 +427,7 @@ code { &__append { position: absolute; - right: 1px; + right: 3px; top: 1px; padding: 10px; padding-bottom: 9px; diff --git a/app/javascript/flavours/glitch/styles/rtl.scss b/app/javascript/flavours/glitch/styles/rtl.scss index c66fb5b6d..b60bdd256 100644 --- a/app/javascript/flavours/glitch/styles/rtl.scss +++ b/app/javascript/flavours/glitch/styles/rtl.scss @@ -250,12 +250,12 @@ body.rtl { .simple_form .label_input__append { right: auto; - left: 0; + left: 3px; &::after { right: auto; left: 0; - background-image: linear-gradient(to left, rgba($ui-base-color, 0), $ui-base-color); + background-image: linear-gradient(to left, rgba(darken($ui-base-color, 10%), 0), darken($ui-base-color, 10%)); } } -- cgit From c14be538a6ee785ba633c2e2dab89f5eefe21a00 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Mon, 22 Oct 2018 18:38:11 +0200 Subject: [Glitch] RTL: fix column settings toggle label Port bf58461d365b5cee0d8a80a019a64e84c841f32f to glitch-soc --- app/javascript/flavours/glitch/styles/rtl.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/javascript/flavours/glitch/styles') diff --git a/app/javascript/flavours/glitch/styles/rtl.scss b/app/javascript/flavours/glitch/styles/rtl.scss index b60bdd256..e0fc2a291 100644 --- a/app/javascript/flavours/glitch/styles/rtl.scss +++ b/app/javascript/flavours/glitch/styles/rtl.scss @@ -73,7 +73,7 @@ body.rtl { float: left; } - .setting-toggle { + .setting-toggle__label { margin-left: 0; margin-right: 8px; } -- cgit From c9b19e05e2365fc453a8f9eaafcfe6ba95623d5b Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Mon, 22 Oct 2018 18:38:52 +0200 Subject: [Glitch] RTL: fix admin account avatar margin in about page Port 3a157210c87e6fe034f70d922cf7fc70fb533ad1 to glitch-soc --- app/javascript/flavours/glitch/styles/rtl.scss | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'app/javascript/flavours/glitch/styles') diff --git a/app/javascript/flavours/glitch/styles/rtl.scss b/app/javascript/flavours/glitch/styles/rtl.scss index e0fc2a291..fd17e9e72 100644 --- a/app/javascript/flavours/glitch/styles/rtl.scss +++ b/app/javascript/flavours/glitch/styles/rtl.scss @@ -345,14 +345,16 @@ body.rtl { margin-right: 20px; } } -} -.landing-page__information { - .account__display-name { - margin-right: 0; - } + .landing-page__information { + .account__display-name { + margin-right: 0; + margin-left: 5px; + } - .account__avatar-wrapper { - margin-left: 0; + .account__avatar-wrapper { + margin-left: 12px; + margin-right: 0; + } } } -- cgit From 1bb23d0407d8fbe35729e3095a6ad6f1a909dc38 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Mon, 22 Oct 2018 18:39:37 +0200 Subject: [Glitch] RTL: fix cardbar margins and alignment Port c73864c1373330f2ef75006d639f90a1debcce6d to glitch-soc --- app/javascript/flavours/glitch/styles/rtl.scss | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'app/javascript/flavours/glitch/styles') diff --git a/app/javascript/flavours/glitch/styles/rtl.scss b/app/javascript/flavours/glitch/styles/rtl.scss index fd17e9e72..3c775618e 100644 --- a/app/javascript/flavours/glitch/styles/rtl.scss +++ b/app/javascript/flavours/glitch/styles/rtl.scss @@ -357,4 +357,10 @@ body.rtl { margin-right: 0; } } + + .card__bar .display-name { + margin-left: 0; + margin-right: 15px; + text-align: right; + } } -- cgit