Commit 43bf9f42 authored by Clement Ho's avatar Clement Ho

Fix styles on new merge request compare page

parent d2f8a481
......@@ -8,7 +8,7 @@
}
.card-heading {
.card-header {
padding: $gl-vert-padding $gl-padding;
line-height: 36px;
......
......@@ -180,10 +180,6 @@
justify-content: space-between;
align-items: center;
flex-grow: 1;
.merge-request-branches & {
flex-direction: column;
}
}
.commit-content {
......
......@@ -213,7 +213,7 @@
.stage-panel {
min-width: 968px;
.card-heading {
.card-header {
padding: 0;
background-color: transparent;
}
......
......@@ -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;
......
......@@ -167,7 +167,7 @@
}
.card {
.card-heading {
.card-header {
.badge.badge-pill {
margin-top: 0;
}
......
......@@ -499,7 +499,7 @@
}
.card-new-merge-request {
.card-heading {
.card-header {
padding: 5px 10px;
font-weight: $gl-font-weight-bold;
line-height: 25px;
......
......@@ -31,7 +31,7 @@
}
}
.card-heading {
.card-header {
line-height: $line-height-base;
padding: 14px 16px;
display: -webkit-flex;
......
......@@ -209,7 +209,7 @@
line-height: 12px;
}
.card-heading .label-count {
.card-header .label-count {
color: $white-light;
background: $common-gray-dark;
}
......
......@@ -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
......
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