Merge pull request #14942 from opf/feature/53309-reduce-configurable-…

…design-variables

[53309] Reduce configurable design variables

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

app/components/filters_component.html.erb

@@ -123,7 +123,7 @@
           </div>
         </li>
         <li class="advanced-filters--controls">
-          <%= submit_tag t('button_apply'), class: 'button -small -highlight', name: nil %>
+          <%= submit_tag t('button_apply'), class: 'button -small -primary', name: nil %>
         </li>
       </ul>
       <% unless EnterpriseToken.allows_to?(:custom_fields_in_projects_list)%>

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' %>
       </li>
       <li class="simple-filters--controls">
-        <%= 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' %>
       </li>
     </ul>

app/components/members/role_form_component.html.erb

@@ -48,7 +48,7 @@ See COPYRIGHT and LICENSE files for more details.
   </p>
 
   <p>
-    <%= f.submit t(:button_change), class: "button -highlight -small" %>
+    <%= f.submit t(:button_change), class: "button -primary -small" %>
     <%= link_to t(:button_cancel),
                 '#',
                 data: {

app/views/account/_footer.html.erb

@@ -3,6 +3,6 @@
     <% if footer = registration_footer %>
       <span><%= footer %></span>
     <% 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' %>
   </div>
 </div>

app/views/account/_login.html.erb

@@ -77,7 +77,7 @@ See COPYRIGHT and LICENSE files for more details.
            
         </label>
         <input type="submit" name="login" id="login-pulldown"
-          value="<%=t(:button_login)%>" class="button -highlight" tabindex="1" />
+          value="<%=t(:button_login)%>" class="button -primary" tabindex="1" />
       </div>
     </div>
 

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) } %>
 
   <div class="login-options-container">
@@ -78,7 +78,7 @@ See COPYRIGHT and LICENSE files for more details.
 
 <section data-augmented-model-wrapper
          data-activation-selector=".registration-modal--activation-link"
-         data-modal-class-name="registration-modal -highlight">
+         data-modal-class-name="registration-modal -primary">
   <% @user ||= User.new %>
   <%= render partial: '/account/register' %>
 </section>

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' %>
     <section class="form--section">
-      <button type="submit" class="button -highlight">
+      <button type="submit" class="button -primary">
       <span class="button--text"><%= t(:button_continue) %></span>
       </button>
       <%= link_to t(:button_decline), account_decline_consent_path, class: 'button' %>

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' %>
       </span>
     </div>
-    <%= 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 %>
 </section>

app/views/account/password_recovery.html.erb

@@ -48,5 +48,5 @@ See COPYRIGHT and LICENSE files for more details.
       </div>
     </div>
   </section>
-  <p><%= styled_button_tag t(:button_save), class: '-highlight -with-icon icon-checkmark' %></p>
+  <p><%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %></p>
 <% end %>

app/views/account/register.html.erb

@@ -29,7 +29,7 @@ See COPYRIGHT and LICENSE files for more details.
 
 <section data-augmented-model-wrapper
          data-modal-initialize-now="true"
-         data-modal-class-name="registration-modal -highlight">
+         data-modal-class-name="registration-modal -primary">
   <% @user ||= User.new %>
   <%= render partial: '/account/register' %>
 </section>

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? %>
       <p><%= submit_tag t(:button_apply),
-                        class: 'button -small -highlight',
+                        class: 'button -small -primary',
                         name: nil %></p>
     </fieldset>
   <% end %>

app/views/admin/backups/reset_token.html.erb

@@ -69,7 +69,7 @@ See COPYRIGHT and LICENSE files for more details.
       </p>
       <div class="danger-zone--verification">
         <input type="text" name="login_verification"/>
-        <%= 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 %>

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

app/views/admin/settings/aggregation_settings/show.html.erb

@@ -47,5 +47,5 @@ See COPYRIGHT and LICENSE files for more details.
     </span>
   </div>
 
-  <%= 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 %>

app/views/admin/settings/api_settings/show.html.erb

@@ -67,5 +67,5 @@ See COPYRIGHT and LICENSE files for more details.
       </div>
     </div>
   </section>
-  <%= 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 %>

app/views/admin/settings/attachments_settings/show.html.erb

@@ -46,5 +46,5 @@ See COPYRIGHT and LICENSE files for more details.
       </div>
     </div>
   </section>
-  <%= 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 %>

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' %>
     </div>
   <% 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 %>

app/views/admin/settings/date_format_settings/show.html.erb

@@ -64,5 +64,5 @@ See COPYRIGHT and LICENSE files for more details.
 
   </section>
 
