Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[57153] Reduce amount of design variables needed for the sidebar #16691

Merged
merged 7 commits into from
Sep 20, 2024
+22 −12
Merged

[57153] Reduce amount of design variables needed for the sidebar #16691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f8ac569
remove unnecessary variables from the list
bsatarnejad Sep 10, 2024
75549a4
create a helper for updating design variables
bsatarnejad Sep 11, 2024
e3deae3
undo changes in update design service
bsatarnejad Sep 19, 2024
95bfdef
set font colors based on the bg color in inline_css file
bsatarnejad Sep 19, 2024
631059b
change default values of font color for selected and hovered menu item
bsatarnejad Sep 19, 2024
00e52fd
undo changes in colors helper
bsatarnejad Sep 19, 2024
785b247
remove border colour variables and calculate them based on the backgr…
bsatarnejad Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions app/views/custom_styles/_inline_css.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,28 @@ See COPYRIGHT and LICENSE files for more details.
:root {
<% DesignColor.overwritten.each do |design_color| %>
--<%= design_color.variable %>: <%= design_color.hexcode %>;
<% if design_color.variable == "header-border-bottom-color" %>
<% if design_color.variable == "header-bg-color" %>
--header-item-font-color: <%= design_color.contrasting_font_color %>;
<% if design_color.bright? %>
--header-border-bottom-width: 1px;
--header-border-bottom-color: #d0d7de;
<% end %>
<% end %>
<% if design_color.variable == "main-menu-border-color" %>
<% if design_color.variable == "header-item-bg-hover-color" %>
--header-item-font-hover-color: <%= design_color.contrasting_font_color %>;
<% end %>
<% if design_color.variable == "main-menu-bg-color" %>
--main-menu-font-color: <%= design_color.contrasting_font_color %>;
<% if design_color.bright? %>
--main-menu-border-width: 1px;
--main-menu-border-color: #d0d7de;
<% end %>
<% end %>
<% if design_color.variable == "main-menu-bg-selected-background" %>
--main-menu-selected-font-color: <%= design_color.contrasting_font_color %>;
<% end %>
<% if design_color.variable == "main-menu-bg-hover-background" %>
--main-menu-hover-font-color: <%= design_color.contrasting_font_color %>;
<% end %>
<% if design_color.variable == "primary-button-color" %>
--primary-button-color--major1: <%= design_color.darken 0.18 %>;
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/global_styles/openproject/_variable_defaults.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@
--main-menu-bg-selected-background: #175A8E;
--main-menu-bg-hover-background: #124E7C;
--main-menu-font-color: #FFFFFF;
--main-menu-hover-font-color: var(--main-menu-font-color);
--main-menu-hover-font-color: #FFFFFF;
--main-menu-resizer-color: var(--main-menu-border-color);
--main-menu-selected-font-color: var(--main-menu-font-color);
--main-menu-selected-font-color: #FFFFFF;
--main-menu-font-size: 14px;
--main-menu-fieldset-header-color: #B0B2B3;
--main-menu-hover-border-color: transparent;
Expand Down
9 changes: 1 addition & 8 deletions lib/open_project/custom_styles/design.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,16 +72,9 @@ def customizable_variables
accent-color
header-bg-color
header-item-bg-hover-color
header-item-font-color
header-item-font-hover-color
header-border-bottom-color
main-menu-bg-color
main-menu-bg-selected-background
main-menu-bg-hover-background
main-menu-font-color
main-menu-selected-font-color
main-menu-hover-font-color
main-menu-border-color )
main-menu-bg-hover-background)
end
end
end