diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-09-24 09:16:33 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-09-24 09:16:33 +0000 |
| commit | e9b13d1854b7b5f3258558f10e3d9e7f8d8ebc03 (patch) | |
| tree | eba228fda85529de79e32dde63f313253dcb2776 | |
| parent | 05048e1533ca2511b56e32b76dbb47fc35cf34ce (diff) | |
| parent | 9a3b1504dc15afe93d3fd661fea533af941f32f0 (diff) | |
| download | gitlab-ce-e9b13d1854b7b5f3258558f10e3d9e7f8d8ebc03.tar.gz | |
Merge branch 'fix/help-text-font-color-in-merge-request-creation' into 'master'
Fixes WIP text with two different colors in MR edit page
Transforms a `p` element in a `div` to guarantee WIP
the explanation is rendered inside `text-muted`
See merge request gitlab-org/gitlab-ce!21740
| -rw-r--r-- | app/views/shared/issuable/form/_title.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-help-text-font-color-in-merge-request-creation.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/shared/issuable/form/_title.html.haml b/app/views/shared/issuable/form/_title.html.haml index e49bdec386a..56c4b021eab 100644 --- a/app/views/shared/issuable/form/_title.html.haml +++ b/app/views/shared/issuable/form/_title.html.haml @@ -9,7 +9,7 @@ autocomplete: 'off', class: 'form-control pad qa-issuable-form-title', placeholder: _('Title') - if issuable.respond_to?(:work_in_progress?) - %p.form-text.text-muted + .form-text.text-muted .js-wip-explanation %a.js-toggle-wip{ href: '', tabindex: -1 } Remove the diff --git a/changelogs/unreleased/fix-help-text-font-color-in-merge-request-creation.yml b/changelogs/unreleased/fix-help-text-font-color-in-merge-request-creation.yml new file mode 100644 index 00000000000..4ac192cd056 --- /dev/null +++ b/changelogs/unreleased/fix-help-text-font-color-in-merge-request-creation.yml @@ -0,0 +1,5 @@ +--- +title: Fix wrong text color of help text in merge request creation +merge_request: +author: Gerard Montemayor +type: fixed |