Commit 1f6278af authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch '46884-remove-card-title' into 'master'

Remove card-title in card-header

Closes #46884

See merge request gitlab-org/gitlab-ce!19335
parents b887d106 55826e77
...@@ -238,10 +238,6 @@ h3.popover-header { ...@@ -238,10 +238,6 @@ h3.popover-header {
} }
.card { .card {
.card-title {
margin-bottom: 0;
}
&.card-without-border { &.card-without-border {
@extend .border-0; @extend .border-0;
} }
...@@ -255,13 +251,6 @@ h3.popover-header { ...@@ -255,13 +251,6 @@ h3.popover-header {
} }
} }
.card-header {
h3.card-title,
h4.card-title {
margin-top: 0;
}
}
.nav-tabs { .nav-tabs {
// Override bootstrap's default border // Override bootstrap's default border
border-bottom: 0; border-bottom: 0;
......
...@@ -53,8 +53,3 @@ ...@@ -53,8 +53,3 @@
margin-top: $gl-padding; margin-top: $gl-padding;
} }
} }
.card-title {
font-size: inherit;
line-height: inherit;
}
...@@ -19,10 +19,6 @@ ...@@ -19,10 +19,6 @@
justify-content: space-between; justify-content: space-between;
line-height: $line-height-base; line-height: $line-height-base;
.card-title {
display: flex;
align-items: center;
.logo-text { .logo-text {
width: 55px; width: 55px;
height: 24px; height: 24px;
...@@ -30,7 +26,6 @@ ...@@ -30,7 +26,6 @@
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
} }
}
.navbar-collapse { .navbar-collapse {
padding-right: 0; padding-right: 0;
......
...@@ -63,7 +63,6 @@ ...@@ -63,7 +63,6 @@
.card .card
.card-header .card-header
%h3.card-title
= _('Projects') = _('Projects')
%span.badge.badge-pill %span.badge.badge-pill
#{@group.projects.count} #{@group.projects.count}
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
.content{ id: "content-body" } .content{ id: "content-body" }
.card .card
.card-header .card-header
.card-title
= brand_header_logo = brand_header_logo
- logo_text = brand_header_logo_type - logo_text = brand_header_logo_type
- if logo_text.present? - if logo_text.present?
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
.card.prepend-top-10 .card.prepend-top-10
.card-header .card-header
%h4.card-title
= panel_title = panel_title
%ul.content-list.all-branches %ul.content-list.all-branches
- branches.first(overview_max_branches).each do |branch| - branches.first(overview_max_branches).each do |branch|
......
.protected-branches-list.js-protected-branches-list.qa-protected-branches-list .protected-branches-list.js-protected-branches-list.qa-protected-branches-list
- if @protected_branches.empty? - if @protected_branches.empty?
.card-header.bg-white .card-header.bg-white
%h3.card-title.mb-0
Protected branch (#{@protected_branches_count}) Protected branch (#{@protected_branches_count})
%p.settings-message.text-center %p.settings-message.text-center
There are currently no protected branches, protect a branch with the form above. There are currently no protected branches, protect a branch with the form above.
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
%input{ type: 'hidden', name: 'update_section', value: 'js-protected-branches-settings' } %input{ type: 'hidden', name: 'update_section', value: 'js-protected-branches-settings' }
.card .card
.card-header .card-header
%h3.card-title
Protect a branch Protect a branch
.card-body .card-body
= form_errors(@protected_branch) = form_errors(@protected_branch)
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
%input{ type: 'hidden', name: 'update_section', value: 'js-protected-tags-settings' } %input{ type: 'hidden', name: 'update_section', value: 'js-protected-tags-settings' }
.card .card
.card-header .card-header
%h3.card-title
Protect a tag Protect a tag
.card-body .card-body
= form_errors(@protected_tag) = form_errors(@protected_tag)
......
.protected-tags-list.js-protected-tags-list .protected-tags-list.js-protected-tags-list
- if @protected_tags.empty? - if @protected_tags.empty?
.card-header .card-header
%h3.card-title
Protected tag (#{@protected_tags_count}) Protected tag (#{@protected_tags_count})
%p.settings-message.text-center %p.settings-message.text-center
There are currently no protected tags, protect a tag with the form above. There are currently no protected tags, protect a tag with the form above.
......
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
.col-lg-12 .col-lg-12
.card .card
.card-header .card-header
%h4.card-title
= s_('ContainerRegistry|How to use the Container Registry') = s_('ContainerRegistry|How to use the Container Registry')
.card-body .card-body
%p %p
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
.card.js-panel-monitored-metrics{ data: { active_metrics: active_common_project_prometheus_metrics_path(project, :json), metrics_help_path: help_page_path('user/project/integrations/prometheus_library/metrics') } } .card.js-panel-monitored-metrics{ data: { active_metrics: active_common_project_prometheus_metrics_path(project, :json), metrics_help_path: help_page_path('user/project/integrations/prometheus_library/metrics') } }
.card-header .card-header
%h3.card-title
= s_('PrometheusService|Common metrics') = s_('PrometheusService|Common metrics')
%span.badge.badge-pill.js-monitored-count 0 %span.badge.badge-pill.js-monitored-count 0
.card-body .card-body
...@@ -17,7 +16,6 @@ ...@@ -17,7 +16,6 @@
.card.hidden.js-panel-missing-env-vars .card.hidden.js-panel-missing-env-vars
.card-header .card-header
%h3.card-title
= icon('caret-right lg fw', class: 'panel-toggle js-panel-toggle', 'aria-label' => 'Toggle panel') = icon('caret-right lg fw', class: 'panel-toggle js-panel-toggle', 'aria-label' => 'Toggle panel')
= s_('PrometheusService|Missing environment variable') = s_('PrometheusService|Missing environment variable')
%span.badge.badge-pill.js-env-var-count 0 %span.badge.badge-pill.js-env-var-count 0
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
= render "projects/triggers/content" = render "projects/triggers/content"
.card .card
.card-header .card-header
%h4.card-title
Manage your project's triggers Manage your project's triggers
.card-body .card-body
= render "projects/triggers/form", btn_text: "Add trigger" = render "projects/triggers/form", btn_text: "Add trigger"
......
---
title: Remove .card-title from .card-header for BS4 migration
merge_request: 19335
author: Takuya Noguchi
type: other
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment