diff --git a/app/components/add_button_component.rb b/app/components/add_button_component.rb index 5f267b1ad661..46dafe74e648 100644 --- a/app/components/add_button_component.rb +++ b/app/components/add_button_component.rb @@ -71,7 +71,7 @@ def label_text end def link_css_class - 'button -alt-highlight' + 'button -primary' end def icon diff --git a/app/components/filters_component.html.erb b/app/components/filters_component.html.erb index 0fab3fba3f19..f17e15685497 100644 --- a/app/components/filters_component.html.erb +++ b/app/components/filters_component.html.erb @@ -123,7 +123,7 @@
  • - <%= submit_tag t('button_apply'), class: 'button -small -highlight', name: nil %> + <%= submit_tag t('button_apply'), class: 'button -small -primary', name: nil %>
    • <% unless EnterpriseToken.allows_to?(:custom_fields_in_projects_list)%> diff --git a/app/components/individual_principal_base_filter_component.html.erb b/app/components/individual_principal_base_filter_component.html.erb index 588b7e913c94..265c4a8ad61a 100644 --- a/app/components/individual_principal_base_filter_component.html.erb +++ b/app/components/individual_principal_base_filter_component.html.erb @@ -105,7 +105,7 @@ See COPYRIGHT and LICENSE files for more details. <%= text_field_tag 'name', params[:name], class: 'simple-filters--filter-value' %>
  • - <%= submit_tag t(:button_apply), class: 'button -highlight -small', name: nil %> + <%= submit_tag t(:button_apply), class: 'button -primary -small', name: nil %> <%= link_to t(:button_clear), clear_url, class: 'button -small -with-icon icon-undo' %>
    • diff --git a/app/components/members/role_form_component.html.erb b/app/components/members/role_form_component.html.erb index 45d06ed41219..f07b488ed48c 100644 --- a/app/components/members/role_form_component.html.erb +++ b/app/components/members/role_form_component.html.erb @@ -48,7 +48,7 @@ See COPYRIGHT and LICENSE files for more details.

    - <%= f.submit t(:button_change), class: "button -highlight -small" %> + <%= f.submit t(:button_change), class: "button -primary -small" %> <%= link_to t(:button_cancel), '#', data: { diff --git a/app/views/account/_footer.html.erb b/app/views/account/_footer.html.erb index bd0de28b4d1f..5e9581443443 100644 --- a/app/views/account/_footer.html.erb +++ b/app/views/account/_footer.html.erb @@ -3,6 +3,6 @@ <% if footer = registration_footer %> <%= footer %> <% end %> - <%= styled_button_tag t(:button_create), class: 'button_no-margin -highlight -with-icon icon-checkmark spot-action-bar--action' %> + <%= styled_button_tag t(:button_create), class: 'button_no-margin -primary -with-icon icon-checkmark spot-action-bar--action' %> diff --git a/app/views/account/_login.html.erb b/app/views/account/_login.html.erb index 84f726cba1bd..112f59476a08 100644 --- a/app/views/account/_login.html.erb +++ b/app/views/account/_login.html.erb @@ -77,7 +77,7 @@ See COPYRIGHT and LICENSE files for more details.   + value="<%=t(:button_login)%>" class="button -primary" tabindex="1" /> diff --git a/app/views/account/_password_login_form.html.erb b/app/views/account/_password_login_form.html.erb index ee1ef844a6b8..1fcf9d217bd2 100644 --- a/app/views/account/_password_login_form.html.erb +++ b/app/views/account/_password_login_form.html.erb @@ -57,7 +57,7 @@ See COPYRIGHT and LICENSE files for more details. <%= submit_tag t(:button_login), name: :login, - class: 'button -highlight', + class: 'button -primary', data: { disable_with: t(:label_loading) } %>

    @@ -78,7 +78,7 @@ See COPYRIGHT and LICENSE files for more details.
    + data-modal-class-name="registration-modal -primary"> <% @user ||= User.new %> <%= render partial: '/account/register' %>
    diff --git a/app/views/account/consent.html.erb b/app/views/account/consent.html.erb index 6a5548fa8825..854a18edaae8 100644 --- a/app/views/account/consent.html.erb +++ b/app/views/account/consent.html.erb @@ -36,7 +36,7 @@ See COPYRIGHT and LICENSE files for more details. <%= form_tag(account_confirm_consent_path, method: :post, class: "form -wide-labels") do %> <%= render partial: 'user_consent_check' %>
    - <%= link_to t(:button_decline), account_decline_consent_path, class: 'button' %> diff --git a/app/views/account/lost_password.html.erb b/app/views/account/lost_password.html.erb index c73cf0736a56..876a98d21c08 100644 --- a/app/views/account/lost_password.html.erb +++ b/app/views/account/lost_password.html.erb @@ -36,6 +36,6 @@ See COPYRIGHT and LICENSE files for more details. <%= styled_text_field_tag 'mail', nil, size: 40, container_class: '-middle' %>
    - <%= styled_button_tag t(:button_submit), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_submit), class: '-primary -with-icon icon-checkmark' %> <% end %> diff --git a/app/views/account/password_recovery.html.erb b/app/views/account/password_recovery.html.erb index 2dabec0e329f..e2caa6d63f9a 100644 --- a/app/views/account/password_recovery.html.erb +++ b/app/views/account/password_recovery.html.erb @@ -48,5 +48,5 @@ See COPYRIGHT and LICENSE files for more details. -

    <%= styled_button_tag t(:button_save), class: '-highlight -with-icon icon-checkmark' %>

    +

    <%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %>

    <% end %> diff --git a/app/views/account/register.html.erb b/app/views/account/register.html.erb index 4e570b8f8e81..f124715ef1af 100644 --- a/app/views/account/register.html.erb +++ b/app/views/account/register.html.erb @@ -29,7 +29,7 @@ See COPYRIGHT and LICENSE files for more details.
    + data-modal-class-name="registration-modal -primary"> <% @user ||= User.new %> <%= render partial: '/account/register' %>
    diff --git a/app/views/activities/menu.html.erb b/app/views/activities/menu.html.erb index 1da1d1d78efb..7d53b57a0a96 100644 --- a/app/views/activities/menu.html.erb +++ b/app/views/activities/menu.html.erb @@ -27,7 +27,7 @@ <%= hidden_field_tag('user_id', params[:user_id]) if params[:user_id].present? %> <%= hidden_field_tag('from', params[:from]) if params[:from].present? %>

    <%= submit_tag t(:button_apply), - class: 'button -small -highlight', + class: 'button -small -primary', name: nil %>

    <% end %> diff --git a/app/views/admin/backups/reset_token.html.erb b/app/views/admin/backups/reset_token.html.erb index 2abc3be990af..91b8977b3af8 100644 --- a/app/views/admin/backups/reset_token.html.erb +++ b/app/views/admin/backups/reset_token.html.erb @@ -69,7 +69,7 @@ See COPYRIGHT and LICENSE files for more details.

    - <%= styled_button_tag '', class: '-highlight', disabled: true do + <%= styled_button_tag '', class: '-primary', disabled: true do concat content_tag :i, '', class: "button--icon icon-#{icon}" concat content_tag :span, t("backup.reset_token.action_#{action}"), class: 'button--text' end %> diff --git a/app/views/admin/backups/show.html.erb b/app/views/admin/backups/show.html.erb index 071e15aea84d..c17f8d8a0ffe 100644 --- a/app/views/admin/backups/show.html.erb +++ b/app/views/admin/backups/show.html.erb @@ -36,7 +36,7 @@ See COPYRIGHT and LICENSE files for more details. <%= link_to( { action: 'reset_token' }, - class: 'button -alt-highlight', + class: 'button -primary', aria: {label: label}, title: label ) do @@ -52,7 +52,7 @@ See COPYRIGHT and LICENSE files for more details. link_to( { action: 'delete_token' }, method: :post, - class: 'button -alt-highlight', + class: 'button -primary', aria: {label: label}, title: label ) do diff --git a/app/views/admin/settings/aggregation_settings/show.html.erb b/app/views/admin/settings/aggregation_settings/show.html.erb index dbd45c84e3f4..2e7fc0b2b362 100644 --- a/app/views/admin/settings/aggregation_settings/show.html.erb +++ b/app/views/admin/settings/aggregation_settings/show.html.erb @@ -47,5 +47,5 @@ See COPYRIGHT and LICENSE files for more details.
    - <%= styled_button_tag t(:button_save), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %> <% end %> diff --git a/app/views/admin/settings/api_settings/show.html.erb b/app/views/admin/settings/api_settings/show.html.erb index c2b2a97efe50..046c3dd5cc31 100644 --- a/app/views/admin/settings/api_settings/show.html.erb +++ b/app/views/admin/settings/api_settings/show.html.erb @@ -67,5 +67,5 @@ See COPYRIGHT and LICENSE files for more details. - <%= styled_button_tag t(:button_save), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %> <% end %> diff --git a/app/views/admin/settings/attachments_settings/show.html.erb b/app/views/admin/settings/attachments_settings/show.html.erb index d4b4570fc11f..2b4cac263e6f 100644 --- a/app/views/admin/settings/attachments_settings/show.html.erb +++ b/app/views/admin/settings/attachments_settings/show.html.erb @@ -46,5 +46,5 @@ See COPYRIGHT and LICENSE files for more details. - <%= styled_button_tag t(:button_save), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %> <% end %> diff --git a/app/views/admin/settings/authentication_settings/show.html.erb b/app/views/admin/settings/authentication_settings/show.html.erb index a64f210f8f10..afe95a411bea 100644 --- a/app/views/admin/settings/authentication_settings/show.html.erb +++ b/app/views/admin/settings/authentication_settings/show.html.erb @@ -132,5 +132,5 @@ See COPYRIGHT and LICENSE files for more details. <%= link_to t(:label_ldap_authentication), {controller: '/ldap_auth_sources', action: 'index'}, class: 'icon icon-server-key' %> <% end %> - <%= styled_button_tag t(:button_save), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %> <% end %> diff --git a/app/views/admin/settings/date_format_settings/show.html.erb b/app/views/admin/settings/date_format_settings/show.html.erb index 9f3e79b44e42..f4be58a351c4 100644 --- a/app/views/admin/settings/date_format_settings/show.html.erb +++ b/app/views/admin/settings/date_format_settings/show.html.erb @@ -64,5 +64,5 @@ See COPYRIGHT and LICENSE files for more details. - <%= styled_button_tag t(:button_save), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %> <% end %> diff --git a/app/views/admin/settings/experimental_settings/show.html.erb b/app/views/admin/settings/experimental_settings/show.html.erb index 4ce41f32a1ef..99fb53c6018f 100644 --- a/app/views/admin/settings/experimental_settings/show.html.erb +++ b/app/views/admin/settings/experimental_settings/show.html.erb @@ -48,7 +48,7 @@ See COPYRIGHT and LICENSE files for more details. <%= styled_button_tag t(:button_save), - class: '-highlight -with-icon icon-checkmark', + class: '-primary -with-icon icon-checkmark', data: { confirm: t("settings.experimental.save_confirmation") } %> diff --git a/app/views/admin/settings/general_settings/show.html.erb b/app/views/admin/settings/general_settings/show.html.erb index 0c0aac2d1f51..9c5bd2ca856b 100644 --- a/app/views/admin/settings/general_settings/show.html.erb +++ b/app/views/admin/settings/general_settings/show.html.erb @@ -83,5 +83,5 @@ See COPYRIGHT and LICENSE files for more details.
    <%= setting_check_box :welcome_on_homescreen %>
    - <%= styled_button_tag t(:button_save), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %> <% end %> diff --git a/app/views/admin/settings/icalendar_settings/show.html.erb b/app/views/admin/settings/icalendar_settings/show.html.erb index 518f84d4193f..238c654a051a 100644 --- a/app/views/admin/settings/icalendar_settings/show.html.erb +++ b/app/views/admin/settings/icalendar_settings/show.html.erb @@ -44,5 +44,5 @@ See COPYRIGHT and LICENSE files for more details. - <%= styled_button_tag t(:button_save), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %> <% end %> diff --git a/app/views/admin/settings/incoming_mails_settings/show.html.erb b/app/views/admin/settings/incoming_mails_settings/show.html.erb index 779cb84a904c..690ea3f3a510 100644 --- a/app/views/admin/settings/incoming_mails_settings/show.html.erb +++ b/app/views/admin/settings/incoming_mails_settings/show.html.erb @@ -47,5 +47,5 @@ See COPYRIGHT and LICENSE files for more details. - <%= styled_button_tag t(:button_save), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %> <% end %> diff --git a/app/views/admin/settings/languages_settings/show.html.erb b/app/views/admin/settings/languages_settings/show.html.erb index 9646f9f00f63..5d7f1de8e979 100644 --- a/app/views/admin/settings/languages_settings/show.html.erb +++ b/app/views/admin/settings/languages_settings/show.html.erb @@ -38,7 +38,7 @@ See COPYRIGHT and LICENSE files for more details. <%= styled_button_tag t(:button_save), - class: '-highlight -with-icon icon-checkmark', + class: '-primary -with-icon icon-checkmark', disabled: !Setting.available_languages_writable? %> <% end %> diff --git a/app/views/admin/settings/mail_notifications_settings/show.html.erb b/app/views/admin/settings/mail_notifications_settings/show.html.erb index d7851ff20687..ecf4e2ad6afe 100644 --- a/app/views/admin/settings/mail_notifications_settings/show.html.erb +++ b/app/views/admin/settings/mail_notifications_settings/show.html.erb @@ -85,7 +85,7 @@ See COPYRIGHT and LICENSE files for more details. <% end unless OpenProject::Configuration['email_delivery_configuration'] == 'legacy' %> - <%= styled_button_tag t(:button_save), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %> <% if @deliveries %>
    diff --git a/app/views/admin/settings/projects_settings/show.html.erb b/app/views/admin/settings/projects_settings/show.html.erb index 7aa2f0dbd842..b81e0a93a2dd 100644 --- a/app/views/admin/settings/projects_settings/show.html.erb +++ b/app/views/admin/settings/projects_settings/show.html.erb @@ -100,5 +100,5 @@ See COPYRIGHT and LICENSE files for more details. - <%= styled_button_tag t(:button_save), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %> <% end %> diff --git a/app/views/admin/settings/repositories_settings/show.html.erb b/app/views/admin/settings/repositories_settings/show.html.erb index b6c6cdf0ef76..ae0b5f907479 100644 --- a/app/views/admin/settings/repositories_settings/show.html.erb +++ b/app/views/admin/settings/repositories_settings/show.html.erb @@ -136,5 +136,5 @@ See COPYRIGHT and LICENSE files for more details. disabled: !Setting.commit_logtime_enabled?, container_class: '-middle' %>
    - <%= styled_button_tag t(:button_save), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %> <% end %> diff --git a/app/views/admin/settings/show_plugin.html.erb b/app/views/admin/settings/show_plugin.html.erb index c1bc59753092..a71d7bb630f8 100644 --- a/app/views/admin/settings/show_plugin.html.erb +++ b/app/views/admin/settings/show_plugin.html.erb @@ -30,6 +30,6 @@ See COPYRIGHT and LICENSE files for more details.
    <%= styled_form_tag({controller: '/admin/settings', action: 'update_plugin' }) do %> <%= render partial: @partial, locals: {settings: @settings}%> - <%= styled_submit_tag t(:button_apply), class: '-highlight' %> + <%= styled_submit_tag t(:button_apply), class: '-primary' %> <% end %>
    diff --git a/app/views/admin/settings/users_settings/show.html.erb b/app/views/admin/settings/users_settings/show.html.erb index cb0faf1d4671..28359cedad8e 100644 --- a/app/views/admin/settings/users_settings/show.html.erb +++ b/app/views/admin/settings/users_settings/show.html.erb @@ -105,5 +105,5 @@ See COPYRIGHT and LICENSE files for more details. - <%= styled_button_tag t(:button_save), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %> <% end %> diff --git a/app/views/admin/settings/virus_scanning_settings/show.html.erb b/app/views/admin/settings/virus_scanning_settings/show.html.erb index b177363e74ba..15a4fc77c6be 100644 --- a/app/views/admin/settings/virus_scanning_settings/show.html.erb +++ b/app/views/admin/settings/virus_scanning_settings/show.html.erb @@ -65,5 +65,5 @@ See COPYRIGHT and LICENSE files for more details. <%= render partial: 'av_form', locals: { selected: Setting.antivirus_scan_mode } %> - <%= styled_button_tag t(:button_save), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %> <% end %> diff --git a/app/views/admin/settings/work_packages_settings/show.html.erb b/app/views/admin/settings/work_packages_settings/show.html.erb index 6ffc38f88cc2..a0826dff7ea9 100644 --- a/app/views/admin/settings/work_packages_settings/show.html.erb +++ b/app/views/admin/settings/work_packages_settings/show.html.erb @@ -58,7 +58,7 @@ See COPYRIGHT and LICENSE files for more details. } %> <% if EnterpriseToken.allows_to? :conditional_highlighting %> -
    +
    <%= setting_multiselect :work_package_list_default_highlighted_attributes, Query.available_columns(nil).select(&:highlightable).map { |column| [column.caption, column.name.to_s] @@ -92,5 +92,5 @@ See COPYRIGHT and LICENSE files for more details. - <%= styled_button_tag t(:button_save), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %> <% end %> diff --git a/app/views/admin/settings/working_days_settings/show.html.erb b/app/views/admin/settings/working_days_settings/show.html.erb index 3570e95a9366..da9d61f9fc0e 100644 --- a/app/views/admin/settings/working_days_settings/show.html.erb +++ b/app/views/admin/settings/working_days_settings/show.html.erb @@ -76,5 +76,5 @@ See COPYRIGHT and LICENSE files for more details. - <%= styled_button_tag t(:button_apply_changes), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_apply_changes), class: '-primary -with-icon icon-checkmark' %> <% end %> diff --git a/app/views/announcements/edit.html.erb b/app/views/announcements/edit.html.erb index 012037a6637e..4874f6e04709 100644 --- a/app/views/announcements/edit.html.erb +++ b/app/views/announcements/edit.html.erb @@ -22,5 +22,5 @@ <%= f.check_box :active, label: t(:label_active) %>
    - <%= styled_button_tag t(:button_save), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %> <% end %> diff --git a/app/views/attribute_help_texts/edit.html.erb b/app/views/attribute_help_texts/edit.html.erb index e990266c51b7..5569709c0b0e 100644 --- a/app/views/attribute_help_texts/edit.html.erb +++ b/app/views/attribute_help_texts/edit.html.erb @@ -38,5 +38,5 @@ See COPYRIGHT and LICENSE files for more details. html: {id: 'attribute_help_text_form'} do |f| %> <%= render partial: 'form', locals: { f: f, editing: true } %> <%= hidden_field_tag 'attribute_scope', @attribute_help_text.attribute_scope %> - <%= styled_button_tag t(:button_save), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %> <% end %> diff --git a/app/views/attribute_help_texts/index.html.erb b/app/views/attribute_help_texts/index.html.erb index f28ea0396950..4964519968cb 100644 --- a/app/views/attribute_help_texts/index.html.erb +++ b/app/views/attribute_help_texts/index.html.erb @@ -46,7 +46,7 @@ See COPYRIGHT and LICENSE files for more details. <%= toolbar title: t(:'attribute_help_texts.label_plural') do %>
  • <%= link_to new_attribute_help_text_path(name: selected_tab(tabs)[:name]), - { class: 'attribute-help-texts--create-button button -alt-highlight', + { class: 'attribute-help-texts--create-button button -primary', aria: {label: t(:'attribute_help_texts.add_new')}, title: t(:'attribute_help_texts.add_new')} do %> <%= op_icon('button--icon icon-add') %> diff --git a/app/views/attribute_help_texts/new.html.erb b/app/views/attribute_help_texts/new.html.erb index 03a17460fb43..32e6d3cf9056 100644 --- a/app/views/attribute_help_texts/new.html.erb +++ b/app/views/attribute_help_texts/new.html.erb @@ -38,5 +38,5 @@ See COPYRIGHT and LICENSE files for more details. html: {id: 'attribute_help_text_form'} do |f| %> <%= render partial: 'form', locals: { f: f } %> <%= f.hidden_field :type, value: @attribute_help_text.type %> - <%= styled_button_tag t(:button_save), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %> <% end %> diff --git a/app/views/categories/destroy.html.erb b/app/views/categories/destroy.html.erb index 62ba944e437d..3c95064abc9b 100644 --- a/app/views/categories/destroy.html.erb +++ b/app/views/categories/destroy.html.erb @@ -48,6 +48,6 @@ See COPYRIGHT and LICENSE files for more details.
    • <% end %> - <%= submit_tag t(:button_apply), class: 'button -highlight' %> + <%= submit_tag t(:button_apply), class: 'button -primary' %> <%= link_to t(:button_cancel), project_settings_categories_path(@project), class: 'button' %> <% end %> diff --git a/app/views/categories/edit.html.erb b/app/views/categories/edit.html.erb index ad6e532836a0..6cbc6aff4986 100644 --- a/app/views/categories/edit.html.erb +++ b/app/views/categories/edit.html.erb @@ -29,5 +29,5 @@ See COPYRIGHT and LICENSE files for more details. <%= toolbar title: Category.model_name.human %> <%= labelled_tabular_form_for @category, as: :category do |f| %> <%= render partial: 'categories/form', locals: { f: f } %> - <%= f.button t(:button_save), class: 'button -highlight -with-icon icon-checkmark' %> + <%= f.button t(:button_save), class: 'button -primary -with-icon icon-checkmark' %> <% end %> diff --git a/app/views/categories/new.html.erb b/app/views/categories/new.html.erb index aaa02e7a9f07..683d5d4f82df 100644 --- a/app/views/categories/new.html.erb +++ b/app/views/categories/new.html.erb @@ -29,5 +29,5 @@ See COPYRIGHT and LICENSE files for more details. <%= toolbar title: t(:label_work_package_category_new) %> <%= labelled_tabular_form_for [@project, @category], as: :category do |f| %> <%= render partial: 'categories/form', locals: { f: f } %> - <%= f.button t(:button_create), class: 'button -highlight -with-icon icon-checkmark' %> + <%= f.button t(:button_create), class: 'button -primary -with-icon icon-checkmark' %> <% end %> diff --git a/app/views/colors/_form.html.erb b/app/views/colors/_form.html.erb index 3d4cb7ae788b..182c71e26975 100644 --- a/app/views/colors/_form.html.erb +++ b/app/views/colors/_form.html.erb @@ -64,5 +64,5 @@ See COPYRIGHT and LICENSE files for more details. -<%= styled_button_tag t(:button_save), class: '-highlight -with-icon icon-checkmark' %> +<%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %> <%= link_to t(:button_cancel), colors_path, class: 'button -with-icon icon-cancel' %> diff --git a/app/views/colors/confirm_destroy.html.erb b/app/views/colors/confirm_destroy.html.erb index e66e15b680b1..d61560857c9b 100644 --- a/app/views/colors/confirm_destroy.html.erb +++ b/app/views/colors/confirm_destroy.html.erb @@ -47,6 +47,6 @@ See COPYRIGHT and LICENSE files for more details. - <%= submit_tag t(:button_delete), class: 'button -highlight' %> + <%= submit_tag t(:button_delete), class: 'button -primary' %> <%= link_to t(:button_cancel), colors_path, class: 'button' %> <% end %> diff --git a/app/views/colors/index.html.erb b/app/views/colors/index.html.erb index 06dee2929b6b..9ab599846318 100644 --- a/app/views/colors/index.html.erb +++ b/app/views/colors/index.html.erb @@ -32,7 +32,7 @@ See COPYRIGHT and LICENSE files for more details. <%= toolbar title: t(:label_color_plural) do %>
  • <%= link_to new_color_path, - { class: 'button -alt-highlight', + { class: 'button -primary', aria: {label: t('.label_new_color')}, title: t('.label_new_color')} do %> <%= op_icon('button--icon icon-add') %> diff --git a/app/views/common/upsale.html.erb b/app/views/common/upsale.html.erb index 956dae8ecbf6..503f19ece9dd 100644 --- a/app/views/common/upsale.html.erb +++ b/app/views/common/upsale.html.erb @@ -49,7 +49,7 @@ <% end %> <%= link_to(OpenProject::Static::Links.links[:pricing][:href], - { class: 'button -highlight', + { class: 'button -primary', aria: {label: t('admin.enterprise.buttons.upgrade')}, target: '_blank', title: t('admin.enterprise.buttons.upgrade')}) do %> diff --git a/app/views/custom_actions/edit.html.erb b/app/views/custom_actions/edit.html.erb index cc30bcac8f8b..8497d6473bbd 100644 --- a/app/views/custom_actions/edit.html.erb +++ b/app/views/custom_actions/edit.html.erb @@ -36,5 +36,5 @@ See COPYRIGHT and LICENSE files for more details. <%= labelled_tabular_form_for @custom_action do |f| %> <%= render partial: 'form', locals: { f: f } %> - <%= styled_button_tag t(:button_save), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %> <% end %> diff --git a/app/views/custom_actions/index.html.erb b/app/views/custom_actions/index.html.erb index 102406b6f627..198a980abfd6 100644 --- a/app/views/custom_actions/index.html.erb +++ b/app/views/custom_actions/index.html.erb @@ -2,7 +2,7 @@ <%= toolbar title: t('custom_actions.plural') do %>
  • <%= link_to new_custom_action_path, - { class: 'button -alt-highlight', + { class: 'button -primary', aria: { label: t('custom_actions.new') }, title: t('custom_actions.new') } do %> <%= op_icon('button--icon icon-add') %> diff --git a/app/views/custom_actions/new.html.erb b/app/views/custom_actions/new.html.erb index a0111056ccc4..a836500870ea 100644 --- a/app/views/custom_actions/new.html.erb +++ b/app/views/custom_actions/new.html.erb @@ -36,5 +36,5 @@ See COPYRIGHT and LICENSE files for more details. <%= labelled_tabular_form_for @custom_action do |f| %> <%= render partial: 'form', locals: { f: f } %> - <%= styled_button_tag t(:button_create), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_create), class: '-primary -with-icon icon-checkmark' %> <% end %> diff --git a/app/views/custom_fields/edit.html.erb b/app/views/custom_fields/edit.html.erb index 563354707b13..9281171675d5 100644 --- a/app/views/custom_fields/edit.html.erb +++ b/app/views/custom_fields/edit.html.erb @@ -44,5 +44,5 @@ See COPYRIGHT and LICENSE files for more details. url: custom_field_path(@custom_field), html: {method: :put, id: 'custom_field_form'} do |f| %> <%= render partial: 'form', locals: { f: f } %> - <%= styled_button_tag t(:button_save), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %> <% end %> diff --git a/app/views/custom_fields/index.html.erb b/app/views/custom_fields/index.html.erb index 0466c66b52ab..8b87fbce3438 100644 --- a/app/views/custom_fields/index.html.erb +++ b/app/views/custom_fields/index.html.erb @@ -29,7 +29,7 @@ See COPYRIGHT and LICENSE files for more details. <%= toolbar title: t(:label_custom_field_plural) do %>
  • <%= link_to new_custom_field_path(type: selected_tab(custom_fields_tabs)[:name]), - { class: 'button -alt-highlight', + { class: 'button -primary', aria: {label: t(:label_custom_field_new)}, title: t(:label_custom_field_new)} do %> <%= op_icon('button--icon icon-add') %> diff --git a/app/views/custom_fields/new.html.erb b/app/views/custom_fields/new.html.erb index 7bfb0bae8230..38820445911d 100644 --- a/app/views/custom_fields/new.html.erb +++ b/app/views/custom_fields/new.html.erb @@ -43,5 +43,5 @@ See COPYRIGHT and LICENSE files for more details. html: {id: 'custom_field_form', class: "-wide-labels"} do |f| %> <%= render partial: 'form', locals: { f: f } %> <%= hidden_field_tag 'type', @custom_field.type %> - <%= styled_button_tag t(:button_save), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %> <% end %> diff --git a/app/views/custom_styles/_inline_css.erb b/app/views/custom_styles/_inline_css.erb index 4e2ca2f2af2f..7ab9ebb63089 100644 --- a/app/views/custom_styles/_inline_css.erb +++ b/app/views/custom_styles/_inline_css.erb @@ -37,16 +37,14 @@ See COPYRIGHT and LICENSE files for more details. <% if design_color.variable == "main-menu-border-color" %> --main-menu-border-width: 1px; <% end %> - <% if design_color.variable == "alternative-color" %> - --button--alt-highlight-background-hover-color: <%= design_color.darken 0.18 %>; + <% if design_color.variable == "primary-button-color" %> + --primary-button-color--major1: <%= design_color.darken 0.18 %>; <% end %> - <% if design_color.variable == "primary-color" %> - --primary-color--minor1: <%= design_color.lighten 0.3 %>; - --primary-color--minor2: <%= design_color.lighten 0.6 %>; - --primary-color--minor3: <%= design_color.lighten 0.8 %>; - --primary-color--major1: <%= design_color.darken 0.2 %>; - --primary-color--major2: <%= design_color.darken 0.4 %>; - --primary-color--major3: <%= design_color.darken 0.6 %>; + <% if design_color.variable == "accent-color" %> + --accent-color--major1: <%= design_color.darken 0.2 %>; + --accent-color--major2: <%= design_color.darken 0.4 %>; + --accent-color--minor1: <%= design_color.lighten 0.8 %>; + --accent-color--minor2: <%= design_color.lighten 0.6 %>; <% end %> <% end %> } diff --git a/app/views/custom_styles/_primer_color_mapping.erb b/app/views/custom_styles/_primer_color_mapping.erb index 0286ded552bf..424b9edb4199 100644 --- a/app/views/custom_styles/_primer_color_mapping.erb +++ b/app/views/custom_styles/_primer_color_mapping.erb @@ -8,9 +8,10 @@ /* Override Primer variable to ensure compatibility with currently configured design outside of high contrast mode */ [data-color-mode]:not([data-light-theme=light_high_contrast]) { - --color-accent-fg: var(--content-link-color) !important; - --button-primary-bgColor-rest: var(--button--alt-highlight-background-color); !important; - --button-primary-bgColor-hover: var(--button--alt-highlight-background-hover-color) !important; + --color-accent-fg: var(--accent-color) !important; + --control-checked-bgColor-rest: var(--control-checked-color) !important; + --button-primary-bgColor-rest: var(--button--primary-background-color) !important; + --button-primary-bgColor-hover: var(--button--primary-background-hover-color) !important; } [data-light-theme=light_high_contrast]{ --avatar-border-color: var(--color-avatar-border); @@ -41,15 +42,13 @@ --main-menu-fieldset-header-color: var(--color-fg-subtle) !important; --main-menu-border-width: 1px; --button--border-color: var(--color-border-default); - --button--alt-highlight-background-hover-color: var(--color-btn-primary-hover-bg); - --button--alt-highlight-background-color: var(--color-btn-primary-bg); + --button--primary-background-hover-color: var(--color-btn-primary-hover-bg); + --button--primary-background-color: var(--color-btn-primary-bg); --button--active-border-color: var(--color-border-default); --button--background-hover-color: var(--color-btn-hover-bg); --button--background-color: var(--color-btn-bg); - --button--highlight-background-color: var(--color-btn-primary-bg); - --button--highlight-background-hover-color: var(--color-btn-primary-hover-bg); - --content-link-color: var(--color-accent-fg); - --alternative-color: var(--color-btn-primary-bg); + --accent-color: var(--color-accent-fg); + --primary-button-color: var(--color-btn-primary-bg); --status-selector-border-color: var(--button--border-color); --link-text-decoration: underline; } diff --git a/app/views/doorkeeper/authorizations/new.html.erb b/app/views/doorkeeper/authorizations/new.html.erb index e8cb1f739c1f..4b9ec3090f7b 100644 --- a/app/views/doorkeeper/authorizations/new.html.erb +++ b/app/views/doorkeeper/authorizations/new.html.erb @@ -34,7 +34,7 @@ <%= hidden_field_tag :scope, @pre_auth.scope %> <%= hidden_field_tag :code_challenge, @pre_auth.code_challenge %> <%= hidden_field_tag :code_challenge_method, @pre_auth.code_challenge_method %> - <%= submit_tag t('oauth.authorization_dialog.authorize'), class: "button -highlight -expand" %> + <%= submit_tag t('oauth.authorization_dialog.authorize'), class: "button -primary -expand" %> <% end %>
    <%= form_tag oauth_authorization_path, method: :delete do %> diff --git a/app/views/enterprises/_form.html.erb b/app/views/enterprises/_form.html.erb index 087ea215e4d3..2da2486690f3 100644 --- a/app/views/enterprises/_form.html.erb +++ b/app/views/enterprises/_form.html.erb @@ -19,7 +19,7 @@ spellcheck: false %>
    - <%= styled_button_tag t(:button_save), id: 'token-submit-button', class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_save), id: 'token-submit-button', class: '-primary -with-icon icon-checkmark' %> <%= link_to t(:button_cancel), { action: :show }, class: 'button -with-icon icon-cancel' %> <% end %> <% end %> diff --git a/app/views/enumerations/destroy.html.erb b/app/views/enumerations/destroy.html.erb index 587b6a1291a3..a7c8958518d7 100644 --- a/app/views/enumerations/destroy.html.erb +++ b/app/views/enumerations/destroy.html.erb @@ -37,7 +37,7 @@ See COPYRIGHT and LICENSE files for more details. - <%= styled_submit_tag t(:button_apply), class: '-highlight' %> + <%= styled_submit_tag t(:button_apply), class: '-primary' %> <%= link_to t(:button_cancel), { controller: '/enumerations', action: 'index' }, class: 'button' %> <% end %> diff --git a/app/views/enumerations/edit.html.erb b/app/views/enumerations/edit.html.erb index 2b23d1887b8e..ade18a3f67b4 100644 --- a/app/views/enumerations/edit.html.erb +++ b/app/views/enumerations/edit.html.erb @@ -34,7 +34,7 @@ See COPYRIGHT and LICENSE files for more details. <%= labelled_tabular_form_for @enumeration do |f| %> <%= render partial: 'form', locals: { f: f } %> - <%= styled_button_tag t(:button_save), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %> <% end %> <%= styled_form_tag(enumeration_path(@enumeration), method: :delete) do %> diff --git a/app/views/enumerations/new.html.erb b/app/views/enumerations/new.html.erb index 324203a1f22e..0f919ce7ee41 100644 --- a/app/views/enumerations/new.html.erb +++ b/app/views/enumerations/new.html.erb @@ -32,5 +32,5 @@ See COPYRIGHT and LICENSE files for more details. <%= breadcrumb_toolbar t(:label_enumeration_new) %> <%= labelled_tabular_form_for @enumeration do |f| %> <%= render partial: 'form', locals: { f: f } %> - <%= styled_button_tag t(:button_create), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_create), class: '-primary -with-icon icon-checkmark' %> <% end %> diff --git a/app/views/forums/edit.html.erb b/app/views/forums/edit.html.erb index 58cdd8a90048..59d724ea6697 100644 --- a/app/views/forums/edit.html.erb +++ b/app/views/forums/edit.html.erb @@ -30,6 +30,6 @@ See COPYRIGHT and LICENSE files for more details. <%= labelled_tabular_form_for [@project, @forum] do |f| %> <%= render partial: 'form', locals: { f: f } %> - <%= f.button t(:button_save), class: 'button -highlight -with-icon icon-checkmark' %> + <%= f.button t(:button_save), class: 'button -primary -with-icon icon-checkmark' %> <%= link_to t(:button_cancel), project_forums_path(@project), class: 'button -with-icon icon-cancel' %> <% end %> diff --git a/app/views/forums/index.html.erb b/app/views/forums/index.html.erb index d3add7f3a478..2f0d761762a5 100644 --- a/app/views/forums/index.html.erb +++ b/app/views/forums/index.html.erb @@ -33,7 +33,7 @@ See COPYRIGHT and LICENSE files for more details. <%= link_to(new_project_forum_path(@project), { aria: { label: t(:label_forum_new) }, title: t(:label_forum_new), - class: 'button -alt-highlight' }) do %> + class: 'button -primary' }) do %> <%= op_icon('button--icon icon-add') %> <%= t('activerecord.models.forum') %> <% end %> diff --git a/app/views/forums/new.html.erb b/app/views/forums/new.html.erb index b46a46476b5f..c17d6bc30a73 100644 --- a/app/views/forums/new.html.erb +++ b/app/views/forums/new.html.erb @@ -31,6 +31,6 @@ See COPYRIGHT and LICENSE files for more details. <%= labelled_tabular_form_for [@project, @forum] do |f| %> <%= render partial: 'form', locals: {f: f} %> - <%= f.button t(:button_create), class: 'button -highlight -with-icon icon-checkmark' %> + <%= f.button t(:button_create), class: 'button -primary -with-icon icon-checkmark' %> <%= link_to t(:button_cancel), project_forums_path(@project), class: 'button -with-icon icon-cancel' %> <% end %> diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb index eed48f95f43e..cc1136287572 100644 --- a/app/views/forums/show.html.erb +++ b/app/views/forums/show.html.erb @@ -38,7 +38,7 @@ See COPYRIGHT and LICENSE files for more details. <%= render partial: 'messages/form', locals: {f: f} %>
    - <%= styled_button_tag t(:button_create), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_create), class: '-primary -with-icon icon-checkmark' %> <%= link_to t(:button_cancel), '', class: 'cancel-add-message-button button -with-icon icon-cancel' %> <% csp_onclick('jQuery("#add-message").hide();', '.cancel-add-message-button') %> <% end %> @@ -50,7 +50,7 @@ See COPYRIGHT and LICENSE files for more details. <% if authorize_for(:messages, :new) %>
  • <%= link_to({controller: '/messages', action: 'new', forum_id: @forum}, - {class: 'add-message-button button -alt-highlight', + {class: 'add-message-button button -primary', aria: {label: t(:label_message_new)}, title: t(:label_message_new)}) do %> <%= op_icon('button--icon icon-add') %> diff --git a/app/views/groups/_general.html.erb b/app/views/groups/_general.html.erb index 597256d4f5cf..06238c28cab2 100644 --- a/app/views/groups/_general.html.erb +++ b/app/views/groups/_general.html.erb @@ -29,5 +29,5 @@ See COPYRIGHT and LICENSE files for more details. <%= labelled_tabular_form_for @group, url: group_path(@group), html: {method: :put}, as: :group do |f| %> <%= render partial: 'form', locals: { f: f } %> - <%= styled_button_tag t(:button_save), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %> <% end %> diff --git a/app/views/groups/_memberships.html.erb b/app/views/groups/_memberships.html.erb index cbb4dd062039..03364ee2adc1 100644 --- a/app/views/groups/_memberships.html.erb +++ b/app/views/groups/_memberships.html.erb @@ -95,7 +95,7 @@ See COPYRIGHT and LICENSE files for more details. <% end %>

    - <%= submit_tag t(:button_change), class: 'button -highlight -small' %> + <%= submit_tag t(:button_change), class: 'button -primary -small' %> <%= link_to_function t(:button_cancel), "jQuery('#member-#{membership.id}-roles').show(); jQuery('#member-#{membership.id}-roles-form').hide();", class: 'button -small' %>

    @@ -146,7 +146,7 @@ See COPYRIGHT and LICENSE files for more details. <%= labeled_check_box_tags 'membership[role_ids][]', roles %> -
    <%= styled_button_tag t(:button_add), class: '-highlight -with-icon icon-checkmark' %>
    +
    <%= styled_button_tag t(:button_add), class: '-primary -with-icon icon-checkmark' %>
    <% end %> <% end %> diff --git a/app/views/groups/_users.html.erb b/app/views/groups/_users.html.erb index 32fd094c0e8b..cb511e6762d4 100644 --- a/app/views/groups/_users.html.erb +++ b/app/views/groups/_users.html.erb @@ -62,7 +62,7 @@ See COPYRIGHT and LICENSE files for more details.
    <%= styled_button_tag t(:button_add), - class: '-highlight -with-icon icon-checkmark' %> + class: '-primary -with-icon icon-checkmark' %>
    <% end %> diff --git a/app/views/groups/index.html.erb b/app/views/groups/index.html.erb index 5a6c29f31355..e0894b0a9918 100644 --- a/app/views/groups/index.html.erb +++ b/app/views/groups/index.html.erb @@ -31,7 +31,7 @@ See COPYRIGHT and LICENSE files for more details. <%= toolbar title: t(:label_group_plural) do %>
  • <%= link_to new_group_path, - { class: 'button -alt-highlight', + { class: 'button -primary', aria: {label: t(:label_group_new)}, title: t(:label_group_new)} do %> <%= op_icon('button--icon icon-add') %> diff --git a/app/views/groups/new.html.erb b/app/views/groups/new.html.erb index b4bbdf816a4c..ef6c1e256e03 100644 --- a/app/views/groups/new.html.erb +++ b/app/views/groups/new.html.erb @@ -33,5 +33,5 @@ See COPYRIGHT and LICENSE files for more details. <%= labelled_tabular_form_for(@group) do |f| %> <%= render partial: 'form', locals: { f: f } %> -
    <%= f.button t(:button_create), class: 'button -highlight -with-icon icon-checkmark' %>
    +
    <%= f.button t(:button_create), class: 'button -primary -with-icon icon-checkmark' %>
    <% end %> diff --git a/app/views/homescreen/blocks/_projects.html.erb b/app/views/homescreen/blocks/_projects.html.erb index 59d6dc83d78e..f8cfc7ebf327 100644 --- a/app/views/homescreen/blocks/_projects.html.erb +++ b/app/views/homescreen/blocks/_projects.html.erb @@ -19,7 +19,7 @@
    <% if User.current.allowed_globally?(:add_project) %> <%= link_to new_project_path, - { class: 'button -alt-highlight', + { class: 'button -primary', aria: {label: t(:label_project_new)}, title: t(:label_project_new)} do %> <%= op_icon('button--icon icon-add') %> diff --git a/app/views/homescreen/blocks/_upsale.html.erb b/app/views/homescreen/blocks/_upsale.html.erb index 826cec5ced76..5acad4a2b83b 100644 --- a/app/views/homescreen/blocks/_upsale.html.erb +++ b/app/views/homescreen/blocks/_upsale.html.erb @@ -30,7 +30,7 @@ <% end %> <%= link_to(OpenProject::Static::Links.links[:pricing][:href], - class: 'button -highlight', + class: 'button -primary', target: '_blank', rel: 'noopener') do %> <%= spot_icon('enterprise-addons') %> @@ -38,6 +38,6 @@ <% end %> <% if current_user.admin? %> - <%= link_to t('js.admin.enterprise.upsale.button_start_trial'), enterprise_path, class: 'button -alt-highlight' %> + <%= link_to t('js.admin.enterprise.upsale.button_start_trial'), enterprise_path, class: 'button -primary' %> <% end %>
    diff --git a/app/views/homescreen/blocks/_users.html.erb b/app/views/homescreen/blocks/_users.html.erb index 26f040708c1e..2bc2b31a58f4 100644 --- a/app/views/homescreen/blocks/_users.html.erb +++ b/app/views/homescreen/blocks/_users.html.erb @@ -15,7 +15,7 @@
    <% if User.current.admin? %> - <%= link_to new_user_path, class: 'button -alt-highlight' do %> + <%= link_to new_user_path, class: 'button -primary' do %> <%= op_icon('button--icon icon-add') %> <%= t(:label_invite_user) %> <% end %> diff --git a/app/views/individual_principals/_memberships.html.erb b/app/views/individual_principals/_memberships.html.erb index e931d16e6180..ae758fff8472 100644 --- a/app/views/individual_principals/_memberships.html.erb +++ b/app/views/individual_principals/_memberships.html.erb @@ -104,7 +104,7 @@ See COPYRIGHT and LICENSE files for more details. <% end %>
    -

    <%= submit_tag t(:button_change), class: 'memberships--edit-submit-button button -highlight -small' %> +

    <%= submit_tag t(:button_change), class: 'memberships--edit-submit-button button -primary -small' %> <%= link_to_function t(:button_cancel), "jQuery('.member-#{membership.id}--edit-toggle-item').toggle();", class: 'button -small' %>

    @@ -164,7 +164,7 @@ See COPYRIGHT and LICENSE files for more details. <%= labeled_check_box_tags 'membership[role_ids][]', roles %> -
    <%= styled_button_tag t(:button_add), class: '-highlight -with-icon icon-checkmark' %>
    +
    <%= styled_button_tag t(:button_add), class: '-primary -with-icon icon-checkmark' %>
    <% end %> <% end %> diff --git a/app/views/ldap_auth_sources/edit.html.erb b/app/views/ldap_auth_sources/edit.html.erb index 2751fdb4cc28..11c9bd88faad 100644 --- a/app/views/ldap_auth_sources/edit.html.erb +++ b/app/views/ldap_auth_sources/edit.html.erb @@ -34,6 +34,6 @@ See COPYRIGHT and LICENSE files for more details. <%= labelled_tabular_form_for @ldap_auth_source do |f| %> <%= render partial: 'form', locals: { f: f } %> <% unless @ldap_auth_source.seeded_from_env? %> - <%= styled_button_tag t(:button_save), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %> <% end %> <% end %> diff --git a/app/views/ldap_auth_sources/index.html.erb b/app/views/ldap_auth_sources/index.html.erb index 6e4495f8bee3..cf2501c8cf5c 100644 --- a/app/views/ldap_auth_sources/index.html.erb +++ b/app/views/ldap_auth_sources/index.html.erb @@ -31,7 +31,7 @@ See COPYRIGHT and LICENSE files for more details. <%= toolbar title: t(:label_ldap_auth_source_plural) do %>
  • <%= link_to({ action: 'new' }, - { class: 'button -alt-highlight', + { class: 'button -primary', aria: {label: t(:label_ldap_auth_source_new)}, title: t(:label_ldap_auth_source_new)}) do %> <%= op_icon('button--icon icon-add') %> diff --git a/app/views/ldap_auth_sources/new.html.erb b/app/views/ldap_auth_sources/new.html.erb index b16c9cb4057e..9440a214ac01 100644 --- a/app/views/ldap_auth_sources/new.html.erb +++ b/app/views/ldap_auth_sources/new.html.erb @@ -33,5 +33,5 @@ See COPYRIGHT and LICENSE files for more details. <%= labelled_tabular_form_for @ldap_auth_source, as: :ldap_auth_source do |f| %> <%= render partial: 'form', locals: { f: f } %> - <%= styled_button_tag t(:button_create), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_create), class: '-primary -with-icon icon-checkmark' %> <% end %> diff --git a/app/views/members/_autocomplete_for_member.html.erb b/app/views/members/_autocomplete_for_member.html.erb index 6152432580a4..7b1dd229b007 100644 --- a/app/views/members/_autocomplete_for_member.html.erb +++ b/app/views/members/_autocomplete_for_member.html.erb @@ -64,6 +64,6 @@ See COPYRIGHT and LICENSE files for more details. <%= styled_button_tag t(:button_add), id: 'member-add-submit', - class: 'button -highlight -with-icon icon-checkmark', + class: 'button -primary -with-icon icon-checkmark', style: roles.any? && (principals.any? && principals.size <= 20) ? "": "display:none" %> <%= link_to I18n.t('button_cancel'), '', class: 'button -with-icon icon-cancel hide-member-form-button', role: 'button' %> diff --git a/app/views/members/_member_form.html.erb b/app/views/members/_member_form.html.erb index 53f64796c646..4831a7138396 100644 --- a/app/views/members/_member_form.html.erb +++ b/app/views/members/_member_form.html.erb @@ -94,7 +94,7 @@ See COPYRIGHT and LICENSE files for more details.
    <%= f.button t(:button_add), - class: 'button -highlight -with-icon icon-checkmark', + class: 'button -primary -with-icon icon-checkmark', id: 'add-member--submit-button' %>
    diff --git a/app/views/messages/edit.html.erb b/app/views/messages/edit.html.erb index b5ceb1997125..887edb8f3190 100644 --- a/app/views/messages/edit.html.erb +++ b/app/views/messages/edit.html.erb @@ -39,7 +39,7 @@ See COPYRIGHT and LICENSE files for more details.
    - <%= f.button t(:button_save), class: 'button -highlight -with-icon icon-checkmark' %> + <%= f.button t(:button_save), class: 'button -primary -with-icon icon-checkmark' %> <%= link_to t(:button_cancel), topic_path(@message), class: 'button -with-icon icon-cancel' %> <% end %>
    diff --git a/app/views/messages/new.html.erb b/app/views/messages/new.html.erb index c28a1623eb8e..c46bfac6ed85 100644 --- a/app/views/messages/new.html.erb +++ b/app/views/messages/new.html.erb @@ -38,7 +38,7 @@ See COPYRIGHT and LICENSE files for more details.
    - <%= f.button t(:button_create), class: 'button -highlight -with-icon icon-checkmark' %> + <%= f.button t(:button_create), class: 'button -primary -with-icon icon-checkmark' %> <%= link_to t(:button_cancel), project_forum_path(@project, @forum), class: 'button -with-icon icon-cancel' %> <% end %> diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb index 1d8957ab75db..885cd475b28f 100644 --- a/app/views/messages/show.html.erb +++ b/app/views/messages/show.html.erb @@ -145,7 +145,7 @@ See COPYRIGHT and LICENSE files for more details.
    - <%= f.button t(:button_submit), class: 'button -highlight -highlight -with-icon icon-checkmark' %> + <%= f.button t(:button_submit), class: 'button -primary -primary -with-icon icon-checkmark' %> <% end %>
    diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb index ab609a78f434..f2b085b28a2b 100644 --- a/app/views/my/account.html.erb +++ b/app/views/my/account.html.erb @@ -73,5 +73,5 @@ See COPYRIGHT and LICENSE files for more details. locals: { form: f, all_fields: true, only_required: false, input_size: '-middle' } %> - <%= styled_button_tag t(:button_save), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %> <% end %> diff --git a/app/views/my/password.html.erb b/app/views/my/password.html.erb index f5c1057d333f..9fd43c65af52 100644 --- a/app/views/my/password.html.erb +++ b/app/views/my/password.html.erb @@ -40,5 +40,5 @@ See COPYRIGHT and LICENSE files for more details. locals: { show_user_name: !!(defined? show_user_name) ? show_user_name : nil, input_size: :middle } %> - <%= styled_button_tag t(:button_save), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %> <% end %> diff --git a/app/views/my/settings.html.erb b/app/views/my/settings.html.erb index b0d30f73ab6a..39563fd12ef7 100644 --- a/app/views/my/settings.html.erb +++ b/app/views/my/settings.html.erb @@ -41,5 +41,5 @@ See COPYRIGHT and LICENSE files for more details. <%= render partial: 'users/preferences', locals: { input_size: :middle } %> <%= call_hook(:view_my_settings, user: @user, form: f) %> - <%= styled_button_tag t(:button_save), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %> <% end %> diff --git a/app/views/news/edit.html.erb b/app/views/news/edit.html.erb index 75333d3ddcc0..2ad405f686ba 100644 --- a/app/views/news/edit.html.erb +++ b/app/views/news/edit.html.erb @@ -33,7 +33,7 @@ See COPYRIGHT and LICENSE files for more details. <%= labelled_tabular_form_for @news, html: { id: 'news-form' } do |f| %> <%= render partial: 'form', locals: { f: f } %>
    - <%= styled_button_tag t(:button_save), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %> <%= link_to t(:button_cancel), news_path(@news), class: 'button -with-icon icon-cancel' %> <% end %>
    diff --git a/app/views/news/index.html.erb b/app/views/news/index.html.erb index 0b6000e1374e..a0ddb1dfc774 100644 --- a/app/views/news/index.html.erb +++ b/app/views/news/index.html.erb @@ -35,7 +35,7 @@ See COPYRIGHT and LICENSE files for more details. <% if managable %>
  • <%= link_to new_project_news_path(@project), - { class: 'button -alt-highlight', + { class: 'button -primary', id: 'new_news_link', aria: {label: t(:label_news_new)}, title: t(:label_news_new)} do %> diff --git a/app/views/news/new.html.erb b/app/views/news/new.html.erb index 4153de7dd07c..a9e0ee02f289 100644 --- a/app/views/news/new.html.erb +++ b/app/views/news/new.html.erb @@ -33,7 +33,7 @@ See COPYRIGHT and LICENSE files for more details. <%= labelled_tabular_form_for [@project, @news], html: { id: 'news-form' } do |f| %> <%= render partial: 'news/form', locals: { f: f } %> - <%= styled_button_tag t(:button_create), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_create), class: '-primary -with-icon icon-checkmark' %> <%= link_to t(:button_cancel), project_news_index_path(@project), class: 'button -with-icon icon-cancel' %> <% end %>
    diff --git a/app/views/news/show.html.erb b/app/views/news/show.html.erb index 4514b93ca7e8..dda0aad9e40f 100644 --- a/app/views/news/show.html.erb +++ b/app/views/news/show.html.erb @@ -59,7 +59,7 @@ See COPYRIGHT and LICENSE files for more details. @@ -103,7 +103,7 @@ See COPYRIGHT and LICENSE files for more details. <%= wikitoolbar_for 'comment_comments', preview_context: preview_context(@news) %>

    - <%= submit_tag t(:button_add_comment), class: 'button -highlight' %> + <%= submit_tag t(:button_add_comment), class: 'button -primary' %>

    <% end %> <% end %> diff --git a/app/views/oauth/applications/edit.html.erb b/app/views/oauth/applications/edit.html.erb index c56fe48382e8..db35803c9adb 100644 --- a/app/views/oauth/applications/edit.html.erb +++ b/app/views/oauth/applications/edit.html.erb @@ -39,6 +39,6 @@ See COPYRIGHT and LICENSE files for more details. <%= render partial: 'form', locals: { f: f } %>

    - <%= styled_button_tag t(:button_save), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %>

    <% end %> diff --git a/app/views/oauth/applications/index.html.erb b/app/views/oauth/applications/index.html.erb index 47cb78921c1f..20f3c4c732c6 100644 --- a/app/views/oauth/applications/index.html.erb +++ b/app/views/oauth/applications/index.html.erb @@ -31,7 +31,7 @@ See COPYRIGHT and LICENSE files for more details. <%= toolbar title: t('oauth.application.plural'), title_class: 'no-padding-bottom' do %>
  • <%= link_to new_oauth_application_path, - { class: 'button -alt-highlight', + { class: 'button -primary', title: t('oauth.application.new')} do %> <%= op_icon('button--icon icon-add') %> <%= t(:button_add) %> diff --git a/app/views/oauth/applications/new.html.erb b/app/views/oauth/applications/new.html.erb index 1ee51f8ec9ff..c208d363ebcd 100644 --- a/app/views/oauth/applications/new.html.erb +++ b/app/views/oauth/applications/new.html.erb @@ -42,6 +42,6 @@ See COPYRIGHT and LICENSE files for more details. <%= render partial: 'form', locals: { f: f } %>

    - <%= styled_button_tag t(:button_create), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_create), class: '-primary -with-icon icon-checkmark' %>

    <% end %> diff --git a/app/views/onboarding/_configuration_modal.html.erb b/app/views/onboarding/_configuration_modal.html.erb index 5ccd69bb4a5f..fd68e8b055a4 100644 --- a/app/views/onboarding/_configuration_modal.html.erb +++ b/app/views/onboarding/_configuration_modal.html.erb @@ -52,7 +52,7 @@ See COPYRIGHT and LICENSE files for more details. dynamic-content-modal-close-button title=<%= t(:button_close) %> ><%= t(:button_close) %> - <%= styled_button_tag t(:button_save), class: 'button_no-margin -highlight -with-icon icon-checkmark spot-action-bar--action' %> + <%= styled_button_tag t(:button_save), class: 'button_no-margin -primary -with-icon icon-checkmark spot-action-bar--action' %> <% end %> diff --git a/app/views/placeholder_users/_general.html.erb b/app/views/placeholder_users/_general.html.erb index bafa6138d063..2a46d38c7c92 100644 --- a/app/views/placeholder_users/_general.html.erb +++ b/app/views/placeholder_users/_general.html.erb @@ -36,5 +36,5 @@ See COPYRIGHT and LICENSE files for more details. as: :placeholder_user do |f| %> <%= render partial: 'form', locals: { f: f } %> - <%= styled_button_tag t(:button_save), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %> <% end %> diff --git a/app/views/placeholder_users/deletion_info.html.erb b/app/views/placeholder_users/deletion_info.html.erb index f21bd7365b50..bd1ff038554c 100644 --- a/app/views/placeholder_users/deletion_info.html.erb +++ b/app/views/placeholder_users/deletion_info.html.erb @@ -58,7 +58,7 @@ See COPYRIGHT and LICENSE files for more details.

    - <%= styled_button_tag '', class: '-highlight', disabled: true do + <%= styled_button_tag '', class: '-primary', disabled: true do concat content_tag :i, '', class: 'button--icon icon-delete' concat content_tag :span, t(:button_delete), class: 'button--text' end %> diff --git a/app/views/placeholder_users/index.html.erb b/app/views/placeholder_users/index.html.erb index 6e3b83a1cc95..541b8a89ab72 100644 --- a/app/views/placeholder_users/index.html.erb +++ b/app/views/placeholder_users/index.html.erb @@ -34,7 +34,7 @@ See COPYRIGHT and LICENSE files for more details. <%= toolbar title: t(:label_placeholder_user_plural), title_class: 'no-padding-bottom' do %>
  • <%= link_to new_placeholder_user_path, - { class: 'button -alt-highlight', + { class: 'button -primary', aria: { label: t(:label_placeholder_user_new) }, title: t(:label_placeholder_user_new) } do %> <%= op_icon('button--icon icon-add') %> diff --git a/app/views/placeholder_users/new.html.erb b/app/views/placeholder_users/new.html.erb index 8d0a09cd206a..b8f1a4e4dffd 100644 --- a/app/views/placeholder_users/new.html.erb +++ b/app/views/placeholder_users/new.html.erb @@ -38,7 +38,7 @@ See COPYRIGHT and LICENSE files for more details. <%= render partial: 'form', locals: { f: f, placeholder_user: @placeholder_user } %>

    - <%= styled_button_tag t(:button_create), class: '-highlight -with-icon icon-checkmark' %> - <%= styled_button_tag t(:button_create_and_continue), name: 'continue', class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_create), class: '-primary -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_create_and_continue), name: 'continue', class: '-primary -with-icon icon-checkmark' %>

    <% end %> diff --git a/app/views/projects/_toolbar.html.erb b/app/views/projects/_toolbar.html.erb index 49fba78032ef..d31df7c88e3c 100644 --- a/app/views/projects/_toolbar.html.erb +++ b/app/views/projects/_toolbar.html.erb @@ -31,7 +31,7 @@ See COPYRIGHT and LICENSE files for more details. <% if User.current.allowed_in_project?(:add_subprojects, @project) %>
  • <%= link_to new_project_path(parent_id: @project.id), - { class: 'button -alt-highlight', + { class: 'button -primary', aria: {label: t(:label_subproject_new)}, title: t(:label_subproject_new)} do %> <%= op_icon('button--icon icon-add') %> diff --git a/app/views/projects/destroy_info.html.erb b/app/views/projects/destroy_info.html.erb index 4f5191b94d2b..b1b8adbb862d 100644 --- a/app/views/projects/destroy_info.html.erb +++ b/app/views/projects/destroy_info.html.erb @@ -56,7 +56,7 @@ See COPYRIGHT and LICENSE files for more details.

    - <%= styled_button_tag title: t(:button_delete), class: '-highlight', disabled: true do + <%= styled_button_tag title: t(:button_delete), class: '-primary', disabled: true do concat content_tag :i, '', class: 'button--icon icon-delete' concat content_tag :span, t(:button_delete), class: 'button--text' end %> diff --git a/app/views/projects/identifier/show.html.erb b/app/views/projects/identifier/show.html.erb index ff4b7ecabe62..7c59b32a8ec3 100644 --- a/app/views/projects/identifier/show.html.erb +++ b/app/views/projects/identifier/show.html.erb @@ -49,11 +49,11 @@ See COPYRIGHT and LICENSE files for more details.
    <%= f.text_field :identifier %> - <%= f.submit t(:button_update), class: 'button -highlight -with-icon icon-checkmark' %> + <%= f.submit t(:button_update), class: 'button -primary -with-icon icon-checkmark' %> <%= link_to project_settings_general_path(@project), class: 'button' do %> - <%= op_icon('button--icon icon-cancel') %> + <%= op_icon('button--icon icon-cancel') %> <%= t(:button_cancel) %> <% end %> diff --git a/app/views/projects/settings/categories/show.html.erb b/app/views/projects/settings/categories/show.html.erb index 69d2edca9210..be486d0a4c87 100644 --- a/app/views/projects/settings/categories/show.html.erb +++ b/app/views/projects/settings/categories/show.html.erb @@ -33,7 +33,7 @@ See COPYRIGHT and LICENSE files for more details. <%= link_to_if_authorized({ controller: '/categories', action: 'new', project_id: @project }, { aria: { label: t(:label_work_package_category_new) }, title: t(:label_work_package_category_new), - class: 'button -alt-highlight'}) do %> + class: 'button -primary'}) do %> <%= op_icon('icon-add button--icon') %> <%= t('activerecord.models.category') %> <% end %> diff --git a/app/views/projects/settings/custom_fields/show.html.erb b/app/views/projects/settings/custom_fields/show.html.erb index abe34a478c83..6c8e10459d8c 100644 --- a/app/views/projects/settings/custom_fields/show.html.erb +++ b/app/views/projects/settings/custom_fields/show.html.erb @@ -33,7 +33,7 @@ See COPYRIGHT and LICENSE files for more details. <% if current_user.admin? %>
  • <%= link_to new_custom_field_path(type: 'WorkPackageCustomField'), - { class: 'button -alt-highlight', + { class: 'button -primary', aria: {label: t(:label_custom_field_new)}, title: t(:label_custom_field_new)} do %> <%= op_icon('button--icon icon-add') %> @@ -56,7 +56,7 @@ See COPYRIGHT and LICENSE files for more details. } %>
    - <%= form.button t(:button_save), class: 'button -highlight -with-icon icon-checkmark' %> + <%= form.button t(:button_save), class: 'button -primary -with-icon icon-checkmark' %>
    <% end %> <% else %> diff --git a/app/views/projects/settings/modules/show.html.erb b/app/views/projects/settings/modules/show.html.erb index 769130a8dac1..817bb422b0de 100644 --- a/app/views/projects/settings/modules/show.html.erb +++ b/app/views/projects/settings/modules/show.html.erb @@ -39,5 +39,5 @@ See COPYRIGHT and LICENSE files for more details. <%= render partial: "form", locals: { form: form } %> -

    <%= form.button t(:button_save), class: 'button -highlight -with-icon icon-checkmark' %>

    +

    <%= form.button t(:button_save), class: 'button -primary -with-icon icon-checkmark' %>

    <% end %> diff --git a/app/views/projects/settings/repository/_submit.html.erb b/app/views/projects/settings/repository/_submit.html.erb index 8e6d4a114d6a..e7b640c461c3 100644 --- a/app/views/projects/settings/repository/_submit.html.erb +++ b/app/views/projects/settings/repository/_submit.html.erb @@ -1,4 +1,4 @@ - diff --git a/frontend/src/app/core/global_search/input/global-search-input.component.sass b/frontend/src/app/core/global_search/input/global-search-input.component.sass index 8a9c67005320..4aa112685c53 100644 --- a/frontend/src/app/core/global_search/input/global-search-input.component.sass +++ b/frontend/src/app/core/global_search/input/global-search-input.component.sass @@ -126,12 +126,8 @@ $search-input-height: 30px background-color: unset &:last-child border-bottom: none - &.ng-option-marked - color: var(--header-drop-down-item-font-hover-color) &.ng-option-disabled display: none - &.ng-option-selected - color: var(--header-drop-down-item-font-hover-color) &.-markable .ng-option diff --git a/frontend/src/app/core/setup/globals/components/admin/backup.component.html b/frontend/src/app/core/setup/globals/components/admin/backup.component.html index e5e8a99e8c92..669d35fa1816 100644 --- a/frontend/src/app/core/setup/globals/components/admin/backup.component.html +++ b/frontend/src/app/core/setup/globals/components/admin/backup.component.html @@ -66,7 +66,7 @@

    diff --git a/frontend/src/app/features/boards/boards-sidebar/boards-menu.component.html b/frontend/src/app/features/boards/boards-sidebar/boards-menu.component.html index 774abbe5d8e7..9f431caa7df3 100644 --- a/frontend/src/app/features/boards/boards-sidebar/boards-menu.component.html +++ b/frontend/src/app/features/boards/boards-sidebar/boards-menu.component.html @@ -11,7 +11,7 @@
    diff --git a/frontend/src/app/features/enterprise/enterprise-modal/enterprise-trial.modal.html b/frontend/src/app/features/enterprise/enterprise-modal/enterprise-trial.modal.html index 93a7434c7b35..ba1fdac3cad4 100644 --- a/frontend/src/app/features/enterprise/enterprise-modal/enterprise-trial.modal.html +++ b/frontend/src/app/features/enterprise/enterprise-modal/enterprise-trial.modal.html @@ -45,7 +45,7 @@ [attr.title]="text.button_cancel" > diff --git a/frontend/src/app/features/invite-user-modal/project-selection/project-selection.component.html b/frontend/src/app/features/invite-user-modal/project-selection/project-selection.component.html index 7c6392fddd35..c22b84e449e5 100644 --- a/frontend/src/app/features/invite-user-modal/project-selection/project-selection.component.html +++ b/frontend/src/app/features/invite-user-modal/project-selection/project-selection.component.html @@ -73,7 +73,7 @@ > diff --git a/frontend/src/app/features/invite-user-modal/success/success.component.html b/frontend/src/app/features/invite-user-modal/success/success.component.html index 728c90c37167..130243299aff 100644 --- a/frontend/src/app/features/invite-user-modal/success/success.component.html +++ b/frontend/src/app/features/invite-user-modal/success/success.component.html @@ -17,7 +17,7 @@
    diff --git a/frontend/src/app/features/invite-user-modal/summary/summary.component.html b/frontend/src/app/features/invite-user-modal/summary/summary.component.html index f0178d0bcb45..de8aff042040 100644 --- a/frontend/src/app/features/invite-user-modal/summary/summary.component.html +++ b/frontend/src/app/features/invite-user-modal/summary/summary.component.html @@ -49,7 +49,7 @@ >{{ text.cancelButton }}
    diff --git a/frontend/src/app/features/projects/components/new-project/new-project.component.html b/frontend/src/app/features/projects/components/new-project/new-project.component.html index 4667b5356b89..bea81db1c3f1 100644 --- a/frontend/src/app/features/projects/components/new-project/new-project.component.html +++ b/frontend/src/app/features/projects/components/new-project/new-project.component.html @@ -2,7 +2,7 @@ class="op-form" [formGroup]="templateForm" > -
    +
    \ No newline at end of file +> diff --git a/frontend/src/app/features/team-planner/team-planner/planner/team-planner.component.html b/frontend/src/app/features/team-planner/team-planner/planner/team-planner.component.html index cb48a50aa6ff..71dbfb6e4431 100644 --- a/frontend/src/app/features/team-planner/team-planner/planner/team-planner.component.html +++ b/frontend/src/app/features/team-planner/team-planner/planner/team-planner.component.html @@ -132,7 +132,7 @@

    diff --git a/frontend/src/app/features/user-preferences/reminder-settings/page/reminder-settings-page.component.html b/frontend/src/app/features/user-preferences/reminder-settings/page/reminder-settings-page.component.html index 3200af748219..f4cb171acdc3 100644 --- a/frontend/src/app/features/user-preferences/reminder-settings/page/reminder-settings-page.component.html +++ b/frontend/src/app/features/user-preferences/reminder-settings/page/reminder-settings-page.component.html @@ -15,7 +15,7 @@

    diff --git a/frontend/src/app/features/work-packages/components/edit-actions-bar/wp-edit-actions-bar.html b/frontend/src/app/features/work-packages/components/edit-actions-bar/wp-edit-actions-bar.html index 841f76e46fa9..3ab39815bb86 100644 --- a/frontend/src/app/features/work-packages/components/edit-actions-bar/wp-edit-actions-bar.html +++ b/frontend/src/app/features/work-packages/components/edit-actions-bar/wp-edit-actions-bar.html @@ -1,7 +1,7 @@
    diff --git a/frontend/src/app/features/work-packages/components/wp-buttons/wp-create-button/wp-create-button.html b/frontend/src/app/features/work-packages/components/wp-buttons/wp-create-button/wp-create-button.html index 92e9128adee9..032e66fcd211 100644 --- a/frontend/src/app/features/work-packages/components/wp-buttons/wp-create-button/wp-create-button.html +++ b/frontend/src/app/features/work-packages/components/wp-buttons/wp-create-button/wp-create-button.html @@ -1,6 +1,6 @@
    diff --git a/frontend/src/app/shared/components/datepicker/multi-date-picker/multi-date-picker.component.html b/frontend/src/app/shared/components/datepicker/multi-date-picker/multi-date-picker.component.html index 0d9bd508289b..94987fef9375 100644 --- a/frontend/src/app/shared/components/datepicker/multi-date-picker/multi-date-picker.component.html +++ b/frontend/src/app/shared/components/datepicker/multi-date-picker/multi-date-picker.component.html @@ -90,7 +90,7 @@ > diff --git a/frontend/src/app/shared/components/datepicker/styles/datepicker.modal.sass b/frontend/src/app/shared/components/datepicker/styles/datepicker.modal.sass index a87dcd706e26..d7415f67f4e0 100644 --- a/frontend/src/app/shared/components/datepicker/styles/datepicker.modal.sass +++ b/frontend/src/app/shared/components/datepicker/styles/datepicker.modal.sass @@ -42,7 +42,7 @@ // because that would overwrite the focus outline when the input field is focused. // So we make a border 2px wide like the outline, and then reduce margins by 1px so the // size of the element does not change. - border: 2px solid var(--primary-color) + border: 2px solid var(--control-checked-color) margin: -1px &--date-container diff --git a/frontend/src/app/shared/components/datepicker/wp-multi-date-form/wp-multi-date-form.component.html b/frontend/src/app/shared/components/datepicker/wp-multi-date-form/wp-multi-date-form.component.html index 491a504ef80e..90d1fb365405 100644 --- a/frontend/src/app/shared/components/datepicker/wp-multi-date-form/wp-multi-date-form.component.html +++ b/frontend/src/app/shared/components/datepicker/wp-multi-date-form/wp-multi-date-form.component.html @@ -122,7 +122,7 @@ > diff --git a/frontend/src/app/shared/components/datepicker/wp-single-date-form/wp-single-date-form.component.html b/frontend/src/app/shared/components/datepicker/wp-single-date-form/wp-single-date-form.component.html index de5972287bd4..dc89ece75d05 100644 --- a/frontend/src/app/shared/components/datepicker/wp-single-date-form/wp-single-date-form.component.html +++ b/frontend/src/app/shared/components/datepicker/wp-single-date-form/wp-single-date-form.component.html @@ -67,7 +67,7 @@ > diff --git a/frontend/src/app/shared/components/dynamic-forms/components/dynamic-form/dynamic-form.component.html b/frontend/src/app/shared/components/dynamic-forms/components/dynamic-form/dynamic-form.component.html index ae998d61ac01..7cadce036721 100644 --- a/frontend/src/app/shared/components/dynamic-forms/components/dynamic-form/dynamic-form.component.html +++ b/frontend/src/app/shared/components/dynamic-forms/components/dynamic-form/dynamic-form.component.html @@ -16,7 +16,7 @@
    diff --git a/frontend/src/app/shared/components/enterprise-banner/enterprise-banner.component.html b/frontend/src/app/shared/components/enterprise-banner/enterprise-banner.component.html index ef4fb5bacae6..8c1bd9d5d09d 100644 --- a/frontend/src/app/shared/components/enterprise-banner/enterprise-banner.component.html +++ b/frontend/src/app/shared/components/enterprise-banner/enterprise-banner.component.html @@ -36,14 +36,14 @@ [attr.href]="moreInfoLink" class="op-enterprise-banner--info-button" target=”_blank”> - + {{ text.more_info_text }} + class="button -primary"> {{ text.upgrade }} @@ -51,7 +51,7 @@ + class="button -primary"> {{ text.button_trial }} diff --git a/frontend/src/app/shared/components/enterprise-page/enterprise-page.component.html b/frontend/src/app/shared/components/enterprise-page/enterprise-page.component.html index 81e712042936..a048cfbd9c2d 100644 --- a/frontend/src/app/shared/components/enterprise-page/enterprise-page.component.html +++ b/frontend/src/app/shared/components/enterprise-page/enterprise-page.component.html @@ -1,4 +1,4 @@ -

    {{feature_description}}

    @@ -43,10 +43,9 @@

    + class="button -primary"> {{ text.upgrade }}
    - diff --git a/frontend/src/app/shared/components/forms/form.sass b/frontend/src/app/shared/components/forms/form.sass index 0fe2a4e1da8e..0b3632475348 100644 --- a/frontend/src/app/shared/components/forms/form.sass +++ b/frontend/src/app/shared/components/forms/form.sass @@ -20,7 +20,7 @@ > .spot-form-field, > .spot-selector-field, > .op-option-list, - > .op-highlighted-input, + > .op-primaryed-input, > .button &:not(:last-child) margin-bottom: 1rem diff --git a/frontend/src/app/shared/components/forms/highlighted-input.sass b/frontend/src/app/shared/components/forms/highlighted-input.sass index fcd4c090d692..bfc976f06ed5 100644 --- a/frontend/src/app/shared/components/forms/highlighted-input.sass +++ b/frontend/src/app/shared/components/forms/highlighted-input.sass @@ -1,4 +1,4 @@ -.op-highlighted-input +.op-primaryed-input padding: 1rem 1rem 0.5rem 0.75rem display: flex flex-direction: column @@ -9,4 +9,3 @@ &_active border: 1px solid #90cdf4 background: #ebf8ff - diff --git a/frontend/src/app/shared/components/grids/widgets/members/members.component.html b/frontend/src/app/shared/components/grids/widgets/members/members.component.html index 5ed0e202c1aa..d833dabb03e0 100644 --- a/frontend/src/app/shared/components/grids/widgets/members/members.component.html +++ b/frontend/src/app/shared/components/grids/widgets/members/members.component.html @@ -42,7 +42,7 @@
    + class="button -primary"> diff --git a/frontend/src/app/shared/components/grids/widgets/time-entries/current-user/configuration-modal/configuration.modal.html b/frontend/src/app/shared/components/grids/widgets/time-entries/current-user/configuration-modal/configuration.modal.html index b50793139d25..1a2bade53e35 100644 --- a/frontend/src/app/shared/components/grids/widgets/time-entries/current-user/configuration-modal/configuration.modal.html +++ b/frontend/src/app/shared/components/grids/widgets/time-entries/current-user/configuration-modal/configuration.modal.html @@ -25,7 +25,7 @@ (click)="closeMe($event)" > diff --git a/frontend/src/app/shared/components/header-project-select/header-project-select.component.html b/frontend/src/app/shared/components/header-project-select/header-project-select.component.html index 2330836c36a5..b734598fc0fa 100644 --- a/frontend/src/app/shared/components/header-project-select/header-project-select.component.html +++ b/frontend/src/app/shared/components/header-project-select/header-project-select.component.html @@ -79,7 +79,7 @@ diff --git a/frontend/src/app/shared/components/modals/confirm-dialog/confirm-dialog.modal.html b/frontend/src/app/shared/components/modals/confirm-dialog/confirm-dialog.modal.html index f488a5bab19e..094602a4f66c 100644 --- a/frontend/src/app/shared/components/modals/confirm-dialog/confirm-dialog.modal.html +++ b/frontend/src/app/shared/components/modals/confirm-dialog/confirm-dialog.modal.html @@ -57,7 +57,7 @@ type="button" class="button spot-action-bar--action" data-test-selector="confirmation-modal--confirmed" - [ngClass]="dangerHighlighting ? '-danger': '-highlight'" + [ngClass]="dangerHighlighting ? '-danger': '-primary'" (click)="confirmAndClose($event)" > diff --git a/frontend/src/app/shared/components/modals/editor/macro-child-pages-modal/child-pages-macro.modal.html b/frontend/src/app/shared/components/modals/editor/macro-child-pages-modal/child-pages-macro.modal.html index 38a4998df8dc..e3ddd59b6f66 100644 --- a/frontend/src/app/shared/components/modals/editor/macro-child-pages-modal/child-pages-macro.modal.html +++ b/frontend/src/app/shared/components/modals/editor/macro-child-pages-modal/child-pages-macro.modal.html @@ -61,7 +61,7 @@ [textContent]="text.button_cancel" > diff --git a/frontend/src/app/shared/components/modals/editor/macro-code-block-modal/code-block-macro.modal.html b/frontend/src/app/shared/components/modals/editor/macro-code-block-modal/code-block-macro.modal.html index d9358bb30966..c304b20858c8 100644 --- a/frontend/src/app/shared/components/modals/editor/macro-code-block-modal/code-block-macro.modal.html +++ b/frontend/src/app/shared/components/modals/editor/macro-code-block-modal/code-block-macro.modal.html @@ -45,7 +45,7 @@ [textContent]="text.button_cancel" > diff --git a/frontend/src/app/shared/components/modals/editor/macro-wiki-include-page-modal/wiki-include-page-macro.modal.html b/frontend/src/app/shared/components/modals/editor/macro-wiki-include-page-modal/wiki-include-page-macro.modal.html index 44742ececf1a..cbc9f9d3fa1d 100644 --- a/frontend/src/app/shared/components/modals/editor/macro-wiki-include-page-modal/wiki-include-page-macro.modal.html +++ b/frontend/src/app/shared/components/modals/editor/macro-wiki-include-page-modal/wiki-include-page-macro.modal.html @@ -43,7 +43,7 @@ [attr.title]="text.button_cancel" > diff --git a/frontend/src/app/shared/components/modals/get-ical-url-modal/query-get-ical-url.modal.html b/frontend/src/app/shared/components/modals/get-ical-url-modal/query-get-ical-url.modal.html index 30c62237fe1b..4a62a7c8fbc0 100644 --- a/frontend/src/app/shared/components/modals/get-ical-url-modal/query-get-ical-url.modal.html +++ b/frontend/src/app/shared/components/modals/get-ical-url-modal/query-get-ical-url.modal.html @@ -51,7 +51,7 @@ [textContent]="text.button_cancel" (click)="closeMe($event)"> - diff --git a/frontend/src/app/shared/components/modals/share-modal/query-sharing.modal.html b/frontend/src/app/shared/components/modals/share-modal/query-sharing.modal.html index e42113932fc7..bd768f9098a8 100644 --- a/frontend/src/app/shared/components/modals/share-modal/query-sharing.modal.html +++ b/frontend/src/app/shared/components/modals/share-modal/query-sharing.modal.html @@ -21,7 +21,7 @@ [disabled]="isBusy" (click)="closeMe($event)"> - diff --git a/frontend/src/app/shared/components/project-include/project-include.component.html b/frontend/src/app/shared/components/project-include/project-include.component.html index 3a4544ef714e..ba29d1e0eaf7 100644 --- a/frontend/src/app/shared/components/project-include/project-include.component.html +++ b/frontend/src/app/shared/components/project-include/project-include.component.html @@ -98,7 +98,7 @@

    {{ text.title }}

    diff --git a/frontend/src/app/shared/components/storages/file-picker-modal/file-picker-modal.component.html b/frontend/src/app/shared/components/storages/file-picker-modal/file-picker-modal.component.html index c222cf3a048e..81902cc108b2 100644 --- a/frontend/src/app/shared/components/storages/file-picker-modal/file-picker-modal.component.html +++ b/frontend/src/app/shared/components/storages/file-picker-modal/file-picker-modal.component.html @@ -93,7 +93,7 @@ type="button" class="button spot-action-bar--action" data-test-selector="op-files-picker-modal--confirm" - [ngClass]="{ '-highlight': selectedFileCount > 0 }" + [ngClass]="{ '-primary': selectedFileCount > 0 }" [disabled]="selectedFileCount === 0" (click)="createSelectedFileLinks()" > diff --git a/frontend/src/app/shared/components/storages/location-picker-modal/location-picker-modal.component.html b/frontend/src/app/shared/components/storages/location-picker-modal/location-picker-modal.component.html index 37a710221d0a..893be4759a44 100644 --- a/frontend/src/app/shared/components/storages/location-picker-modal/location-picker-modal.component.html +++ b/frontend/src/app/shared/components/storages/location-picker-modal/location-picker-modal.component.html @@ -81,7 +81,7 @@ > diff --git a/frontend/src/app/shared/components/time_entries/shared/modal/base.modal.html b/frontend/src/app/shared/components/time_entries/shared/modal/base.modal.html index 50b919bbc017..90655e678e55 100644 --- a/frontend/src/app/shared/components/time_entries/shared/modal/base.modal.html +++ b/frontend/src/app/shared/components/time_entries/shared/modal/base.modal.html @@ -38,7 +38,7 @@ [attr.title]="text.cancel" > - - - + + +
    -    Create -Click to create +Create +Click to create - - + + diff --git a/lookbook/previews/open_project/deprecated/buttons_preview/highlight.html.erb b/lookbook/previews/open_project/deprecated/buttons_preview/highlight.html.erb index 5e2df80c1b65..4a68fdaa550d 100644 --- a/lookbook/previews/open_project/deprecated/buttons_preview/highlight.html.erb +++ b/lookbook/previews/open_project/deprecated/buttons_preview/highlight.html.erb @@ -1,13 +1,13 @@ - - - - + + +
    -Apply -Click to apply +Apply +Click to apply - - + + diff --git a/lookbook/previews/open_project/deprecated/danger_zone_preview/default.html.erb b/lookbook/previews/open_project/deprecated/danger_zone_preview/default.html.erb index 9970042f8751..793024363246 100644 --- a/lookbook/previews/open_project/deprecated/danger_zone_preview/default.html.erb +++ b/lookbook/previews/open_project/deprecated/danger_zone_preview/default.html.erb @@ -67,7 +67,7 @@

    - + Edit @@ -87,7 +87,7 @@
  • Enum3
    • - + Add diff --git a/lookbook/previews/open_project/deprecated/forms_preview/bordered.html.erb b/lookbook/previews/open_project/deprecated/forms_preview/bordered.html.erb index fa68960d91fb..a50cf37ec2b5 100644 --- a/lookbook/previews/open_project/deprecated/forms_preview/bordered.html.erb +++ b/lookbook/previews/open_project/deprecated/forms_preview/bordered.html.erb @@ -9,6 +9,6 @@
    - + diff --git a/lookbook/previews/open_project/deprecated/forms_preview/bordered_compressed.html.erb b/lookbook/previews/open_project/deprecated/forms_preview/bordered_compressed.html.erb index 389f61e263f9..22c5df438cd4 100644 --- a/lookbook/previews/open_project/deprecated/forms_preview/bordered_compressed.html.erb +++ b/lookbook/previews/open_project/deprecated/forms_preview/bordered_compressed.html.erb @@ -9,6 +9,6 @@
    - + diff --git a/lookbook/previews/open_project/deprecated/forms_preview/field_types.html.erb b/lookbook/previews/open_project/deprecated/forms_preview/field_types.html.erb index 7ed22a8c0d3f..c9509a48183c 100644 --- a/lookbook/previews/open_project/deprecated/forms_preview/field_types.html.erb +++ b/lookbook/previews/open_project/deprecated/forms_preview/field_types.html.erb @@ -240,7 +240,7 @@ Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod
    - +
    diff --git a/lookbook/previews/open_project/deprecated/simple_filters_preview/default.html.erb b/lookbook/previews/open_project/deprecated/simple_filters_preview/default.html.erb index 3adbd5f391c6..e57cdbb1f907 100644 --- a/lookbook/previews/open_project/deprecated/simple_filters_preview/default.html.erb +++ b/lookbook/previews/open_project/deprecated/simple_filters_preview/default.html.erb @@ -29,7 +29,7 @@
  • - Apply + Apply Clear
    • diff --git a/lookbook/previews/open_project/deprecated/simple_filters_preview/with_radio_buttons.html.erb b/lookbook/previews/open_project/deprecated/simple_filters_preview/with_radio_buttons.html.erb index 7f3b5e34966a..fb9c56e32486 100644 --- a/lookbook/previews/open_project/deprecated/simple_filters_preview/with_radio_buttons.html.erb +++ b/lookbook/previews/open_project/deprecated/simple_filters_preview/with_radio_buttons.html.erb @@ -42,7 +42,7 @@
  • - Apply + Apply Clear
    • diff --git a/lookbook/previews/open_project/deprecated/toolbar_component_preview/default.html.erb b/lookbook/previews/open_project/deprecated/toolbar_component_preview/default.html.erb index 635b2c7cb56f..6eb85e9d7fe1 100644 --- a/lookbook/previews/open_project/deprecated/toolbar_component_preview/default.html.erb +++ b/lookbook/previews/open_project/deprecated/toolbar_component_preview/default.html.erb @@ -5,7 +5,7 @@ diff --git a/modules/costs/app/views/projects/settings/time_entry_activities/_activities.html.erb b/modules/costs/app/views/projects/settings/time_entry_activities/_activities.html.erb index ed21f553fe0d..0ea208d5e1ab 100644 --- a/modules/costs/app/views/projects/settings/time_entry_activities/_activities.html.erb +++ b/modules/costs/app/views/projects/settings/time_entry_activities/_activities.html.erb @@ -45,5 +45,5 @@ See COPYRIGHT and LICENSE files for more details. <% end %>
    - <%= styled_button_tag t(:button_save), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %>
    diff --git a/modules/documents/app/views/documents/edit.html.erb b/modules/documents/app/views/documents/edit.html.erb index b1b1dc1f18dc..e655fb9e427f 100644 --- a/modules/documents/app/views/documents/edit.html.erb +++ b/modules/documents/app/views/documents/edit.html.erb @@ -31,5 +31,5 @@ See COPYRIGHT and LICENSE files for more details. <%= labelled_tabular_form_for @document, url: document_path(@document), method: 'PATCH' do |f| -%> <%= render partial: "documents/form", locals: { f: f } %> - <%= styled_button_tag t(:button_save), class: "-highlight -with-icon icon-checkmark" %> + <%= styled_button_tag t(:button_save), class: "-primary -with-icon icon-checkmark" %> <% end %> diff --git a/modules/documents/app/views/documents/index.html.erb b/modules/documents/app/views/documents/index.html.erb index d7542150c4df..f99adea29b2d 100644 --- a/modules/documents/app/views/documents/index.html.erb +++ b/modules/documents/app/views/documents/index.html.erb @@ -31,7 +31,7 @@ See COPYRIGHT and LICENSE files for more details. <% if authorize_for(:documents, :new) %>
  • <%= link_to({:controller => '/documents', :action => 'new', :project_id => @project}, - { class: 'button -alt-highlight', + { class: 'button -primary', aria: {label: t(:label_document_new)}, title: t(:label_document_new)}) do %> <%= op_icon('button--icon icon-add') %> diff --git a/modules/documents/app/views/documents/new.html.erb b/modules/documents/app/views/documents/new.html.erb index 45df1d2214f9..bfc00062e3c5 100644 --- a/modules/documents/app/views/documents/new.html.erb +++ b/modules/documents/app/views/documents/new.html.erb @@ -30,7 +30,5 @@ See COPYRIGHT and LICENSE files for more details. <%= labelled_tabular_form_for @document, url: project_documents_path(@project), html: { multipart: true } do |f| -%> <%= render :partial => 'documents/form', locals: { f: f } %> - <%= styled_button_tag t(:button_create), class: "-highlight -with-icon icon-checkmark" %> + <%= styled_button_tag t(:button_create), class: "-primary -with-icon icon-checkmark" %> <% end %> - - diff --git a/modules/ldap_groups/app/views/ldap_groups/synchronized_filters/destroy_info.html.erb b/modules/ldap_groups/app/views/ldap_groups/synchronized_filters/destroy_info.html.erb index 2690d747eedd..70f764b8694f 100644 --- a/modules/ldap_groups/app/views/ldap_groups/synchronized_filters/destroy_info.html.erb +++ b/modules/ldap_groups/app/views/ldap_groups/synchronized_filters/destroy_info.html.erb @@ -54,7 +54,7 @@
    - <%= styled_button_tag title: t(:button_delete), class: '-highlight', disabled: true do + <%= styled_button_tag title: t(:button_delete), class: '-primary', disabled: true do concat content_tag :i, '', class: 'button--icon icon-delete' concat content_tag :span, t(:button_delete), class: 'button--text' end %> @@ -65,4 +65,3 @@
    <% end %> - diff --git a/modules/ldap_groups/app/views/ldap_groups/synchronized_filters/edit.html.erb b/modules/ldap_groups/app/views/ldap_groups/synchronized_filters/edit.html.erb index 566e8af702c5..44ea00bf8298 100644 --- a/modules/ldap_groups/app/views/ldap_groups/synchronized_filters/edit.html.erb +++ b/modules/ldap_groups/app/views/ldap_groups/synchronized_filters/edit.html.erb @@ -10,8 +10,7 @@ <%= render partial: 'form', locals: { f: f } %>

    - <%= styled_button_tag t(:button_save), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %> <%= link_to t(:button_cancel), { action: :show }, class: 'button -with-icon icon-cancel' %>

    <% end %> - diff --git a/modules/ldap_groups/app/views/ldap_groups/synchronized_filters/new.html.erb b/modules/ldap_groups/app/views/ldap_groups/synchronized_filters/new.html.erb index 4111fbb90e1a..2953cf40fc92 100644 --- a/modules/ldap_groups/app/views/ldap_groups/synchronized_filters/new.html.erb +++ b/modules/ldap_groups/app/views/ldap_groups/synchronized_filters/new.html.erb @@ -10,8 +10,7 @@ <%= render partial: 'form', locals: { f: f } %>

    - <%= styled_button_tag t(:button_create), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_create), class: '-primary -with-icon icon-checkmark' %> <%= link_to t(:button_cancel), ldap_groups_synchronized_groups_path, class: 'button -with-icon icon-cancel' %>

    <% end %> - diff --git a/modules/ldap_groups/app/views/ldap_groups/synchronized_groups/destroy_info.html.erb b/modules/ldap_groups/app/views/ldap_groups/synchronized_groups/destroy_info.html.erb index bf65a30c5705..8c9da393ae5a 100644 --- a/modules/ldap_groups/app/views/ldap_groups/synchronized_groups/destroy_info.html.erb +++ b/modules/ldap_groups/app/views/ldap_groups/synchronized_groups/destroy_info.html.erb @@ -21,7 +21,7 @@

    - <%= styled_button_tag title: t(:button_delete), class: '-highlight', disabled: true do + <%= styled_button_tag title: t(:button_delete), class: '-primary', disabled: true do concat content_tag :i, '', class: 'button--icon icon-delete' concat content_tag :span, t(:button_delete), class: 'button--text' end %> @@ -32,4 +32,3 @@
    <% end %> - diff --git a/modules/ldap_groups/app/views/ldap_groups/synchronized_groups/new.html.erb b/modules/ldap_groups/app/views/ldap_groups/synchronized_groups/new.html.erb index 74ca579a3b94..42cf3962f805 100644 --- a/modules/ldap_groups/app/views/ldap_groups/synchronized_groups/new.html.erb +++ b/modules/ldap_groups/app/views/ldap_groups/synchronized_groups/new.html.erb @@ -56,8 +56,7 @@

    - <%= styled_button_tag t(:button_create), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_create), class: '-primary -with-icon icon-checkmark' %> <%= link_to t(:button_cancel), url_for(action: :index), class: 'button -with-icon icon-cancel' %>

    <% end %> - diff --git a/modules/meeting/app/views/meeting_contents/_form.html.erb b/modules/meeting/app/views/meeting_contents/_form.html.erb index 1ea5a8337a0a..cbeb4cc1d584 100644 --- a/modules/meeting/app/views/meeting_contents/_form.html.erb +++ b/modules/meeting/app/views/meeting_contents/_form.html.erb @@ -48,7 +48,7 @@ See COPYRIGHT and LICENSE files for more details.

    <%= f.text_field :journal_notes, label: :comments %>

    <%= styled_button_tag t(:button_save), - class: '-highlight -with-icon icon-checkmark button--save-agenda', + class: '-primary -with-icon icon-checkmark button--save-agenda', data: { disable_with: I18n.t(:label_loading) } %> <%= link_to t(:button_cancel), "#", diff --git a/modules/meeting/app/views/meeting_contents/history.html.erb b/modules/meeting/app/views/meeting_contents/history.html.erb index 87ec5a962576..fc3d44e919bd 100644 --- a/modules/meeting/app/views/meeting_contents/history.html.erb +++ b/modules/meeting/app/views/meeting_contents/history.html.erb @@ -137,6 +137,6 @@ See COPYRIGHT and LICENSE files for more details. -<%= styled_button_tag t(:label_view_diff), class: '-small -highlight' if show_diff %> +<%= styled_button_tag t(:label_view_diff), class: '-small -primary' if show_diff %> <%= pagination_links_full @content_versions %> <% end %> diff --git a/modules/meeting/app/views/meetings/_menu_query_select.html.erb b/modules/meeting/app/views/meetings/_menu_query_select.html.erb index 24d2d6afb613..812a78d211fc 100644 --- a/modules/meeting/app/views/meetings/_menu_query_select.html.erb +++ b/modules/meeting/app/views/meetings/_menu_query_select.html.erb @@ -68,7 +68,7 @@ See COPYRIGHT and LICENSE files for more details. <% if (@project && User.current.allowed_in_project?(:create_meetings, @project)) || (@project.nil? && User.current.allowed_in_any_project?(:create_meetings)) %> <%= button_to polymorphic_path([:new, @project, :meeting]), { method: :get, - class: 'button -alt-highlight -expand', + class: 'button -primary -expand', aria: { label: t(:label_meeting_new) }, title: t(:label_meeting_new) } do %> <%= spot_icon('add') %> diff --git a/modules/meeting/app/views/meetings/edit.html.erb b/modules/meeting/app/views/meetings/edit.html.erb index 3f3eaaabac1a..365a37834db1 100644 --- a/modules/meeting/app/views/meetings/edit.html.erb +++ b/modules/meeting/app/views/meetings/edit.html.erb @@ -32,7 +32,7 @@ See COPYRIGHT and LICENSE files for more details. <%= toolbar title: "#{t(:label_meeting)} ##{@meeting.id}" %> <%= labelled_tabular_form_for @meeting, :url => {:controller => '/meetings', :action => 'update'}, :html => {:id => 'meeting-form', :method => :put} do |f| -%> <%= render :partial => 'form', :locals => {:f => f} %> -<%= styled_button_tag t(:button_save), class: '-highlight -with-icon icon-checkmark' %> +<%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %> <%= link_to t(:button_cancel), { :action => 'show', :id => @meeting }, class: 'button -with-icon icon-cancel' %> <% end if @project %> diff --git a/modules/meeting/app/views/meetings/new.html.erb b/modules/meeting/app/views/meetings/new.html.erb index 2c498f663402..1661907a753d 100644 --- a/modules/meeting/app/views/meetings/new.html.erb +++ b/modules/meeting/app/views/meetings/new.html.erb @@ -43,7 +43,7 @@ See COPYRIGHT and LICENSE files for more details. 'refresh-on-form-changes-target': 'form', 'refresh-on-form-changes-turbo-stream-url-value': new_meeting_url }} do |f| -%> <%= render :partial => 'form', :locals => { f:, copy_from: } %> - <%= styled_button_tag t(:button_create), class: '-highlight' %> + <%= styled_button_tag t(:button_create), class: '-primary' %> <%= link_to t(:button_cancel), { :action => 'index', :project_id => @project }, class: 'button' %> <% end %> diff --git a/modules/openid_connect/app/views/openid_connect/providers/edit.html.erb b/modules/openid_connect/app/views/openid_connect/providers/edit.html.erb index 95a6f1b60342..2f244dabd588 100644 --- a/modules/openid_connect/app/views/openid_connect/providers/edit.html.erb +++ b/modules/openid_connect/app/views/openid_connect/providers/edit.html.erb @@ -11,7 +11,7 @@ html: { class: 'form', autocomplete: 'off' } do |f| %> <%= render partial: "form", locals: { f: f } %>

    - <%= styled_button_tag t(:button_save), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %> <%= link_to t(:button_cancel), { action: :index }, class: 'button -with-icon icon-cancel' %>

    <% end %> diff --git a/modules/openid_connect/app/views/openid_connect/providers/index.html.erb b/modules/openid_connect/app/views/openid_connect/providers/index.html.erb index f84ddf5283bf..415c998f96ff 100644 --- a/modules/openid_connect/app/views/openid_connect/providers/index.html.erb +++ b/modules/openid_connect/app/views/openid_connect/providers/index.html.erb @@ -4,7 +4,7 @@ <%= toolbar title: t('openid_connect.providers.plural') do %>
  • <%= link_to new_openid_connect_provider_path, - { class: 'button -alt-highlight', + { class: 'button -primary', aria: {label: t('openid_connect.providers.label_add_new')}, title: t('openid_connect.providers.label_add_new')} do %> <%= op_icon('button--icon icon-add') %> diff --git a/modules/openid_connect/app/views/openid_connect/providers/new.html.erb b/modules/openid_connect/app/views/openid_connect/providers/new.html.erb index 2ffecfae30b8..c7cbf0dce176 100644 --- a/modules/openid_connect/app/views/openid_connect/providers/new.html.erb +++ b/modules/openid_connect/app/views/openid_connect/providers/new.html.erb @@ -12,7 +12,7 @@ html: { class: 'form', autocomplete: 'off' } do |f| %> <%= render partial: "form", locals: { f: f } %>

    - <%= styled_button_tag t(:button_create), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_create), class: '-primary -with-icon icon-checkmark' %> <%= link_to t(:button_cancel), { action: :index }, class: 'button -with-icon icon-cancel' %>

    <% end %> diff --git a/modules/recaptcha/app/views/recaptcha/admin/show.html.erb b/modules/recaptcha/app/views/recaptcha/admin/show.html.erb index 302d86662950..c67374539fb0 100644 --- a/modules/recaptcha/app/views/recaptcha/admin/show.html.erb +++ b/modules/recaptcha/app/views/recaptcha/admin/show.html.erb @@ -52,6 +52,6 @@ - <%= styled_submit_tag t(:button_apply), class: '-highlight' %> + <%= styled_submit_tag t(:button_apply), class: '-primary' %> <% end %> diff --git a/modules/reporting/lib/widget/controls/apply.rb b/modules/reporting/lib/widget/controls/apply.rb index aaa12db717d2..b77cde8015a0 100644 --- a/modules/reporting/lib/widget/controls/apply.rb +++ b/modules/reporting/lib/widget/controls/apply.rb @@ -31,7 +31,7 @@ def render write link_to(I18n.t(:button_apply), '#', id: 'query-icon-apply-button', - class: 'button -highlight', + class: 'button -primary', 'data-target': url_for(action: 'index', set_filter: '1')) end end diff --git a/modules/reporting/lib/widget/controls/delete.rb b/modules/reporting/lib/widget/controls/delete.rb index a783f9e12e20..a0bcd75ac4a4 100644 --- a/modules/reporting/lib/widget/controls/delete.rb +++ b/modules/reporting/lib/widget/controls/delete.rb @@ -42,7 +42,7 @@ def render opt1 = link_to I18n.t(:button_delete), url_for(url_opts), method: :delete, - class: 'button -highlight icon-context icon-delete' + class: 'button -primary icon-context icon-delete' opt2 = link_to I18n.t(:button_cancel), '#', id: 'query-icon-delete-cancel', diff --git a/modules/reporting/lib/widget/controls/save_as.rb b/modules/reporting/lib/widget/controls/save_as.rb index a97db23bea44..ceea543bcd1c 100644 --- a/modules/reporting/lib/widget/controls/save_as.rb +++ b/modules/reporting/lib/widget/controls/save_as.rb @@ -89,7 +89,7 @@ def render_popup_buttons save = link_to(I18n.t(:button_save), '#', id: 'query-icon-save-button', - class: 'button -highlight icon-context icon-save', + class: 'button -primary icon-context icon-save', 'data-target': url_for(**save_url_params)) cancel = link_to(I18n.t(:button_cancel), diff --git a/modules/storages/app/views/storages/admin/storages/confirm_destroy.html.erb b/modules/storages/app/views/storages/admin/storages/confirm_destroy.html.erb index e19d43a5b368..5f33628f9f13 100644 --- a/modules/storages/app/views/storages/admin/storages/confirm_destroy.html.erb +++ b/modules/storages/app/views/storages/admin/storages/confirm_destroy.html.erb @@ -50,7 +50,7 @@ See COPYRIGHT and LICENSE files for more details.

    <%= text_field_tag :delete_confirmation %> - <%= styled_button_tag title: t(:button_delete), class: '-highlight', disabled: true do + <%= styled_button_tag title: t(:button_delete), class: '-primary', disabled: true do concat content_tag :i, '', class: 'button--icon icon-delete' concat content_tag :span, t(:button_delete), class: 'button--text' end %> diff --git a/modules/storages/app/views/storages/project_settings/_project_folder_form.html.erb b/modules/storages/app/views/storages/project_settings/_project_folder_form.html.erb index 6306e76ab6d1..871598437d5d 100644 --- a/modules/storages/app/views/storages/project_settings/_project_folder_form.html.erb +++ b/modules/storages/app/views/storages/project_settings/_project_folder_form.html.erb @@ -154,7 +154,7 @@ See COPYRIGHT and LICENSE files for more details.
    - <%= styled_button_tag class: "-highlight" do %> + <%= styled_button_tag class: "-primary" do %> <%= spot_icon('checkmark') %> <%= content_tag :span, submit_button_label %> <% end %> diff --git a/modules/storages/app/views/storages/project_settings/_storage_select_form.html.erb b/modules/storages/app/views/storages/project_settings/_storage_select_form.html.erb index c6492937a803..a723e22d40d1 100644 --- a/modules/storages/app/views/storages/project_settings/_storage_select_form.html.erb +++ b/modules/storages/app/views/storages/project_settings/_storage_select_form.html.erb @@ -44,7 +44,7 @@ See COPYRIGHT and LICENSE files for more details.
    - <%= styled_button_tag class: "-highlight" do %> + <%= styled_button_tag class: "-primary" do %> <%= spot_icon('checkmark') %> <%= content_tag :span, submit_button_label %> <% end %> diff --git a/modules/storages/app/views/storages/project_settings/destroy_info.html.erb b/modules/storages/app/views/storages/project_settings/destroy_info.html.erb index ccf209e08974..9da3cc13f4b6 100644 --- a/modules/storages/app/views/storages/project_settings/destroy_info.html.erb +++ b/modules/storages/app/views/storages/project_settings/destroy_info.html.erb @@ -49,7 +49,7 @@ See COPYRIGHT and LICENSE files for more details.

    <%= text_field_tag :delete_confirmation %> - <%= styled_button_tag title: t(:button_delete), class: '-highlight', disabled: true do + <%= styled_button_tag title: t(:button_delete), class: '-primary', disabled: true do concat content_tag :i, '', class: 'button--icon icon-delete' concat content_tag :span, t(:button_delete), class: 'button--text' end %> diff --git a/modules/storages/app/views/storages/project_settings/index.html.erb b/modules/storages/app/views/storages/project_settings/index.html.erb index f8a608cbfb08..ab04939601b6 100644 --- a/modules/storages/app/views/storages/project_settings/index.html.erb +++ b/modules/storages/app/views/storages/project_settings/index.html.erb @@ -34,7 +34,7 @@ See COPYRIGHT and LICENSE files for more details.
  • <%= link_to new_project_settings_project_storage_path, - { class: 'button -alt-highlight', + { class: 'button -primary', aria: { label: t(:'storages.label_new_storage') }, title: t(:'storages.label_new_storage') } do %> <%= op_icon('button--icon icon-add') %> diff --git a/modules/team_planner/app/views/team_planner/team_planner/new.html.erb b/modules/team_planner/app/views/team_planner/team_planner/new.html.erb index 2789ec04a676..19f56dc6dfac 100644 --- a/modules/team_planner/app/views/team_planner/team_planner/new.html.erb +++ b/modules/team_planner/app/views/team_planner/team_planner/new.html.erb @@ -31,7 +31,7 @@ See COPYRIGHT and LICENSE files for more details. <%= toolbar title: t('team_planner.label_new_team_planner') %> <%= labelled_tabular_form_for @view, url: { controller: '/team_planner/team_planner', action: 'create' }, :html => {:id => 'team-planner-form'} do |f| -%> <%= render :partial => 'form', :locals => {:f => f} %> - <%= styled_button_tag t(:button_create), class: '-highlight' %> + <%= styled_button_tag t(:button_create), class: '-primary' %> <%= link_to t(:button_cancel), { controller: 'team_planner/team_planner', action: 'overview' }, class: 'button' %> <% end %> diff --git a/modules/two_factor_authentication/app/views/two_factor_authentication/authentication/enter_backup_code.html.erb b/modules/two_factor_authentication/app/views/two_factor_authentication/authentication/enter_backup_code.html.erb index 53deeccebc63..da2ca788a883 100644 --- a/modules/two_factor_authentication/app/views/two_factor_authentication/authentication/enter_backup_code.html.erb +++ b/modules/two_factor_authentication/app/views/two_factor_authentication/authentication/enter_backup_code.html.erb @@ -11,7 +11,7 @@ <%= styled_text_field_tag 'backup_code', nil, required: true, autocomplete: 'off', size: 20, maxlength: 20, tabindex: 1, autofocus: true %> - + <% end %> diff --git a/modules/two_factor_authentication/app/views/two_factor_authentication/authentication/request_otp.html.erb b/modules/two_factor_authentication/app/views/two_factor_authentication/authentication/request_otp.html.erb index 9dcbe71a5677..7f9a4f527ccb 100644 --- a/modules/two_factor_authentication/app/views/two_factor_authentication/authentication/request_otp.html.erb +++ b/modules/two_factor_authentication/app/views/two_factor_authentication/authentication/request_otp.html.erb @@ -43,7 +43,7 @@ <% end %> - + <% if resend_supported || has_other_devices || has_backup_codes %>
    - + <% end %> <% end %> <% if has_other_devices %> diff --git a/modules/two_factor_authentication/app/views/two_factor_authentication/my/two_factor_devices/index.html.erb b/modules/two_factor_authentication/app/views/two_factor_authentication/my/two_factor_devices/index.html.erb index d515bc645b1e..83c6f718ba67 100644 --- a/modules/two_factor_authentication/app/views/two_factor_authentication/my/two_factor_devices/index.html.erb +++ b/modules/two_factor_authentication/app/views/two_factor_authentication/my/two_factor_devices/index.html.erb @@ -29,7 +29,7 @@ <%= toolbar title: t('two_factor_authentication.label_two_factor_authentication') do %>
  • <%= link_to new_my_2fa_device_path, - { class: 'button -alt-highlight', + { class: 'button -primary', aria: {label: t('two_factor_authentication.label_device')}, title: t('two_factor_authentication.devices.add_new')} do %> <%= op_icon('button--icon icon-add') %> diff --git a/modules/two_factor_authentication/app/views/two_factor_authentication/settings.html.erb b/modules/two_factor_authentication/app/views/two_factor_authentication/settings.html.erb index 91e5de1eee6c..6c43855e3d51 100644 --- a/modules/two_factor_authentication/app/views/two_factor_authentication/settings.html.erb +++ b/modules/two_factor_authentication/app/views/two_factor_authentication/settings.html.erb @@ -69,6 +69,6 @@ - <%= styled_submit_tag t(:button_apply), class: '-highlight' %> + <%= styled_submit_tag t(:button_apply), class: '-primary' %> <% end %> diff --git a/modules/two_factor_authentication/app/views/two_factor_authentication/two_factor_devices/confirm.html.erb b/modules/two_factor_authentication/app/views/two_factor_authentication/two_factor_devices/confirm.html.erb index e763712635c0..64107c8b5c0e 100644 --- a/modules/two_factor_authentication/app/views/two_factor_authentication/two_factor_devices/confirm.html.erb +++ b/modules/two_factor_authentication/app/views/two_factor_authentication/two_factor_devices/confirm.html.erb @@ -14,6 +14,6 @@
    - +
    <% end %> diff --git a/modules/two_factor_authentication/app/views/two_factor_authentication/two_factor_devices/new.html.erb b/modules/two_factor_authentication/app/views/two_factor_authentication/two_factor_devices/new.html.erb index af4dbe010d09..5786e8c970b3 100644 --- a/modules/two_factor_authentication/app/views/two_factor_authentication/two_factor_devices/new.html.erb +++ b/modules/two_factor_authentication/app/views/two_factor_authentication/two_factor_devices/new.html.erb @@ -15,7 +15,7 @@ <%= hidden_field_tag 'key', @device_type %> <%= render partial: "two_factor_authentication/two_factor_devices/form", locals: { f: f, device_type: @device_type, device: @device, user: @user } %>

    - <%= styled_button_tag t(:button_continue), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_continue), class: '-primary -with-icon icon-checkmark' %> <%= link_to t(:button_cancel), index_path, class: 'button -with-icon icon-cancel' %>

    <% end %> diff --git a/modules/two_factor_authentication/app/views/users/_two_factor_authentication_admin.html.erb b/modules/two_factor_authentication/app/views/users/_two_factor_authentication_admin.html.erb index 306cbc837628..a1aa59dffc0d 100644 --- a/modules/two_factor_authentication/app/views/users/_two_factor_authentication_admin.html.erb +++ b/modules/two_factor_authentication/app/views/users/_two_factor_authentication_admin.html.erb @@ -39,7 +39,7 @@ <% end %> <% if ::OpenProject::TwoFactorAuthentication::TokenStrategyManager.admin_register_sms_strategy.present? %>
  • - <%= link_to new_user_2fa_device_path(@user, type: :sms), class: 'button -alt-highlight' do %> + <%= link_to new_user_2fa_device_path(@user, type: :sms), class: 'button -primary' do %> <%= op_icon 'button--icon icon-add' %> <%= t 'two_factor_authentication.admin.button_register_mobile_phone_for_user' %> <% end %> diff --git a/modules/webhooks/app/views/webhooks/outgoing/admin/edit.html.erb b/modules/webhooks/app/views/webhooks/outgoing/admin/edit.html.erb index 181ccaf33589..1d97909b1795 100644 --- a/modules/webhooks/app/views/webhooks/outgoing/admin/edit.html.erb +++ b/modules/webhooks/app/views/webhooks/outgoing/admin/edit.html.erb @@ -16,7 +16,7 @@ html: { class: 'form', autocomplete: 'off' } do |f| %> <%= render partial: "form", locals: { f: f, webhook: @webhook } %>

    - <%= styled_button_tag t(:button_save), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %> <%= link_to t(:button_cancel), { action: :index }, class: 'button -with-icon icon-cancel' %>

    -<% end %> \ No newline at end of file +<% end %> diff --git a/modules/webhooks/app/views/webhooks/outgoing/admin/index.html.erb b/modules/webhooks/app/views/webhooks/outgoing/admin/index.html.erb index 7d3c2e4763f0..b6773b0c1802 100644 --- a/modules/webhooks/app/views/webhooks/outgoing/admin/index.html.erb +++ b/modules/webhooks/app/views/webhooks/outgoing/admin/index.html.erb @@ -4,7 +4,7 @@ <%= toolbar title: t('webhooks.plural') do %>
  • <%= link_to new_admin_outgoing_webhook_path, - { class: 'button -alt-highlight', + { class: 'button -primary', aria: {label: t('webhooks.outgoing.label_add_new')}, title: t('webhooks.outgoing.label_add_new')} do %> <%= op_icon('button--icon icon-add') %> @@ -19,4 +19,3 @@

    <%= render ::Webhooks::Outgoing::Webhooks::TableComponent.new(rows: @webhooks) %> - diff --git a/modules/webhooks/app/views/webhooks/outgoing/admin/new.html.erb b/modules/webhooks/app/views/webhooks/outgoing/admin/new.html.erb index 57602eda0fad..1df7c94be00d 100644 --- a/modules/webhooks/app/views/webhooks/outgoing/admin/new.html.erb +++ b/modules/webhooks/app/views/webhooks/outgoing/admin/new.html.erb @@ -15,7 +15,7 @@ html: { class: 'form', autocomplete: 'off' } do |f| %> <%= render partial: "form", locals: { f: f, webhook: @webhook } %>

    - <%= styled_button_tag t(:button_create), class: '-highlight -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_create), class: '-primary -with-icon icon-checkmark' %> <%= link_to t(:button_cancel), { action: :index }, class: 'button -with-icon icon-cancel' %>

    -<% end %> \ No newline at end of file +<% end %> diff --git a/spec/controllers/custom_styles_controller_spec.rb b/spec/controllers/custom_styles_controller_spec.rb index fec0579a1b89..3d8122a03eac 100644 --- a/spec/controllers/custom_styles_controller_spec.rb +++ b/spec/controllers/custom_styles_controller_spec.rb @@ -537,7 +537,7 @@ describe "#update_colors", with_ee: %i[define_custom_style] do let(:params) do { - design_colors: [{ "primary-color" => "#990000" }] + design_colors: [{ "primary-button-color" => "#990000" }] } end @@ -553,7 +553,7 @@ end it "updates DesignColor instances" do - post :update_colors, params: { design_colors: [{ "primary-color" => "#110000" }] } + post :update_colors, params: { design_colors: [{ "primary-button-color" => "#110000" }] } design_colors = DesignColor.all expect(design_colors.size).to eq(1) expect(design_colors.first.hexcode).to eq("#110000") @@ -562,7 +562,7 @@ it "deletes DesignColor instances for each param" do expect(DesignColor.count).to eq(1) - post :update_colors, params: { design_colors: [{ "primary-color" => "" }] } + post :update_colors, params: { design_colors: [{ "primary-button-color" => "" }] } expect(DesignColor.count).to eq(0) expect(response).to redirect_to action: :show end diff --git a/spec/factories/design_color_factory.rb b/spec/factories/design_color_factory.rb index ffbeb9c3b1fc..79a902072711 100644 --- a/spec/factories/design_color_factory.rb +++ b/spec/factories/design_color_factory.rb @@ -32,7 +32,7 @@ end end -{ "primary-color" => "#3493B3" }.each do |name, code| +{ "primary-button-color" => "#3493B3" }.each do |name, code| FactoryBot.define do factory(:"design_color_#{name}", parent: :design_color) do variable { name } diff --git a/spec/features/support/components/danger_zone.rb b/spec/features/support/components/danger_zone.rb index 0d125cf51192..516a1f9a3486 100644 --- a/spec/features/support/components/danger_zone.rb +++ b/spec/features/support/components/danger_zone.rb @@ -48,7 +48,7 @@ def confirmation_field def danger_button page.within container_selector do - find('button.-highlight') + find('button.-primary') end end diff --git a/spec/migrations/reduce_configurable_design_variables_spec.rb b/spec/migrations/reduce_configurable_design_variables_spec.rb new file mode 100644 index 000000000000..41fa01d669d0 --- /dev/null +++ b/spec/migrations/reduce_configurable_design_variables_spec.rb @@ -0,0 +1,79 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) 2012-2024 the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +require 'spec_helper' +require Rails.root.join("db/migrate/20240307102541_reduce_configurable_design_variables.rb") + +RSpec.describe ReduceConfigurableDesignVariables, type: :model do + context 'when migrating up' do + before do + create(:design_color, variable: 'alternative-color') + create(:design_color, variable: 'primary-color') + create(:design_color, variable: 'primary-color-dark') + create(:design_color, variable: 'content-link-color') + end + + # Silencing migration logs, since we are not interested in that during testing + subject { ActiveRecord::Migration.suppress_messages { described_class.new.up } } + + it "removes the obsolete variables and renames 'alternative-color'" do + expect { subject } + .to change(DesignColor, :count).from(4).to(2) + + expect(DesignColor.find_by(variable: 'primary-button-color')).not_to be_nil + expect(DesignColor.find_by(variable: 'accent-color')).not_to be_nil + expect(DesignColor.find_by(variable: 'primary-color')).to be_nil + expect(DesignColor.find_by(variable: 'primary-color-dark')).to be_nil + expect(DesignColor.find_by(variable: 'alternative-color')).to be_nil + expect(DesignColor.find_by(variable: 'content-link-color')).to be_nil + end + end + + context 'when migrating down' do + before do + create(:design_color, variable: 'primary-button-color') + create(:design_color, variable: 'accent-color') + end + + # Silencing migration logs, since we are not interested in that during testing + subject { ActiveRecord::Migration.suppress_messages { described_class.new.down } } + + it "re-creates the removed variables and reverts the renaming" do + expect { subject } + .to change(DesignColor, :count).from(2).to(4) + + expect(DesignColor.find_by(variable: 'primary-button-color')).to be_nil + expect(DesignColor.find_by(variable: 'accent-color')).to be_nil + expect(DesignColor.find_by(variable: 'primary-color')).not_to be_nil + expect(DesignColor.find_by(variable: 'primary-color-dark')).not_to be_nil + expect(DesignColor.find_by(variable: 'alternative-color')).not_to be_nil + expect(DesignColor.find_by(variable: 'content-link-color')).not_to be_nil + + end + end +end diff --git a/spec/models/design_color_spec.rb b/spec/models/design_color_spec.rb index 355eb5caa4a0..8d6f92cd3f67 100644 --- a/spec/models/design_color_spec.rb +++ b/spec/models/design_color_spec.rb @@ -1,8 +1,8 @@ require 'spec_helper' RSpec.describe DesignColor do - let(:default_primary) { OpenProject::CustomStyles::Design.variables['primary-color'] } - let(:primary_color) { create(:'design_color_primary-color') } + let(:default_primary) { OpenProject::CustomStyles::Design.variables['primary-button-color'] } + let(:primary_color) { create(:'design_color_primary-button-color') } describe "#setables" do it "returns an Array of instances" do @@ -28,7 +28,7 @@ end it "returns nil hexcode if hexcode not present" do - expect(described_class.new(variable: "primary-color").hexcode) + expect(described_class.new(variable: "primary-button-color").hexcode) .to be_nil end end diff --git a/spec/views/layouts/base.html.erb_spec.rb b/spec/views/layouts/base.html.erb_spec.rb index 1ea78c6de8ed..c31a972c01aa 100644 --- a/spec/views/layouts/base.html.erb_spec.rb +++ b/spec/views/layouts/base.html.erb_spec.rb @@ -190,7 +190,7 @@ context "EE is active and styles are present" do let(:custom_style) { create(:custom_style) } - let(:primary_color) { create(:'design_color_primary-color') } + let(:primary_color) { create(:'design_color_primary-button-color') } before do allow(EnterpriseToken).to receive(:allows_to?).with(:define_custom_style).and_return(true) @@ -206,7 +206,7 @@ primary_color render expect(rendered).to render_template partial: 'custom_styles/_inline_css' - expect(rendered).to match /--primary-color:\s*#{primary_color.hexcode}/ + expect(rendered).to match /--primary-button-color:\s*#{primary_color.hexcode}/ end end