separate issues

openpoke · May 27, 2024 · 8f4d41e · 8f4d41e
1 parent e25693a
commit 8f4d41e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 84 deletions.
diff --git a/decidim-core/app/packs/stylesheets/decidim/_header.scss b/decidim-core/app/packs/stylesheets/decidim/_header.scss
@@ -81,10 +81,10 @@ header {
       @apply fixed bottom-0 left-0 z-40 bg-white w-full px-4 py-3 flex justify-between text-secondary shadow-[0_-4px_6px_rgba(198,198,198,0.25)];
 
       &__trigger {
-        @apply flex flex-col items-center text-secondary cursor-pointer pl-4 border-l border-gray-3;
+        @apply flex flex-col items-center text-secondary cursor-pointer p-2;
 
         svg {
-          @apply w-6 h-6 fill-current;
+          @apply w-5 h-5 fill-current;
         }
 
         span {
@@ -140,18 +140,6 @@ header {
         }
       }
 
-      &__login {
-        @apply w-20 h-full flex flex-row items-center relative text-secondary gap-1;
-
-        svg {
-          @apply w-8 h-6 fill-current;
-        }
-
-        svg + span {
-          @apply text-sm first-letter:uppercase pr-4;
-        }
-      }
-
       &__item {
         @apply w-1/4 flex flex-col items-center relative;
 
@@ -195,7 +183,7 @@ header {
     }
 
     &__avatar {
-      @apply block w-6 h-6 rounded-full border border-secondary overflow-hidden mr-2;
+      @apply block w-8 h-8 rounded-full border border-secondary overflow-hidden;
 
       span {
         @apply w-full h-full rounded-full overflow-hidden;

diff --git a/decidim-core/app/views/layouts/decidim/header/_main.html.erb b/decidim-core/app/views/layouts/decidim/header/_main.html.erb
@@ -11,22 +11,15 @@
     </div>
 
     <div class="lg:hidden">
-      <div class="flex flex-row-reverse items-center">
-        <%# Main dropdown mobile %>
-        <button id="main-dropdown-summary-mobile" class="main-bar__links-mobile__trigger p-0"
-          data-component="dropdown"
-          data-target="dropdown-menu-main-mobile">
-          <%= icon "menu-line" %><span class="sr-only"><%= t("main_menu", scope: "layouts.decidim.header") %></span>
-        </button>
+      <%# Main dropdown mobile %>
+      <button id="main-dropdown-summary-mobile" class="main-bar__links-mobile__trigger"
+        data-component="dropdown"
+        data-target="dropdown-menu-main-mobile">
+        <%= icon "menu-line" %><span class="sr-only"><%= t("main_menu", scope: "layouts.decidim.header") %></span>
+      </button>
 
-        <div id="dropdown-menu-main-mobile" class="main-bar__links-mobile__dropdown" aria-hidden="true">
-          <%= render partial: "layouts/decidim/header/menu_breadcrumb_main_dropdown", locals: { id: "breadcrumb-main-dropdown-mobile" } %>
-        </div>
-
-        <%# Main mobile log-in %>
-        <div>
-          <%= render partial: "layouts/decidim/header/main_links_mobile_item_account" %>
-        </div>
+      <div id="dropdown-menu-main-mobile" class="main-bar__links-mobile__dropdown" aria-hidden="true">
+        <%= render partial: "layouts/decidim/header/menu_breadcrumb_main_dropdown", locals: { id: "breadcrumb-main-dropdown-mobile" } %>
       </div>
 
       <%# Overlay menus mobile %>

diff --git a/decidim-core/app/views/layouts/decidim/header/_main_links_mobile_item_account.html.erb b/decidim-core/app/views/layouts/decidim/header/_main_links_mobile_item_account.html.erb
diff --git a/decidim-core/config/locales/en.yml b/decidim-core/config/locales/en.yml
@@ -1934,7 +1934,7 @@ en:
         sign_up: Sign Up
         terms_of_service: Terms of Service
       header:
-        log_in: Login
+        log_in: Log in
         main_menu: Main menu
         user_menu: User menu
       impersonation_warning:

diff --git a/decidim-core/spec/system/mobile_header_spec.rb b/decidim-core/spec/system/mobile_header_spec.rb