diff --git a/app/packs/stylesheets/okbr/_nav.scss b/app/packs/stylesheets/okbr/_nav.scss index f30a703..db9ae54 100644 --- a/app/packs/stylesheets/okbr/_nav.scss +++ b/app/packs/stylesheets/okbr/_nav.scss @@ -1,7 +1,11 @@ #okbr-link { - flex: 1 0 auto; + flex: 2 0 auto; + align-self: center; } +.org-logo { + flex: 2 0 auto; +} .navbar { background-color: white; color: black; @@ -24,7 +28,7 @@ } .main-nav ul > li > a { - padding: 0 1rem; + padding: 0 2rem; } .main-nav ul > li:not(:last-child) a { @@ -55,4 +59,35 @@ .topbar__dropmenu > ul > li > a { color: white; } + + .topbar > div.logo-wrapper { + flex-direction: column; + } + #okbr-link { + margin: 1.2rem 0 0; + align-self: flex-start; + } + + .okbr-search { + width: 100%; + } + + .main-nav ul > li > a { + margin: 1rem auto; + } + + .main-nav ul > li:not(:last-child) a { + 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/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 @@ - \ 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..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" %>
@@ -119,4 +122,4 @@ end
- + \ No newline at end of file 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: