From 4495a2c865b97ca1dd49eacd9e5bd86cfdb619b0 Mon Sep 17 00:00:00 2001 From: alexcherman Date: Fri, 15 May 2020 23:32:13 +0200 Subject: [PATCH 1/3] Fix rtl text styles --- _layouts/wallet-container.html | 2 +- _sass/_wallets.scss | 2 +- css/rtl.scss | 75 ++++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 2 deletions(-) diff --git a/_layouts/wallet-container.html b/_layouts/wallet-container.html index 78b5de5f..5f8bb404 100644 --- a/_layouts/wallet-container.html +++ b/_layouts/wallet-container.html @@ -25,7 +25,7 @@ max_wallet_text_length: 418 ## Unicode characters
{% for featureName in features %}
-
+
checked

{% translate wizard-feature-{{featureName}} choose-your-wallet %} diff --git a/_sass/_wallets.scss b/_sass/_wallets.scss index 5d3c4f66..34f56cb9 100644 --- a/_sass/_wallets.scss +++ b/_sass/_wallets.scss @@ -275,7 +275,7 @@ $scores: good $black 600, pass $black 600, neutral $black 600, fail $black 600; .line { display: none; } -.left-column { +.features-element-left { display: flex; } .close-btn { diff --git a/css/rtl.scss b/css/rtl.scss index 7bae5daf..aff232c8 100644 --- a/css/rtl.scss +++ b/css/rtl.scss @@ -50,6 +50,11 @@ p{ .footermenu a{ margin-right:0; margin-left:15px; + text-align: right; + direction: rtl; +} +.footer-title { + text-align: right; } .statusmenu{ padding-left:0; @@ -159,6 +164,9 @@ h2 .rssicon{ border-left:0; margin-right:-1px } +.right-column h2 { + text-align: left; +} .anchorAf a{ left:0; right:-24px; @@ -298,6 +306,48 @@ h2 .rssicon{ } .toc-row { direction: ltr; + flex-direction: row-reverse; +} +.toc > div { + padding: 0 0 0 35px; +} +.toc div>ul>li>a { + text-align: right; + direction: rtl; +} +.toc div>ul>li>ul a { + text-align: right; + direction: rtl; + padding: 0 20px 0 0; +} +.toc + .toccontent { + border-left: none; + border-right: 1px solid #dfdfdf; +} +.toccontent p { + direction: rtl; + text-align: right; +} +.toccontent li { + text-align: right; + direction: rtl; +} +.boxexpand>h1:first-child, +.boxexpand>h2:first-child, +.boxexpand>h3:first-child { + text-align: right; + direction: rtl; +} +.boxexpand.expanded>h1:first-child, +.boxexpand.expanded>h2:first-child, +.boxexpand.expanded>h3:first-child { + padding: 40px 30px 15px 35px; +} +.boxexpand>h1:first-child::after, +.boxexpand>h2:first-child::after, +.boxexpand>h3:first-child::after { + right: auto; + left: 30px; } .btn-container { direction: ltr; @@ -446,6 +496,16 @@ h2 .rssicon{ left: auto; right: 15px; } +.two-column-row:nth-child(odd) .column-text { + margin: 0 30px 0 0; +} +.two-column-row:nth-child(even) .column-text { + margin: 0 0 0 30px; +} +.column-text p { + text-align: right; +} + /*Override UbuntuBold by Droid Naskh*/ @font-face{font-family:'DroidNaskh';src:url('/font/droidnaskh/droidnaskh-regular.eot');font-weight:normal;font-style:normal;} @@ -706,6 +766,15 @@ h2 .rssicon{ .is-expanded+.accordion-content { direction: ltr; } + .two-column-row:nth-child(odd) .column-text { + margin: 0; + } + .two-column-row:nth-child(even) .column-text { + margin: 0; + } + .toc>div { + padding: 0 15px 0 20px; + } } @media handheld, only screen and ( max-width: 40em ), only screen and ( max-device-width: 40em ){ .maincard img { @@ -714,4 +783,10 @@ h2 .rssicon{ .maincard { text-align: right; } + .toc-row { + flex-direction: column; + } + .toc>div { + padding: 0; + } } From 0b2eb4f48b006a30f8f2ff5c6395685f87ebe661 Mon Sep 17 00:00:00 2001 From: alexcherman Date: Tue, 2 Jun 2020 19:17:50 +0200 Subject: [PATCH 2/3] Add rtl styles --- _sass/_wallets.scss | 5 ++++ css/rtl.scss | 66 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) diff --git a/_sass/_wallets.scss b/_sass/_wallets.scss index 5d3c4f66..5909c3c8 100644 --- a/_sass/_wallets.scss +++ b/_sass/_wallets.scss @@ -402,6 +402,11 @@ $scores: good $black 600, pass $black 600, neutral $black 600, fail $black 600; justify-content: flex-start; } } +@media screen and (max-width: 768px) { + .left-column { + flex-direction: column; + } +} @media screen and (max-width: 700px) { .wallet-accordion-btn { display: flex; diff --git a/css/rtl.scss b/css/rtl.scss index 7bae5daf..da7194fd 100644 --- a/css/rtl.scss +++ b/css/rtl.scss @@ -39,6 +39,7 @@ p{ .menusimple li a:visited, .menusimple li a:link{ font-family:'DroidNaskh', sans-serif; + text-align: right; } .menusimple li ul{ right:0; @@ -85,6 +86,9 @@ h2 .rssicon{ .mainlist-item img { margin: 0 0 0 25px; } +.maindesc-text { + text-align: right; +} .contributors{ text-align:right; } @@ -159,6 +163,13 @@ h2 .rssicon{ border-left:0; margin-right:-1px } +.start p { + text-align: right; +} +.right-column div { + left: auto; + right: 0; +} .anchorAf a{ left:0; right:-24px; @@ -299,6 +310,9 @@ h2 .rssicon{ .toc-row { direction: ltr; } +.toc ul, .toc li { + text-align: right; +} .btn-container { direction: ltr; } @@ -317,6 +331,22 @@ h2 .rssicon{ .own-text { direction: rtl; } +.own-block { + flex-direction: row-reverse; +} +.own h3, +.own p { + text-align: right; +} +.own-timeline-number { + margin: 0 0 0 95px; +} +.controll p { + text-align: right; +} +.mission li { + text-align: right; +} .helper-intro-text { text-align: right; } @@ -356,6 +386,9 @@ h2 .rssicon{ .helper-change-btn { margin: 0 20px 0 0; } +.helper-checkbox-title { + text-align: right; +} .helper-checkbox-text { padding: 0 45px 0 0; } @@ -446,6 +479,9 @@ h2 .rssicon{ left: auto; right: 15px; } +.download-text { + text-align: right; +} /*Override UbuntuBold by Droid Naskh*/ @font-face{font-family:'DroidNaskh';src:url('/font/droidnaskh/droidnaskh-regular.eot');font-weight:normal;font-style:normal;} @@ -567,6 +603,30 @@ h2 .rssicon{ left: -20px; } } +@media screen and (max-width: 768px) { + .start { + padding: 0 15px 50px 0; + } + .start-block { + padding-left: 0; + padding-right: 30px; + } + .start-block:not(:last-child)::before { + left: auto; + right: 0; + } + .start .start-block::after { + left: auto; + right: 0; + transform: translate(50%, -4px); + } + .left-column, .left-column h2 { + text-align: right; + } + .right-column, .right-column h2 { + text-align: right; + } +} @media screen and (max-width: 700px) { .helper-platforms-section + .helper-platforms-section { margin: 30px 0 0; @@ -706,6 +766,9 @@ h2 .rssicon{ .is-expanded+.accordion-content { direction: ltr; } + .own-timeline-number { + margin: 0 0 0 60px; + } } @media handheld, only screen and ( max-width: 40em ), only screen and ( max-device-width: 40em ){ .maincard img { @@ -714,4 +777,7 @@ h2 .rssicon{ .maincard { text-align: right; } + .own-timeline-number { + margin: 0 0 0 20px; + } } From 2deee57d4b98c36c76a34c82725f21ed844a9551 Mon Sep 17 00:00:00 2001 From: Will Binns Date: Thu, 4 Jun 2020 09:07:53 +0200 Subject: [PATCH 3/3] css/rtl: Fix missing closure to declaration --- css/rtl.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/css/rtl.scss b/css/rtl.scss index ec61269d..c23803c2 100644 --- a/css/rtl.scss +++ b/css/rtl.scss @@ -174,6 +174,7 @@ h2 .rssicon{ .right-column div { left: auto; right: 0; +} .right-column h2 { text-align: left; } @@ -826,6 +827,7 @@ h2 .rssicon{ } .own-timeline-number { margin: 0 0 0 60px; + } .two-column-row:nth-child(odd) .column-text { margin: 0; } @@ -845,6 +847,7 @@ h2 .rssicon{ } .own-timeline-number { margin: 0 0 0 20px; + } .toc-row { flex-direction: column; }