diff options
| author | Nathan Friend <nathan@gitlab.com> | 2019-08-15 00:09:46 +0300 |
|---|---|---|
| committer | Nathan Friend <nathan@gitlab.com> | 2019-08-15 00:13:09 +0300 |
| commit | 896af1acbd69010f5e9648a9b1d9ec59fb9fdd91 (patch) | |
| tree | ddc23ca8dd69be0b6cda7f3a70b828107207daef /app/assets/stylesheets/pages | |
| parent | b3aa0711f0b35af132329b957315aebdc8813edc (diff) | |
Add merge train helper text to MR widget (CE)
This commit adds a helper text that describes what will happen when a
user clicks the "Start/Add to merge train when pipeline succeeds"
button. This text appears at the bottom of the merge request widget.
In addition, this commit renames the "merge_train_info" component to
"merge_train_position_indicator" to avoid ambiguity with the
"merge_train_helper_text" component.
Diffstat (limited to 'app/assets/stylesheets/pages')
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 3c1e384d6ed..c8d155706a9 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -397,7 +397,6 @@ .mr-widget-help { padding: 10px 16px 10px ($gl-padding-8 * 7); - font-style: italic; } .ci-coverage { @@ -906,7 +905,7 @@ } .deploy-heading, -.merge-train-info { +.merge-train-position-indicator { @include media-breakpoint-up(md) { padding: $gl-padding-8 $gl-padding; } |