summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkushalpandya <kushal@gitlab.com>2017-05-22 13:30:33 +0530
committerkushalpandya <kushal@gitlab.com>2017-05-22 13:30:33 +0530
commit563f67377c0554a21b2f90a251f7787b83e3f447 (patch)
treee85bc2c8a4c55fb5b402e03e43a764349ef212cc
parente15aee2b51e4f03972fba490e2974a761acccf6c (diff)
downloadgitlab-ce-32657-fix-mr-widget-styles.tar.gz
MR widget styling fixes32657-fix-mr-widget-styles
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js2
-rw-r--r--app/assets/stylesheets/pages/merge_requests.scss20
2 files changed, 15 insertions, 7 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js
index 74613a1089e..d866d4e94b0 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js
@@ -210,7 +210,7 @@ export default {
v-if="shouldShowMergeOptionsDropdown"
:disabled="isMergeButtonDisabled"
type="button"
- class="btn btn-info dropdown-toggle"
+ class="btn btn-small btn-info dropdown-toggle"
data-toggle="dropdown">
<i
class="fa fa-caret-down"
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 1ac9d5af21d..183be86f650 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -209,8 +209,7 @@
}
}
- .mr-widget-heading,
- .mr-widget-body {
+ .mr-widget-heading {
.btn-default.btn-xs {
margin-left: 5px;
}
@@ -223,13 +222,17 @@
.btn-group .btn {
padding: 5px 10px;
+
+ &.dropdown-toggle {
+ padding: 5px 7px;
+ }
}
}
.mr-widget-body {
h4 {
- font-weight: 600;
- font-size: 16px;
+ font-weight: bold;
+ font-size: 15px;
margin: 5px 0;
color: $gl-text-color;
@@ -256,7 +259,6 @@
}
.bold {
- margin-left: 5px;
font-weight: bold;
font-size: 15px;
color: $gl-gray-light;
@@ -405,6 +407,12 @@
}
}
+.mr-state-widget .mr-widget-body {
+ .approve-btn {
+ margin-right: 5px;
+ }
+}
+
.mr_source_commit,
.mr_target_commit {
margin-bottom: 0;
@@ -547,7 +555,7 @@
p {
float: left;
- padding-left: 20px;
+ padding-left: 21px;
&::before {
top: 13px;