diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 760c89052..b270849a7 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -512,13 +512,8 @@ body > header, } .external-links { - float: none; padding: rem-calc(6) 0; text-align: center; - - @include breakpoint(medium) { - float: right; - } } } @@ -655,11 +650,14 @@ body > header, .top-links { @include full-width-background; + @include grid-column-gutter; background: $dark; + display: flex; + flex-wrap: wrap; font-size: $small-font-size; > :first-child { - @include grid-column-gutter; + flex-grow: 1; } a { diff --git a/app/assets/stylesheets/layout/locale_switcher.scss b/app/assets/stylesheets/layout/locale_switcher.scss index 1625043bb..aedd5b909 100644 --- a/app/assets/stylesheets/layout/locale_switcher.scss +++ b/app/assets/stylesheets/layout/locale_switcher.scss @@ -1,5 +1,4 @@ .locale { - float: left; margin-bottom: $line-height / 4; margin-top: $line-height / 4; position: relative; diff --git a/app/views/layouts/_admin_header.html.erb b/app/views/layouts/_admin_header.html.erb index 73f93c602..88e5e0ff8 100644 --- a/app/views/layouts/_admin_header.html.erb +++ b/app/views/layouts/_admin_header.html.erb @@ -1,12 +1,10 @@
-
- <%= render "shared/locale_switcher" %> + <%= render "shared/locale_switcher" %> - <%= link_to root_path, class: "float-right" do %> - <%= t("admin.dashboard.index.back", org: setting["org_name"]) %> - <% end %> -
+ <%= link_to root_path do %> + <%= t("admin.dashboard.index.back", org: setting["org_name"]) %> + <% end %>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 0cb2704e9..935df3640 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -4,11 +4,9 @@ <% end %>
-
- <%= render "shared/locale_switcher" %> -
- <%= render "shared/top_links" %> -
+ <%= render "shared/locale_switcher" %> +
+ <%= render "shared/top_links" %>
diff --git a/app/views/layouts/management.html.erb b/app/views/layouts/management.html.erb index 2c11dbfe1..1d427044c 100644 --- a/app/views/layouts/management.html.erb +++ b/app/views/layouts/management.html.erb @@ -10,9 +10,7 @@
-
- <%= render "shared/locale_switcher" %> -
+ <%= render "shared/locale_switcher" %>