diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-12-12 21:44:59 -0600 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-12-13 00:11:57 -0600 |
| commit | a5439897d20b80274733605862d050b2abfb1cb3 (patch) | |
| tree | 53afa0537e6bce6891708cdc5a689594b1695459 /app/assets | |
| parent | 31fa9313991881258b4697cb507cfc8ab205b7dc (diff) | |
| download | gitlab-ce-a5439897d20b80274733605862d050b2abfb1cb3.tar.gz | |
Update issuable status icons33926-update-issuable-icons
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33926
Changed file icons already addressed in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15367
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/issue.js | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/issue_box.scss | 6 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 16 |
3 files changed, 18 insertions, 6 deletions
diff --git a/app/assets/javascripts/issue.js b/app/assets/javascripts/issue.js index 91b5ef1c10a..411c820cc43 100644 --- a/app/assets/javascripts/issue.js +++ b/app/assets/javascripts/issue.js @@ -48,7 +48,7 @@ export default class Issue { }) .fail(() => new Flash(issueFailMessage)) .done((data) => { - const isClosedBadge = $('div.status-box-closed'); + const isClosedBadge = $('div.status-box-issue-closed'); const isOpenBadge = $('div.status-box-open'); const projectIssuesCounter = $('.issue_counter'); diff --git a/app/assets/stylesheets/framework/issue_box.scss b/app/assets/stylesheets/framework/issue_box.scss index 1537b0744cc..1d8bd26cf1a 100644 --- a/app/assets/stylesheets/framework/issue_box.scss +++ b/app/assets/stylesheets/framework/issue_box.scss @@ -24,10 +24,14 @@ font-size: $gl-font-size; line-height: 25px; - &.status-box-closed { + &.status-box-mr-closed { background-color: $gl-danger; } + &.status-box-issue-closed { + background-color: $gl-primary; + } + &.status-box-merged { background-color: $gl-primary; } diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 8f8f11e3857..e19196e0c41 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -610,11 +610,19 @@ } .issuable-status-box { - float: none; - display: inline-block; + align-self: stretch; + display: flex; + justify-content: center; + align-items: center; margin-top: 0; - height: auto; - align-self: center; + padding-left: 9px; + padding-right: 9px; + + @media (min-width: $screen-sm-min) { + display: inline-block; + height: auto; + align-self: center; + } } .issuable-gutter-toggle { |