diff options
Diffstat (limited to 'app/views/layouts')
-rw-r--r-- | app/views/layouts/_header_search.html.haml | 2 | ||||
-rw-r--r-- | app/views/layouts/_loading_hints.html.haml | 6 | ||||
-rw-r--r-- | app/views/layouts/_page.html.haml | 2 | ||||
-rw-r--r-- | app/views/layouts/devise.html.haml | 16 | ||||
-rw-r--r-- | app/views/layouts/fullscreen.html.haml | 2 | ||||
-rw-r--r-- | app/views/layouts/group.html.haml | 3 | ||||
-rw-r--r-- | app/views/layouts/header/_current_user_dropdown.html.haml | 5 | ||||
-rw-r--r-- | app/views/layouts/header/_default.html.haml | 2 | ||||
-rw-r--r-- | app/views/layouts/header/_registration_enabled_callout.html.haml | 4 | ||||
-rw-r--r-- | app/views/layouts/project.html.haml | 3 | ||||
-rw-r--r-- | app/views/layouts/terms.html.haml | 4 |
11 files changed, 24 insertions, 25 deletions
diff --git a/app/views/layouts/_header_search.html.haml b/app/views/layouts/_header_search.html.haml index 28118cf4aaa..1d5f2583bbd 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.is-not-active.gl-relative.gl-w-full{ data: { 'search-context' => header_search_context.to_json, +#js-header-search.header-search-form.is-not-active.gl-relative.gl-w-full{ data: { 'search-context' => header_search_context.to_json, 'search-path' => search_path, 'issues-path' => issues_dashboard_path, 'mr-path' => merge_requests_dashboard_path, diff --git a/app/views/layouts/_loading_hints.html.haml b/app/views/layouts/_loading_hints.html.haml index b20b95cade8..1e6f671aacb 100644 --- a/app/views/layouts/_loading_hints.html.haml +++ b/app/views/layouts/_loading_hints.html.haml @@ -17,8 +17,6 @@ -# Do not use preload_link_tag for fonts, to work around Firefox double-fetch bug. -# See https://github.com/web-platform-tests/wpt/pull/36930 %link{ rel: 'preload', href: font_path('gitlab-sans/GitLabSans.woff2'), as: 'font', crossorigin: css_crossorigin } - %link{ rel: 'preload', href: font_path('jetbrains-mono/JetBrainsMono.woff2'), as: 'font', crossorigin: css_crossorigin } - %link{ rel: 'preload', href: font_path('jetbrains-mono/JetBrainsMono-Bold.woff2'), as: 'font', crossorigin: css_crossorigin } - %link{ rel: 'preload', href: font_path('jetbrains-mono/JetBrainsMono-Italic.woff2'), as: 'font', crossorigin: css_crossorigin } - %link{ rel: 'preload', href: font_path('jetbrains-mono/JetBrainsMono-BoldItalic.woff2'), as: 'font', crossorigin: css_crossorigin } + %link{ rel: 'preload', href: font_path('gitlab-mono/GitLabMono.woff2'), as: 'font', crossorigin: css_crossorigin } + %link{ rel: 'preload', href: font_path('gitlab-mono/GitLabMono-Italic.woff2'), as: 'font', crossorigin: css_crossorigin } = preload_link_tag(path_to_stylesheet('fonts'), crossorigin: css_crossorigin) diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml index aa80de7f789..8e52f973e9e 100644 --- a/app/views/layouts/_page.html.haml +++ b/app/views/layouts/_page.html.haml @@ -20,6 +20,8 @@ .mobile-overlay = dispensable_render_if_exists 'layouts/header/verification_reminder' .alert-wrapper.gl-force-block-formatting-context + = yield :code_suggestions_third_party_alert + = dispensable_render 'shared/new_nav_announcement' = dispensable_render 'shared/outdated_browser' = dispensable_render_if_exists "layouts/header/licensed_user_count_threshold" = dispensable_render_if_exists "layouts/header/token_expiry_notification" diff --git a/app/views/layouts/devise.html.haml b/app/views/layouts/devise.html.haml index 71771dd7cb6..6e1d3ba678c 100644 --- a/app/views/layouts/devise.html.haml +++ b/app/views/layouts/devise.html.haml @@ -1,4 +1,5 @@ - add_page_specific_style 'page_bundles/login' +- custom_text = custom_sign_in_description !!! 5 %html.devise-layout-html{ class: system_message_class } = render "layouts/head", { startup_filename: 'signin' } @@ -10,14 +11,13 @@ .container.navless-container .content = render "layouts/flash" - - if current_appearance&.description? + - if custom_text.present? .row .col-md.order-12.sm-bg-gray-10 .col-sm-12 %h1.mb-3.gl-font-size-h2 = brand_title - = brand_text - = render_if_exists 'layouts/devise_help_text' + = custom_text .col-md.order-md-12 .col-sm-12.bar .gl-text-center @@ -29,7 +29,6 @@ = brand_image %h1.mb-3.gl-font-size-h2 = brand_title - = render_if_exists 'layouts/devise_help_text' .mb-3 .gl-w-half.gl-xs-w-full.gl-ml-auto.gl-mr-auto.bar = yield @@ -49,8 +48,8 @@ .col-md-6.order-12.order-sm-1.brand-holder - unless recently_confirmed_com? = brand_image - - if current_appearance&.description? - = brand_text + - if custom_text.present? + = custom_text - else %h3.gl-sm-mt-0 = _('A complete DevOps platform') @@ -61,11 +60,6 @@ %p = _('This is a self-managed instance of GitLab.') - - if Gitlab::CurrentSettings.sign_in_text.present? - = markdown_field(Gitlab::CurrentSettings.current_application_settings, :sign_in_text) - - = render_if_exists 'layouts/devise_help_text' - .col-md-6.order-1.new-session-forms-container{ class: recently_confirmed_com? ? 'order-sm-first' : 'order-sm-12' } = yield diff --git a/app/views/layouts/fullscreen.html.haml b/app/views/layouts/fullscreen.html.haml index f4f9f39c20e..da192822902 100644 --- a/app/views/layouts/fullscreen.html.haml +++ b/app/views/layouts/fullscreen.html.haml @@ -17,7 +17,7 @@ = render "layouts/broadcast" = yield :flash_message = render "layouts/flash", flash_container_no_margin: true - .content-wrapper{ id: "content-body", class: "d-flex flex-column align-items-stretch" } + .content-wrapper{ id: "content-body", class: "d-flex flex-column align-items-stretch gl-p-0" } = yield - unless minimal = render "layouts/nav/top_nav_responsive", class: "gl-flex-grow-1 gl-overflow-y-auto" diff --git a/app/views/layouts/group.html.haml b/app/views/layouts/group.html.haml index 1f742279756..c75b02aa6a6 100644 --- a/app/views/layouts/group.html.haml +++ b/app/views/layouts/group.html.haml @@ -9,6 +9,7 @@ - content_for :flash_message do = dispensable_render_if_exists "groups/storage_enforcement_alert", context: @group = dispensable_render_if_exists "shared/namespace_storage_limit_alert", context: @group + = dispensable_render_if_exists "shared/namespace_combined_storage_users_alert", context: @group - content_for :page_specific_javascripts do - if current_user @@ -20,6 +21,8 @@ = render 'groups/invite_members_modal', group: @group = dispensable_render_if_exists "shared/web_hooks/group_web_hook_disabled_alert" += dispensable_render_if_exists "shared/code_suggestions_alert" += dispensable_render_if_exists "shared/code_suggestions_third_party_alert", source: @group = dispensable_render_if_exists "shared/free_user_cap_alert", source: @group = dispensable_render_if_exists "shared/unlimited_members_during_trial_alert", resource: @group diff --git a/app/views/layouts/header/_current_user_dropdown.html.haml b/app/views/layouts/header/_current_user_dropdown.html.haml index 1739dee1511..65dbafc19da 100644 --- a/app/views/layouts/header/_current_user_dropdown.html.haml +++ b/app/views/layouts/header/_current_user_dropdown.html.haml @@ -42,9 +42,8 @@ %li.d-md-none = link_to _("Switch to GitLab Next"), Gitlab::Saas.canary_toggle_com_url, data: { track_action: "click_link", track_label: "switch_to_canary", track_property: "navigation_top" } - - if Feature.enabled?(:super_sidebar_nav, current_user) - %li.divider - .js-new-nav-toggle{ data: { enabled: show_super_sidebar?.to_s, endpoint: profile_preferences_url} } + %li.divider + .js-new-nav-toggle{ data: { enabled: show_super_sidebar?.to_s, endpoint: profile_preferences_url} } - if current_user_menu?(:sign_out) %li.divider diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index 7156a0e5931..2c6ccb4abaf 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -29,7 +29,7 @@ .navbar-collapse.gl-transition-medium.collapse.gl-mr-auto.global-search-container.hide-when-top-nav-responsive-open - search_menu_item = top_nav_search_menu_item_attrs %ul.nav.navbar-nav.gl-w-full.gl-align-items-center - %li.nav-item.header-search-new.gl-display-none.gl-lg-display-block.gl-w-full + %li.nav-item.header-search.gl-display-none.gl-lg-display-block.gl-w-full - unless current_controller?(:search) = render 'layouts/header_search' %li.nav-item{ class: 'd-none d-sm-inline-block d-lg-none' } diff --git a/app/views/layouts/header/_registration_enabled_callout.html.haml b/app/views/layouts/header/_registration_enabled_callout.html.haml index 5c70136a932..ee4644e9ff0 100644 --- a/app/views/layouts/header/_registration_enabled_callout.html.haml +++ b/app/views/layouts/header/_registration_enabled_callout.html.haml @@ -6,9 +6,9 @@ data: { feature_id: Users::CalloutsHelper::REGISTRATION_ENABLED_CALLOUT, dismiss_endpoint: callouts_path }}, close_button_options: { data: { testid: 'close-registration-enabled-callout' }}) do |c| - = c.body do + - c.with_body do = _("Your GitLab instance allows anyone to register for an account, which is a security risk on public-facing GitLab instances. You should deactivate new sign ups if public users aren't expected to register for an account.") - = c.actions do + - c.with_actions do = render Pajamas::ButtonComponent.new(variant: :confirm, href: general_admin_application_settings_path(anchor: 'js-signup-settings')) do = _('Deactivate') = render Pajamas::ButtonComponent.new(button_options: { class: 'js-close gl-ml-3'}) do diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml index 31d02324e68..4ecae875056 100644 --- a/app/views/layouts/project.html.haml +++ b/app/views/layouts/project.html.haml @@ -10,6 +10,7 @@ - content_for :flash_message do = dispensable_render_if_exists "projects/storage_enforcement_alert", context: @project = dispensable_render_if_exists "shared/namespace_storage_limit_alert", context: @project + = dispensable_render_if_exists "shared/namespace_combined_storage_users_alert", context: @project - content_for :project_javascripts do - project = @target_project || @project @@ -22,6 +23,8 @@ = render 'projects/invite_members_modal', project: @project = dispensable_render_if_exists "shared/web_hooks/web_hook_disabled_alert" += dispensable_render_if_exists "projects/code_suggestions_alert", project: @project += dispensable_render_if_exists "projects/code_suggestions_third_party_alert", project: @project = dispensable_render_if_exists "projects/free_user_cap_alert", project: @project = dispensable_render_if_exists 'shared/unlimited_members_during_trial_alert', resource: @project diff --git a/app/views/layouts/terms.html.haml b/app/views/layouts/terms.html.haml index 71c622d7a62..9a50e3e2eb2 100644 --- a/app/views/layouts/terms.html.haml +++ b/app/views/layouts/terms.html.haml @@ -17,9 +17,9 @@ %div{ class: "#{container_class} limit-container-width" } .content{ id: "content-body" } = render Pajamas::CardComponent.new do |c| - = c.header do + - c.with_header do = brand_header_logo({add_gitlab_black_text: true}) - = c.body do + - c.with_body do - if header_link?(:user_dropdown) .navbar-collapse %ul.nav.navbar-nav |