From 69eece0b78634e407c8b4d022bc136ddfad74dec Mon Sep 17 00:00:00 2001 From: Ali G Date: Tue, 9 Jan 2024 20:05:18 -0600 Subject: [PATCH 1/3] Work on topbar responsiveness and CSS adjustments --- app/packs/stylesheets/okbr/_nav.scss | 23 +++++++++++++++++-- app/packs/stylesheets/okbr/application.scss | 4 ++++ .../layouts/decidim/_topbar_search.html.erb | 23 +++++++++++-------- app/views/layouts/decidim/_wrapper.html.erb | 10 ++++---- 4 files changed, 44 insertions(+), 16 deletions(-) diff --git a/app/packs/stylesheets/okbr/_nav.scss b/app/packs/stylesheets/okbr/_nav.scss index f30a703..6e559ae 100644 --- a/app/packs/stylesheets/okbr/_nav.scss +++ b/app/packs/stylesheets/okbr/_nav.scss @@ -1,5 +1,5 @@ #okbr-link { - flex: 1 0 auto; + margin: auto 1rem; } .navbar { @@ -24,7 +24,7 @@ } .main-nav ul > li > a { - padding: 0 1rem; + padding: 0 2rem; } .main-nav ul > li:not(:last-child) a { @@ -55,4 +55,23 @@ .topbar__dropmenu > ul > li > a { color: white; } + + .topbar > div.logo-wrapper { + flex-direction: column; + } + #okbr-link { + margin: 1.2rem 0 0; + } + + .okbr-search { + width: 100%; + } + + .main-nav ul > li > a { + margin: 1rem auto; + } + + .main-nav ul > li:not(:last-child) a { + border-right: 0px; + } } diff --git a/app/packs/stylesheets/okbr/application.scss b/app/packs/stylesheets/okbr/application.scss index 507c37d..70a42d8 100644 --- a/app/packs/stylesheets/okbr/application.scss +++ b/app/packs/stylesheets/okbr/application.scss @@ -49,3 +49,7 @@ body { .floating-helper__content { border-top: none; } + +h1, .h1, h2, .h2, h3, .h3, h4, .h4, h5, .h5, h6, .h6 { + font-family: "Hanken Grotesk", Helvetica, Roboto, Arial, sans-serif; +} \ No newline at end of file diff --git a/app/views/layouts/decidim/_topbar_search.html.erb b/app/views/layouts/decidim/_topbar_search.html.erb index 53802a3..599bb2c 100644 --- a/app/views/layouts/decidim/_topbar_search.html.erb +++ b/app/views/layouts/decidim/_topbar_search.html.erb @@ -1,10 +1,15 @@ -
- <%= form_tag(decidim.search_path, method: :get, class: "okbr-search__form") do %> -
- <%= submit_tag icon("magnifying-glass", aria_label: t("decidim.search.term_input_placeholder"), role: "img"), title: t("decidim.search.term_input_placeholder"), id: :submit, class: "okbr-search__button" %> -
- <%= label_tag :term do %> - <%= text_field_tag :term, nil, class: "okbr-search__input", placeholder: t("decidim.search.term_input_placeholder"), title: t("decidim.search.term_input_placeholder") %> +
+
+ <%= form_tag(decidim.search_path, method: :get, class: "okbr-search__form") do %> + +
+ <%= submit_tag icon("magnifying-glass", aria_label: t("decidim.search.term_input_placeholder"), role: "img"), title: t("decidim.search.term_input_placeholder"), id: :submit, class: "okbr-search__button" %> +
+ + <%= label_tag :term do %> + <%= text_field_tag :term, nil, class: "okbr-search__input", placeholder: t("decidim.search.term_input_placeholder"), title: t("decidim.search.term_input_placeholder") %> + <% end %> + <% end %> - <% end %> -
+
+
\ No newline at end of file diff --git a/app/views/layouts/decidim/_wrapper.html.erb b/app/views/layouts/decidim/_wrapper.html.erb index ee991b6..1b3efb4 100644 --- a/app/views/layouts/decidim/_wrapper.html.erb +++ b/app/views/layouts/decidim/_wrapper.html.erb @@ -45,10 +45,10 @@ end
<%= render partial: "layouts/decidim/logo", locals: { organization: current_organization } %> -
- + +
<%= render partial: "layouts/decidim/topbar_search" %> <%= render partial: "layouts/decidim/language_chooser" %>
@@ -119,4 +119,4 @@ end
- + \ No newline at end of file From 5e40d12f4f09eaf53ab9d8bea31f7cfccb40f67e Mon Sep 17 00:00:00 2001 From: Ali G Date: Tue, 9 Jan 2024 20:31:45 -0600 Subject: [PATCH 2/3] corrected missing interpolation --- config/locales/pt-BR.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 1e2054b..b61baa8 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -702,7 +702,7 @@ pt-BR: creator: Administrador links: warning: - body_1: Você está prestes a sair do %{organization_name}. + body_1: Você está prestes a sair do cominutas. body_2: Como medida de precaução, por favor verifique o link no qual clicou e certifique-se que o reconhece. log: base_presenter: From 72daf7a628c17a5161e3662763200c66d5aebad6 Mon Sep 17 00:00:00 2001 From: Ali G Date: Wed, 10 Jan 2024 10:32:08 -0600 Subject: [PATCH 3/3] corrected spacing for open knowledge brasil link on topbar --- app/packs/stylesheets/okbr/_nav.scss | 18 +++++++++++++++++- app/views/layouts/decidim/_wrapper.html.erb | 9 ++++++--- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/app/packs/stylesheets/okbr/_nav.scss b/app/packs/stylesheets/okbr/_nav.scss index 6e559ae..db9ae54 100644 --- a/app/packs/stylesheets/okbr/_nav.scss +++ b/app/packs/stylesheets/okbr/_nav.scss @@ -1,7 +1,11 @@ #okbr-link { - margin: auto 1rem; + flex: 2 0 auto; + align-self: center; } +.org-logo { + flex: 2 0 auto; +} .navbar { background-color: white; color: black; @@ -61,6 +65,7 @@ } #okbr-link { margin: 1.2rem 0 0; + align-self: flex-start; } .okbr-search { @@ -75,3 +80,14 @@ border-right: 0px; } } + +@media all and (max-width: 820px) { + .topbar > div.logo-wrapper { + flex-direction: column; + } + + #okbr-link { + margin: 1.2rem 0 0; + align-self: flex-start; + } +} \ No newline at end of file diff --git a/app/views/layouts/decidim/_wrapper.html.erb b/app/views/layouts/decidim/_wrapper.html.erb index 1b3efb4..9a6c506 100644 --- a/app/views/layouts/decidim/_wrapper.html.erb +++ b/app/views/layouts/decidim/_wrapper.html.erb @@ -44,11 +44,14 @@ end <% end %>
- <%= render partial: "layouts/decidim/logo", locals: { organization: current_organization } %> + -
+
+ + <%= render partial: "layouts/decidim/topbar_search" %> <%= render partial: "layouts/decidim/language_chooser" %>