diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 10:00:54 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 10:00:54 +0000 |
commit | 3cccd102ba543e02725d247893729e5c73b38295 (patch) | |
tree | f36a04ec38517f5deaaacb5acc7d949688d1e187 /app/views/layouts | |
parent | 205943281328046ef7b4528031b90fbda70c75ac (diff) | |
download | gitlab-ce-3cccd102ba543e02725d247893729e5c73b38295.tar.gz |
Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42
Diffstat (limited to 'app/views/layouts')
-rw-r--r-- | app/views/layouts/_diffs_colors_css.haml | 20 | ||||
-rw-r--r-- | app/views/layouts/_header_search.html.haml | 7 | ||||
-rw-r--r-- | app/views/layouts/_page.html.haml | 1 | ||||
-rw-r--r-- | app/views/layouts/_snowplow.html.haml | 2 | ||||
-rw-r--r-- | app/views/layouts/_startup_css.haml | 3 | ||||
-rw-r--r-- | app/views/layouts/application.html.haml | 2 | ||||
-rw-r--r-- | app/views/layouts/errors.html.haml | 4 | ||||
-rw-r--r-- | app/views/layouts/header/_current_user_dropdown.html.haml | 1 | ||||
-rw-r--r-- | app/views/layouts/header/_default.html.haml | 2 | ||||
-rw-r--r-- | app/views/layouts/header/_registration_enabled_callout.html.haml | 8 | ||||
-rw-r--r-- | app/views/layouts/header/_storage_enforcement_banner.html.haml | 7 | ||||
-rw-r--r-- | app/views/layouts/nav/sidebar/_admin.html.haml | 15 |
12 files changed, 51 insertions, 21 deletions
diff --git a/app/views/layouts/_diffs_colors_css.haml b/app/views/layouts/_diffs_colors_css.haml new file mode 100644 index 00000000000..d2efa392bd9 --- /dev/null +++ b/app/views/layouts/_diffs_colors_css.haml @@ -0,0 +1,20 @@ +- deletion_color = local_assigns.fetch(:deletion, nil) +- addition_color = local_assigns.fetch(:addition, nil) + +- if deletion_color.present? || request.path == profile_preferences_path + = stylesheet_link_tag_defer "highlight/diff_custom_colors_deletion" +- if deletion_color.present? + - deletion_color_rgb = hex_color_to_rgb_array(deletion_color).join(',') + :css + :root { + --diff-deletion-color: rgba(#{deletion_color_rgb},0.2); + } + +- if addition_color.present? || request.path == profile_preferences_path + = stylesheet_link_tag_defer "highlight/diff_custom_colors_addition" +- if addition_color.present? + - addition_color_rgb = hex_color_to_rgb_array(addition_color).join(',') + :css + :root { + --diff-addition-color: rgba(#{addition_color_rgb},0.2); + } diff --git a/app/views/layouts/_header_search.html.haml b/app/views/layouts/_header_search.html.haml index d2fe9a9a6ee..f7b7aac6de4 100644 --- a/app/views/layouts/_header_search.html.haml +++ b/app/views/layouts/_header_search.html.haml @@ -1,4 +1,4 @@ -#js-header-search.header-search{ data: { 'search-context' => header_search_context.to_json, +#js-header-search.header-search.is-not-active.gl-relative{ data: { 'search-context' => header_search_context.to_json, 'search-path' => search_path, 'issues-path' => issues_dashboard_path, 'mr-path' => merge_requests_dashboard_path, @@ -6,7 +6,10 @@ = form_tag search_path, method: :get do |_f| .gl-search-box-by-type = sprite_icon('search', css_class: 'gl-search-box-by-type-search-icon gl-icon') - %input{ id: 'search', name: 'search', type: "text", placeholder: s_('GlobalSearch|Search GitLab'), class: 'form-control gl-form-input gl-search-box-by-type-input', autocomplete: 'off' } + %input{ id: 'search', name: 'search', type: "text", placeholder: s_('GlobalSearch|Search GitLab'), + class: 'form-control gl-form-input gl-search-box-by-type-input', + autocomplete: 'off', + data: { qa_selector: 'search_box' } } = hidden_field_tag :group_id, header_search_context[:group][:id] if header_search_context[:group] = hidden_field_tag :project_id, header_search_context[:project][:id] if header_search_context[:project] diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml index a656b61dc8f..3c4b612f33f 100644 --- a/app/views/layouts/_page.html.haml +++ b/app/views/layouts/_page.html.haml @@ -20,6 +20,7 @@ = dispensable_render_if_exists "shared/namespace_user_cap_reached_alert" = dispensable_render_if_exists "shared/new_user_signups_cap_reached_alert" = yield :page_level_alert + = yield :user_over_limit_free_plan_alert = yield :group_invite_members_banner - unless @hide_breadcrumbs = render "layouts/nav/breadcrumbs" diff --git a/app/views/layouts/_snowplow.html.haml b/app/views/layouts/_snowplow.html.haml index 8e9a5ea9406..0dad6d367c3 100644 --- a/app/views/layouts/_snowplow.html.haml +++ b/app/views/layouts/_snowplow.html.haml @@ -1,6 +1,6 @@ - return unless Gitlab::Tracking.enabled? -- namespace = @group || @project&.namespace +- namespace = @group || @project&.namespace || @namespace = javascript_tag do :plain diff --git a/app/views/layouts/_startup_css.haml b/app/views/layouts/_startup_css.haml index 67c871b95f5..64a86cf319e 100644 --- a/app/views/layouts/_startup_css.haml +++ b/app/views/layouts/_startup_css.haml @@ -1,6 +1,9 @@ - startup_filename_default = user_application_theme == 'gl-dark' ? 'dark' : 'general' - startup_filename = local_assigns.fetch(:startup_filename, nil) || startup_filename_default +- diffs_colors = user_diffs_colors %style = Rails.application.assets_manifest.find_sources("themes/#{user_application_theme_css_filename}.css").first.to_s.html_safe if user_application_theme_css_filename = Rails.application.assets_manifest.find_sources("startup/startup-#{startup_filename}.css").first.to_s.html_safe + += render 'layouts/diffs_colors_css', diffs_colors if diffs_colors.present? || request.path == profile_preferences_path diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 26e3d9b3b92..bdab5d7ea07 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -1,6 +1,6 @@ - page_classes = page_class << @html_class - page_classes = page_classes.flatten.compact -- body_classes = [user_application_theme, user_tab_width, @body_class, client_class_list] +- body_classes = [user_application_theme, user_tab_width, @body_class, client_class_list, *custom_diff_color_classes] !!! 5 %html{ lang: I18n.locale, class: page_classes } diff --git a/app/views/layouts/errors.html.haml b/app/views/layouts/errors.html.haml index 57260ccedea..3ddd8c6780f 100644 --- a/app/views/layouts/errors.html.haml +++ b/app/views/layouts/errors.html.haml @@ -22,8 +22,8 @@ } // We do not have rails_ujs here, so we're manually making a link trigger a form submit. - document.getElementById('sign_out_link').addEventListener('click', function(e) { + document.querySelector('.js-sign-out-link')?.addEventListener('click', (e) => { e.preventDefault(); - document.getElementById('sign_out_form').submit(); + document.querySelector('.js-sign-out-form')?.submit(); }); }()); diff --git a/app/views/layouts/header/_current_user_dropdown.html.haml b/app/views/layouts/header/_current_user_dropdown.html.haml index daa48980c5b..11dd8ba6c08 100644 --- a/app/views/layouts/header/_current_user_dropdown.html.haml +++ b/app/views/layouts/header/_current_user_dropdown.html.haml @@ -27,7 +27,6 @@ %li = link_to s_("CurrentUser|Preferences"), profile_preferences_path = render_if_exists 'layouts/header/buy_pipeline_minutes', project: @project, namespace: @group - = render_if_exists 'layouts/header/upgrade' - if current_user_menu?(:help) %li.divider.d-md-none diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index 512a4185bee..c15a5e54a42 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -40,7 +40,7 @@ - search_menu_item = top_nav_search_menu_item_attrs %li.nav-item.header-search-new.d-none.d-lg-block.m-auto - unless current_controller?(:search) - - if Feature.enabled?(:new_header_search) + - if Feature.enabled?(:new_header_search, default_enabled: :yaml) = render 'layouts/header_search' - else = render 'layouts/search' diff --git a/app/views/layouts/header/_registration_enabled_callout.html.haml b/app/views/layouts/header/_registration_enabled_callout.html.haml index d1d23c86c81..affee15c4d0 100644 --- a/app/views/layouts/header/_registration_enabled_callout.html.haml +++ b/app/views/layouts/header/_registration_enabled_callout.html.haml @@ -1,11 +1,11 @@ - return unless show_registration_enabled_user_callout? -= render 'shared/global_alert', - title: _('Anyone can register for an account.'), += render Pajamas::AlertComponent.new(title: _('Anyone can register for an account.'), variant: :warning, alert_class: 'js-registration-enabled-callout', - alert_data: { feature_id: Users::CalloutsHelper::REGISTRATION_ENABLED_CALLOUT, dismiss_endpoint: callouts_path }, - close_button_data: { testid: 'close-registration-enabled-callout' } do + alert_data: { feature_id: Users::CalloutsHelper::REGISTRATION_ENABLED_CALLOUT, + dismiss_endpoint: callouts_path }, + close_button_data: { testid: 'close-registration-enabled-callout' }) do .gl-alert-body = _('Only allow anyone to register for accounts on GitLab instances that you intend to be used by anyone. Allowing anyone to register makes GitLab instances more vulnerable.') .gl-alert-actions diff --git a/app/views/layouts/header/_storage_enforcement_banner.html.haml b/app/views/layouts/header/_storage_enforcement_banner.html.haml index 851fc57e44d..92c02d6ecfd 100644 --- a/app/views/layouts/header/_storage_enforcement_banner.html.haml +++ b/app/views/layouts/header/_storage_enforcement_banner.html.haml @@ -3,7 +3,12 @@ - banner_info = storage_enforcement_banner_info(namespace) - return unless banner_info.present? -= render 'shared/global_alert', variant: :warning, alert_class: 'js-storage-enforcement-banner', alert_data: { feature_id: banner_info[:callouts_feature_name], dismiss_endpoint: banner_info[:callouts_path], group_id: namespace.id, defer_links: "true" } do += render Pajamas::AlertComponent.new(variant: :warning, + alert_class: 'js-storage-enforcement-banner', + alert_data: { feature_id: banner_info[:callouts_feature_name], + dismiss_endpoint: banner_info[:callouts_path], + group_id: namespace.id, + defer_links: "true" }) do .gl-alert-body = banner_info[:text] = banner_info[:learn_more_link] diff --git a/app/views/layouts/nav/sidebar/_admin.html.haml b/app/views/layouts/nav/sidebar/_admin.html.haml index 52eea73ecd2..94c708783e4 100644 --- a/app/views/layouts/nav/sidebar/_admin.html.haml +++ b/app/views/layouts/nav/sidebar/_admin.html.haml @@ -53,7 +53,7 @@ = _('Gitaly Servers') = nav_link(controller: admin_analytics_nav_links) do - = link_to admin_dev_ops_report_path, data: { qa_selector: 'admin_analytics_link' }, class: 'has-sub-items' do + = link_to admin_dev_ops_reports_path, data: { qa_selector: 'admin_analytics_link' }, class: 'has-sub-items' do .nav-icon-container = sprite_icon('chart') %span.nav-item-name @@ -61,12 +61,12 @@ %ul.sidebar-sub-level-items{ data: { qa_selector: 'admin_sidebar_analytics_submenu_content' } } = nav_link(controller: admin_analytics_nav_links, html_options: { class: "fly-out-top-item" }) do - = link_to admin_dev_ops_report_path do + = link_to admin_dev_ops_reports_path do %strong.fly-out-top-item-name = _('Analytics') %li.divider.fly-out-top-item = nav_link(controller: :dev_ops_report) do - = link_to admin_dev_ops_report_path, title: _('DevOps Reports') do + = link_to admin_dev_ops_reports_path, title: _('DevOps Reports') do %span = _('DevOps Reports') = nav_link(controller: :usage_trends) do @@ -269,11 +269,10 @@ = link_to metrics_and_profiling_admin_application_settings_path, title: _('Metrics and profiling'), class: 'qa-admin-settings-metrics-and-profiling-item' do %span = _('Metrics and profiling') - - if Feature.enabled?(:admin_application_settings_service_usage_data_center, default_enabled: :yaml) - = nav_link(path: ['application_settings#service_usage_data']) do - = link_to service_usage_data_admin_application_settings_path, title: _('Service usage data') do - %span - = _('Service usage data') + = nav_link(path: ['application_settings#service_usage_data']) do + = link_to service_usage_data_admin_application_settings_path, title: _('Service usage data') do + %span + = _('Service usage data') = nav_link(path: 'application_settings#network') do = link_to network_admin_application_settings_path, title: _('Network'), data: { qa_selector: 'admin_settings_network_item' } do %span |