diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-23 03:10:49 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-23 03:10:49 +0300 |
| commit | 5a21d6fde31839caf228d031faabb8c3a8e7cf7c (patch) | |
| tree | 556b3ea97bde4df6ed4a884f78bf5f531dc3d0b5 /app | |
| parent | 371ee68e5e2826595d44d5a589668579ce105bba (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/components/pajamas/banner_component.html.haml | 5 | ||||
| -rw-r--r-- | app/components/pajamas/banner_component.rb | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/app/components/pajamas/banner_component.html.haml b/app/components/pajamas/banner_component.html.haml index ebb88b305dc..ce380d611a0 100644 --- a/app/components/pajamas/banner_component.html.haml +++ b/app/components/pajamas/banner_component.html.haml @@ -1,8 +1,9 @@ -# This is using gl-card classes to match Vue component -# Here's the issue to refactor away from gl-card -# https://gitlab.com/gitlab-org/gitlab-ui/-/issues/2324 + .gl-banner.gl-card.gl-pl-6.gl-pr-8.gl-py-6{ @banner_options, class: banner_class } - .gl-display-flex + .gl-card-body.gl-display-flex.gl-p-0! - if illustration? .gl-banner-illustration = illustration @@ -11,7 +12,7 @@ = image_tag @svg_path, alt: "" .gl-banner-content - %h1.gl-banner-title= title + %h2.gl-banner-title= title = content diff --git a/app/components/pajamas/banner_component.rb b/app/components/pajamas/banner_component.rb index 5291db91fb2..8624464152c 100644 --- a/app/components/pajamas/banner_component.rb +++ b/app/components/pajamas/banner_component.rb @@ -36,8 +36,9 @@ module Pajamas def banner_class classes = [] - classes.push('gl-border-none') if @embedded + classes.push('gl-bg-gray-10!') unless introduction? classes.push('gl-banner-introduction') if introduction? + classes.push('gl-border-none!') if @embedded classes.join(' ') end |