diff options
-rw-r--r-- | app/assets/stylesheets/framework/panels.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/commits.scss | 4 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/cycle_analytics.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/groups.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/members.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/milestone.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/settings.scss | 2 | ||||
-rw-r--r-- | app/views/projects/merge_requests/creations/_new_compare.html.haml | 6 |
9 files changed, 10 insertions, 14 deletions
diff --git a/app/assets/stylesheets/framework/panels.scss b/app/assets/stylesheets/framework/panels.scss index c1ae3f851c8..5ca4d944d73 100644 --- a/app/assets/stylesheets/framework/panels.scss +++ b/app/assets/stylesheets/framework/panels.scss @@ -8,7 +8,7 @@ } -.card-heading { +.card-header { padding: $gl-vert-padding $gl-padding; line-height: 36px; diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss index 6b1084e568a..8ba6fcf6de5 100644 --- a/app/assets/stylesheets/pages/commits.scss +++ b/app/assets/stylesheets/pages/commits.scss @@ -180,10 +180,6 @@ justify-content: space-between; align-items: center; flex-grow: 1; - - .merge-request-branches & { - flex-direction: column; - } } .commit-content { diff --git a/app/assets/stylesheets/pages/cycle_analytics.scss b/app/assets/stylesheets/pages/cycle_analytics.scss index 236fb090dee..a22c666a525 100644 --- a/app/assets/stylesheets/pages/cycle_analytics.scss +++ b/app/assets/stylesheets/pages/cycle_analytics.scss @@ -213,7 +213,7 @@ .stage-panel { min-width: 968px; - .card-heading { + .card-header { padding: 0; background-color: transparent; } diff --git a/app/assets/stylesheets/pages/groups.scss b/app/assets/stylesheets/pages/groups.scss index 78538be5541..8be7af627b2 100644 --- a/app/assets/stylesheets/pages/groups.scss +++ b/app/assets/stylesheets/pages/groups.scss @@ -2,7 +2,7 @@ @include str-truncated(90%); } -.dashboard .side .card .card-heading .input-group { +.dashboard .side .card .card-header .input-group { .form-control { height: 42px; diff --git a/app/assets/stylesheets/pages/members.scss b/app/assets/stylesheets/pages/members.scss index e7f22228619..e9581003aae 100644 --- a/app/assets/stylesheets/pages/members.scss +++ b/app/assets/stylesheets/pages/members.scss @@ -167,7 +167,7 @@ } .card { - .card-heading { + .card-header { .badge.badge-pill { margin-top: 0; } diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index c2b8769131e..986d6fe8e97 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -499,7 +499,7 @@ } .card-new-merge-request { - .card-heading { + .card-header { padding: 5px 10px; font-weight: $gl-font-weight-bold; line-height: 25px; diff --git a/app/assets/stylesheets/pages/milestone.scss b/app/assets/stylesheets/pages/milestone.scss index 4075c695208..a3dd20e08eb 100644 --- a/app/assets/stylesheets/pages/milestone.scss +++ b/app/assets/stylesheets/pages/milestone.scss @@ -31,7 +31,7 @@ } } - .card-heading { + .card-header { line-height: $line-height-base; padding: 14px 16px; display: -webkit-flex; diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss index 03a33390c98..b60a45e8615 100644 --- a/app/assets/stylesheets/pages/settings.scss +++ b/app/assets/stylesheets/pages/settings.scss @@ -209,7 +209,7 @@ line-height: 12px; } - .card-heading .label-count { + .card-header .label-count { color: $white-light; background: $common-gray-dark; } diff --git a/app/views/projects/merge_requests/creations/_new_compare.html.haml b/app/views/projects/merge_requests/creations/_new_compare.html.haml index ab599cda74e..813f8a34f71 100644 --- a/app/views/projects/merge_requests/creations/_new_compare.html.haml +++ b/app/views/projects/merge_requests/creations/_new_compare.html.haml @@ -3,8 +3,8 @@ = form_for [@project.namespace.becomes(Namespace), @project, @merge_request], url: project_new_merge_request_path(@project), method: :get, html: { class: "merge-request-form form-inline js-requires-input" } do |f| .d-none.alert.alert-danger.mr-compare-errors - .merge-request-branches.js-merge-request-new-compare.row{ 'data-target-project-url': project_new_merge_request_update_branches_path(@source_project), 'data-source-branch-url': project_new_merge_request_branch_from_path(@source_project), 'data-target-branch-url': project_new_merge_request_branch_to_path(@source_project) } - .col-md-6 + .merge-request-branches.js-merge-request-new-compare.row.col-md-12{ 'data-target-project-url': project_new_merge_request_update_branches_path(@source_project), 'data-source-branch-url': project_new_merge_request_branch_from_path(@source_project), 'data-target-branch-url': project_new_merge_request_branch_to_path(@source_project) } + .col-md-6.pl-0 .card.card-new-merge-request .card-header Source branch @@ -33,7 +33,7 @@ .text-center= icon('spinner spin', class: 'js-source-loading') %ul.list-unstyled.mr_source_commit - .col-md-6 + .col-md-6.pl-0 .card.card-new-merge-request .card-header Target branch |