-  <%= 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 %>

app/views/admin/settings/experimental_settings/show.html.erb

@@ -48,7 +48,7 @@ See COPYRIGHT and LICENSE files for more details.
     </fieldset>
   </section>
   <%= 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")
                         } %>

app/views/admin/settings/general_settings/show.html.erb

@@ -83,5 +83,5 @@ See COPYRIGHT and LICENSE files for more details.
       <div class="form--field"><%= setting_check_box :welcome_on_homescreen %></div>
     </fieldset>
   </section>
-  <%= 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 %>

app/views/admin/settings/icalendar_settings/show.html.erb

@@ -44,5 +44,5 @@ See COPYRIGHT and LICENSE files for more details.
     </div>
   </section>
 
-  <%= 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 %>

app/views/admin/settings/incoming_mails_settings/show.html.erb

@@ -47,5 +47,5 @@ See COPYRIGHT and LICENSE files for more details.
     </div>
   </section>
 
-  <%= 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 %>

app/views/admin/settings/languages_settings/show.html.erb

@@ -38,7 +38,7 @@ See COPYRIGHT and LICENSE files for more details.
   </section>
 
   <%= styled_button_tag t(:button_save),
-                        class: '-highlight -with-icon icon-checkmark',
+                        class: '-primary -with-icon icon-checkmark',
                         disabled: !Setting.available_languages_writable?
   %>
 <% end %>

app/views/admin/settings/mail_notifications_settings/show.html.erb

@@ -85,7 +85,7 @@ See COPYRIGHT and LICENSE files for more details.
     </div>
   <% 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 %>
     <div style="float:none;display:inline-block;font-weight:bold;">

app/views/admin/settings/projects_settings/show.html.erb

@@ -100,5 +100,5 @@ See COPYRIGHT and LICENSE files for more details.
     </fieldset>
   </section>
 
-  <%= 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 %>

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' %></div>
   </fieldset>
-  <%= 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 %>

app/views/admin/settings/show_plugin.html.erb

@@ -30,6 +30,6 @@ See COPYRIGHT and LICENSE files for more details.
 <div id="settings">
   <%= 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 %>
 </div>

app/views/admin/settings/users_settings/show.html.erb

@@ -105,5 +105,5 @@ See COPYRIGHT and LICENSE files for more details.
       </span>
     </div>
   </fieldset>
-  <%= 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 %>

app/views/admin/settings/virus_scanning_settings/show.html.erb

@@ -65,5 +65,5 @@ See COPYRIGHT and LICENSE files for more details.
   </div>
 
   <%= 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 %>

app/views/admin/settings/work_packages_settings/show.html.erb

@@ -58,7 +58,7 @@ See COPYRIGHT and LICENSE files for more details.
                  } %>
     </div>
     <% if EnterpriseToken.allows_to? :conditional_highlighting %>
-      <div class="form--field -indented -vertical settings--highlighted-attributes" style="<%= 'display: none' unless Setting[:work_package_list_default_highlighting_mode] == 'inline' %>">
+      <div class="form--field -indented -vertical settings--primaryed-attributes" style="<%= 'display: none' unless Setting[:work_package_list_default_highlighting_mode] == 'inline' %>">
         <%= 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.
     </fieldset>
   </section>
 
-  <%= 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 %>

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 %>

app/views/announcements/edit.html.erb

@@ -22,5 +22,5 @@
     <%= f.check_box :active, label: t(:label_active) %>
   </div>
   <hr class="form-separator">
-  <%= 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 %>

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 %>

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 %>
   <li class="toolbar-item">
     <%= 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') %>

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 %>

app/views/categories/destroy.html.erb

@@ -48,6 +48,6 @@ See COPYRIGHT and LICENSE files for more details.
     </div>
   <% 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 %>

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 %>

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 %>

app/views/colors/_form.html.erb

@@ -64,5 +64,5 @@ See COPYRIGHT and LICENSE files for more details.
   </div>
 </fieldset>
 
-<%= 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' %>

app/views/colors/confirm_destroy.html.erb

@@ -47,6 +47,6 @@ See COPYRIGHT and LICENSE files for more details.
     </div>
   </fieldset>
 
-  <%= 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 %>

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 %>
   <li class="toolbar-item">
     <%= 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') %>

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 %>

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 %>

app/views/custom_actions/index.html.erb

@@ -2,7 +2,7 @@
 <%= toolbar title: t('custom_actions.plural') do %>
   <li class="toolbar-item">
     <%= 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') %>

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 %>

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 %>