diff options
| author | Mike Greiling <mike@pixelcog.com> | 2019-01-03 00:17:16 +0300 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2019-01-03 00:17:16 +0300 |
| commit | a4833f6fe0b725a4ee312367a311ec075352fba2 (patch) | |
| tree | c256680bd3dccff2c8407cfda57c96b07c760136 /app/assets | |
| parent | 2d7c3dbf5c768ecddff9b6c1c897357ab2b923ff (diff) | |
| parent | e9ef02096be859e31c155174fe2784d8a7ba73e3 (diff) | |
Merge branch 'ccr/49289_milestone_link' into 'master'
Add project milestone link
Closes #49289
See merge request gitlab-org/gitlab-ce!22552
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/framework/issue_box.scss | 5 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/milestone.scss | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/app/assets/stylesheets/framework/issue_box.scss b/app/assets/stylesheets/framework/issue_box.scss index a66604e56ff..e51f230a680 100644 --- a/app/assets/stylesheets/framework/issue_box.scss +++ b/app/assets/stylesheets/framework/issue_box.scss @@ -45,9 +45,4 @@ &.status-box-upcoming { background: $gl-text-color-secondary; } - - &.status-box-milestone { - color: $gl-text-color; - background: $gray-darker; - } } diff --git a/app/assets/stylesheets/pages/milestone.scss b/app/assets/stylesheets/pages/milestone.scss index 1e92582d6d9..94bf32945fc 100644 --- a/app/assets/stylesheets/pages/milestone.scss +++ b/app/assets/stylesheets/pages/milestone.scss @@ -1,3 +1,5 @@ +$status-box-line-height: 26px; + .issues-sortable-list .str-truncated { max-width: 90%; } @@ -38,6 +40,7 @@ font-size: $tooltip-font-size; margin-top: 0; margin-right: $gl-padding-4; + line-height: $status-box-line-height; @include media-breakpoint-down(xs) { line-height: unset; |