Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

Adjust some spacings

Henriette Darge002c6265c472
diff --git a/frontend/src/global_styles/common/header/app-header.sass b/frontend/src/global_styles/common/header/app-header.sass
index 0bdff21e18a..2f39fda7fe1 100644
--- a/frontend/src/global_styles/common/header/app-header.sass
+++ b/frontend/src/global_styles/common/header/app-header.sass
@@ -51,7 +51,7 @@
padding-right: 14px
.op-app-menu--item
- padding: 0 var(--control-medium-paddingBlock)
+ padding: 0 var(--controlStack-large-gap-spacious)
&--avatar
border: 1px solid var(--header-item-font-color)
diff --git a/lib/redmine/menu_manager/top_menu/help_menu.rb b/lib/redmine/menu_manager/top_menu/help_menu.rb
index 0ab3e2a98dc..49a2cf08c94 100644
--- a/lib/redmine/menu_manager/top_menu/help_menu.rb
+++ b/lib/redmine/menu_manager/top_menu/help_menu.rb
@@ -42,6 +42,7 @@ module Redmine::MenuManager::TopMenu::HelpMenu
href: url_for(item.url),
classes: "op-app-header--primer-button hidden-for-mobile",
scheme: :invisible,
+ pl: 1,
test_selector: "header-help-button",
aria: { label: I18n.t(:label_help) },
**item.html_options))
@@ -58,6 +59,7 @@ module Redmine::MenuManager::TopMenu::HelpMenu
def render_help_dropdown
render Primer::Alpha::ActionMenu.new(classes: "op-app-menu--item",
menu_id: "op-app-header--help-menu",
+ pl: 1,
anchor_align: :end) do |menu|
menu.with_show_button(icon: :question,
scheme: :invisible,
diff --git a/lib/redmine/menu_manager/top_menu/user_menu.rb b/lib/redmine/menu_manager/top_menu/user_menu.rb
index fc862fd7a80..bf2af167dc8 100644
--- a/lib/redmine/menu_manager/top_menu/user_menu.rb
+++ b/lib/redmine/menu_manager/top_menu/user_menu.rb
@@ -85,12 +85,12 @@ module Redmine::MenuManager::TopMenu::UserMenu
avatar
end
else
- dialog.with_show_button(icon: :person, **options) do |button|
+ dialog.with_show_button(icon: :person, aria: { label: I18n.t("label_user_menu") }, **options) do |button|
button.with_tooltip(text: I18n.t("label_user_menu"))
end
end
else
- dialog.with_show_button(**options) do |button|
+ dialog.with_show_button(px: 1, **options) do |button|
button.with_trailing_visual_icon(icon: :"triangle-down")
t(:label_login)
end
diff --git a/lib/redmine/menu_manager/top_menu_helper.rb b/lib/redmine/menu_manager/top_menu_helper.rb
index 3d3250fdcea..e25aee41997 100644
--- a/lib/redmine/menu_manager/top_menu_helper.rb
+++ b/lib/redmine/menu_manager/top_menu_helper.rb
@@ -72,7 +72,9 @@ module Redmine::MenuManager::TopMenuHelper
def render_top_menu_teaser
if User.current.admin? && EnterpriseToken.trial_only?
- render(EnterpriseEdition::BuyNowButtonComponent.new)
+ render(Primer::BaseComponent.new(tag: :div, classes: "op-app-menu--item hidden-for-mobile")) do
+ render(EnterpriseEdition::BuyNowButtonComponent.new)
+ end
end
end
@@ -99,7 +101,10 @@ module Redmine::MenuManager::TopMenuHelper
return "".html_safe unless User.current.logged?
return "".html_safe if Setting.notifications_hidden?
- render(Primer::BaseComponent.new(tag: :div, classes: "op-app-menu--item", position: :relative)) do
+ render(Primer::BaseComponent.new(tag: :div,
+ classes: "op-app-menu--item",
+ position: :relative,
+ px: 1)) do
concat(render(Primer::Beta::IconButton.new(icon: :inbox,
tag: :a,
href: notifications_path,