Commit 50a00442 authored by Fatih Acet's avatar Fatih Acet

Merge branch '32657-fix-mr-widget-styles' into 'master'

MR widget styling fixes

Closes #32657

See merge request !11591
parents b8b0d594 563f6737
...@@ -210,7 +210,7 @@ export default { ...@@ -210,7 +210,7 @@ export default {
v-if="shouldShowMergeOptionsDropdown" v-if="shouldShowMergeOptionsDropdown"
:disabled="isMergeButtonDisabled" :disabled="isMergeButtonDisabled"
type="button" type="button"
class="btn btn-info dropdown-toggle" class="btn btn-small btn-info dropdown-toggle"
data-toggle="dropdown"> data-toggle="dropdown">
<i <i
class="fa fa-caret-down" class="fa fa-caret-down"
......
...@@ -209,8 +209,7 @@ ...@@ -209,8 +209,7 @@
} }
} }
.mr-widget-heading, .mr-widget-heading {
.mr-widget-body {
.btn-default.btn-xs { .btn-default.btn-xs {
margin-left: 5px; margin-left: 5px;
} }
...@@ -223,13 +222,17 @@ ...@@ -223,13 +222,17 @@
.btn-group .btn { .btn-group .btn {
padding: 5px 10px; padding: 5px 10px;
&.dropdown-toggle {
padding: 5px 7px;
}
} }
} }
.mr-widget-body { .mr-widget-body {
h4 { h4 {
font-weight: 600; font-weight: bold;
font-size: 16px; font-size: 15px;
margin: 5px 0; margin: 5px 0;
color: $gl-text-color; color: $gl-text-color;
...@@ -256,7 +259,6 @@ ...@@ -256,7 +259,6 @@
} }
.bold { .bold {
margin-left: 5px;
font-weight: bold; font-weight: bold;
font-size: 15px; font-size: 15px;
color: $gl-gray-light; color: $gl-gray-light;
...@@ -405,6 +407,12 @@ ...@@ -405,6 +407,12 @@
} }
} }
.mr-state-widget .mr-widget-body {
.approve-btn {
margin-right: 5px;
}
}
.mr_source_commit, .mr_source_commit,
.mr_target_commit { .mr_target_commit {
margin-bottom: 0; margin-bottom: 0;
...@@ -547,7 +555,7 @@ ...@@ -547,7 +555,7 @@
p { p {
float: left; float: left;
padding-left: 20px; padding-left: 21px;
&::before { &::before {
top: 13px; top: 13px;
......
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