From: Guillaume AGNIERAY Date: Fri, 3 Mar 2023 16:04:42 +0000 (+0100) Subject: Handle RTL X-Git-Tag: 1.0.0rc1~73 X-Git-Url: https://git.agnieray.net/?a=commitdiff_plain;h=37ba8842841014608294ba3ed192d869547e4306;p=galette.git Handle RTL Load RTL CSS Flip the language dropdown menu on rtl languages Flip logged in background image on rtl languages --- diff --git a/galette/templates/default/elements/header.html.twig b/galette/templates/default/elements/header.html.twig index 1dc29c55f..9365db6aa 100644 --- a/galette/templates/default/elements/header.html.twig +++ b/galette/templates/default/elements/header.html.twig @@ -2,7 +2,7 @@ {% if preferences.pref_slogan != "" %}{{ preferences.pref_slogan }} - {% endif %}{% if page_title != "" %}{{ page_title }} - {% endif %}Galette {{ constant('GALETTE_VERSION') }} - + {% if html_editor %} diff --git a/galette/templates/default/elements/language.html.twig b/galette/templates/default/elements/language.html.twig index 7da5d6fcc..0cf918aa7 100644 --- a/galette/templates/default/elements/language.html.twig +++ b/galette/templates/default/elements/language.html.twig @@ -10,7 +10,7 @@ {% endif %} {% endif %} -
+
{% if header == true %}
{% endif %} diff --git a/galette/templates/default/page.html.twig b/galette/templates/default/page.html.twig index af306ba47..ec55afbd2 100644 --- a/galette/templates/default/page.html.twig +++ b/galette/templates/default/page.html.twig @@ -1,14 +1,16 @@ - + - {% include 'elements/header.html.twig' %} + {% include 'elements/header.html.twig' with { + galette_lang: galette_lang + } %} {% include 'elements/navigation/navigation_sidebar.html.twig' %} {% include 'elements/navigation/navigation_topbar.html.twig' %}
-
+
{% if login.isLogged() %} {% include 'elements/navigation/navigation_aside.html.twig' %} {% endif %} diff --git a/galette/templates/default/public_page.html.twig b/galette/templates/default/public_page.html.twig index 8993022a2..8136caf0a 100644 --- a/galette/templates/default/public_page.html.twig +++ b/galette/templates/default/public_page.html.twig @@ -1,14 +1,16 @@ - + - {% include 'elements/header.html.twig' %} + {% include 'elements/header.html.twig' with { + galette_lang: galette_lang + } %} {% include 'elements/navigation/navigation_sidebar.html.twig' %} {% include 'elements/navigation/navigation_topbar.html.twig' %}
-
+
{% if login.isLogged() %} {% include "elements/navigation/navigation_aside.html.twig" %} {% endif %} diff --git a/ui/semantic/galette/assets/images/bg-rtl.png b/ui/semantic/galette/assets/images/bg-rtl.png new file mode 100644 index 000000000..4798b3594 Binary files /dev/null and b/ui/semantic/galette/assets/images/bg-rtl.png differ diff --git a/ui/semantic/galette/globals/site.overrides b/ui/semantic/galette/globals/site.overrides index 5f80399bc..1e4f60a9e 100644 --- a/ui/semantic/galette/globals/site.overrides +++ b/ui/semantic/galette/globals/site.overrides @@ -48,6 +48,10 @@ body.pushable:not(.loggedin) > .pusher { padding: 1.25rem; } } +.loggedin #main.rtl { + background-image: url(@galetteBackgroundImageRtl); + background-position: left top; +} #top-navbar, aside.computer.toc { diff --git a/ui/semantic/galette/globals/site.variables b/ui/semantic/galette/globals/site.variables index 95ef623da..4e587399b 100644 --- a/ui/semantic/galette/globals/site.variables +++ b/ui/semantic/galette/globals/site.variables @@ -5,6 +5,7 @@ @fontName : 'PT Sans'; @galetteBackgroundImage : 'themes/galette/assets/images/bg.png'; +@galetteBackgroundImageRtl : 'themes/galette/assets/images/bg-rtl.png'; @galetteNavBackground : rgba(99, 107, 112, .3); @galetteColor : #ffb619; @lightGaletteColor : #ffda8b; diff --git a/ui/semantic/galette/modules/dropdown.overrides b/ui/semantic/galette/modules/dropdown.overrides index 734d5cd60..163af89bb 100644 --- a/ui/semantic/galette/modules/dropdown.overrides +++ b/ui/semantic/galette/modules/dropdown.overrides @@ -9,6 +9,14 @@ height: 7rem; } +/*-------------------------- + Language dropdown +---------------------------*/ +.ui.language.dropdown.rtl .menu { + left: auto; + right: 0; +} + /*------------------------ Search dropdown -------------------------*/