diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
commit | a09983ae35713f5a2bbb100981116d31ce99826e (patch) | |
tree | 2ee2af7bd104d57086db360a7e6d8c9d5d43667a /app/assets/stylesheets/pages/labels.scss | |
parent | 18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff) |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'app/assets/stylesheets/pages/labels.scss')
-rw-r--r-- | app/assets/stylesheets/pages/labels.scss | 68 |
1 files changed, 6 insertions, 62 deletions
diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss index c3bac053a0a..73d2c3ca2f8 100644 --- a/app/assets/stylesheets/pages/labels.scss +++ b/app/assets/stylesheets/pages/labels.scss @@ -134,6 +134,11 @@ } } +.label-description-wrapper { + margin-right: 8px; + margin-left: 8px; +} + .prioritized-labels { margin-bottom: 30px; @@ -310,7 +315,6 @@ width: 200px; flex-shrink: 0; - .scoped-label-wrapper, .gl-label { line-height: $gl-line-height; } @@ -386,7 +390,7 @@ order: 3; width: 100%; - > .append-right-default.prepend-left-default { + > .label-description-wrapper { margin-left: 0; margin-right: 0; } @@ -415,40 +419,6 @@ color: $indigo-300; } -.scoped-label-wrapper { - max-width: 100%; - vertical-align: top; - - .badge { - text-overflow: ellipsis; - overflow-x: hidden; - } - - &.label-link .color-label a { - color: inherit; - } - - .color-label { - padding-right: $gl-padding-24; - max-width: 100%; - } - - .scoped-label { - position: absolute; - top: 4px; - right: 8px; - padding: 0; - margin: 0; - line-height: $gl-line-height; - } - - &.board-label { - .scoped-label { - top: 1px; - } - } -} - .gl-label-scoped { box-shadow: 0 0 0 2px currentColor inset; @@ -456,29 +426,3 @@ box-shadow: 0 0 0 1px inset; } } - -// Label inside title of Delete Label Modal -.modal-header .page-title { - .scoped-label-wrapper { - .scoped-label { - line-height: 20px; - } - - span.color-label { - padding-right: $gl-padding-24; - } - } -} - -// Don't hide the overflow in system messages -.system-note-message, -.issuable-details, -.md-preview-holder, -.referenced-commands, -.note-body { - .scoped-label-wrapper { - .badge { - overflow: initial; - } - } -} |