diff options
| author | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-08 00:06:39 +0000 |
|---|---|---|
| committer | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-08 00:06:39 +0000 |
| commit | e2bfceaad2f0ef17aa19823d9a2155ff44d7d6e2 (patch) | |
| tree | b0636a3dc58a538183bd2fb31fc36299dc99ebb6 | |
| parent | 58ae01cbdd0c78463673b8734bf457648d453240 (diff) | |
| parent | da4f95b2bd701356ad454ebcb47747207c8c6b9f (diff) | |
| download | gitlab-ce-e2bfceaad2f0ef17aa19823d9a2155ff44d7d6e2.tar.gz | |
Merge branch 'fix-card-header-titles' into 'master'
Fix card title h3 headers
See merge request gitlab-org/gitlab-ce!19510
| -rw-r--r-- | app/assets/stylesheets/bootstrap_migration.scss | 7 | ||||
| -rw-r--r-- | app/views/projects/protected_branches/shared/_branches_list.html.haml | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss index 0c5b6171223..79e59fb5263 100644 --- a/app/assets/stylesheets/bootstrap_migration.scss +++ b/app/assets/stylesheets/bootstrap_migration.scss @@ -233,6 +233,13 @@ table { } } +.card-header { + h3.card-title, + h4.card-title { + margin-top: 0; + } +} + .nav-tabs { // Override bootstrap's default border border-bottom: 0; diff --git a/app/views/projects/protected_branches/shared/_branches_list.html.haml b/app/views/projects/protected_branches/shared/_branches_list.html.haml index a2cd7752fc4..9a06eca89bb 100644 --- a/app/views/projects/protected_branches/shared/_branches_list.html.haml +++ b/app/views/projects/protected_branches/shared/_branches_list.html.haml @@ -1,7 +1,7 @@ .protected-branches-list.js-protected-branches-list.qa-protected-branches-list - if @protected_branches.empty? - .card-header - %h3.card-title + .card-header.bg-white + %h3.card-title.mb-0 Protected branch (#{@protected_branches_count}) %p.settings-message.text-center There are currently no protected branches, protect a branch with the form above. |