diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-12-22 21:46:59 +0000 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-12-22 21:46:59 +0000 |
| commit | bd306807e1779ab86d2d8092b133861a7011bf00 (patch) | |
| tree | fc227227931ef7a253f76242202d924f7e12c365 | |
| parent | 05347e0748118d95724e2bd842f690cba5b03f8e (diff) | |
| parent | c60585a185d9e8ed0c4148a0a319e8672414c36f (diff) | |
| download | gitlab-ce-bd306807e1779ab86d2d8092b133861a7011bf00.tar.gz | |
Merge branch '25941-odd-overflow-behavior-for-long-issue-headers' into 'master'
Change earlier to task_status_short to avoid titlebar line wraps
Closes #25941
See merge request !8275
| -rw-r--r-- | app/helpers/issuables_helper.rb | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/25941-odd-overflow-behavior-for-long-issue-headers.yml | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb index 8231f8fa334..1c213983a5b 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -96,8 +96,8 @@ module IssuablesHelper if issuable.tasks? output << " ".html_safe - output << content_tag(:span, issuable.task_status, id: "task_status", class: "hidden-xs") - output << content_tag(:span, issuable.task_status_short, id: "task_status_short", class: "hidden-sm hidden-md hidden-lg") + output << content_tag(:span, issuable.task_status, id: "task_status", class: "hidden-xs hidden-sm") + output << content_tag(:span, issuable.task_status_short, id: "task_status_short", class: "hidden-md hidden-lg") end output diff --git a/changelogs/unreleased/25941-odd-overflow-behavior-for-long-issue-headers.yml b/changelogs/unreleased/25941-odd-overflow-behavior-for-long-issue-headers.yml new file mode 100644 index 00000000000..c28cf7a0f86 --- /dev/null +++ b/changelogs/unreleased/25941-odd-overflow-behavior-for-long-issue-headers.yml @@ -0,0 +1,4 @@ +--- +title: Change earlier to task_status_short to avoid titlebar line wraps +merge_request: +author: |