diff options
| author | George Tsiolis <tsiolis.g@gmail.com> | 2018-11-20 23:36:14 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2018-11-20 23:36:14 +0000 |
| commit | 516e8b2b22fe2f492c3d8dc3d48687bff49d0d35 (patch) | |
| tree | bc39dd681d59b09ac7607bf872cfeb202225ea1b | |
| parent | ec4fa1f5bd4f18b5dce88b03f1fedcb05e50d4cc (diff) | |
| download | gitlab-ce-516e8b2b22fe2f492c3d8dc3d48687bff49d0d35.tar.gz | |
Align issue status label and confidential icon
4 files changed, 9 insertions, 7 deletions
diff --git a/app/assets/stylesheets/framework/issue_box.scss b/app/assets/stylesheets/framework/issue_box.scss index 2d672e62e08..a66604e56ff 100644 --- a/app/assets/stylesheets/framework/issue_box.scss +++ b/app/assets/stylesheets/framework/issue_box.scss @@ -22,7 +22,7 @@ margin-right: 10px; color: $white-light; font-size: $gl-font-size; - line-height: 25px; + line-height: $gl-line-height-24; &.status-box-closed, &.status-box-mr-closed { diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index f4540146a25..b43bb3feef5 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -271,6 +271,7 @@ $context-header-height: 60px; $breadcrumb-min-height: 48px; $project-title-row-height: 24px; $gl-line-height: 16px; +$gl-line-height-24: 24px; /* * Common component specific colors diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 38851de6401..415583cc1c7 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -6,19 +6,16 @@ .issuable-warning-icon { background-color: $orange-100; border-radius: $border-radius-default; - margin: 0 $btn-side-margin 0 0; width: $issuable-warning-size; height: $issuable-warning-size; text-align: center; + margin-right: $issuable-warning-icon-margin; + line-height: $gl-line-height-24; .icon { fill: $orange-600; vertical-align: text-bottom; } - - &:first-of-type { - margin-right: $issuable-warning-icon-margin; - } } .limit-container-width { @@ -689,7 +686,6 @@ flex: 1; display: inline-block; font-size: 14px; - line-height: 24px; align-self: center; overflow: hidden; text-overflow: ellipsis; diff --git a/changelogs/unreleased/gt-align-issue-status-and-confidential-icon.yml b/changelogs/unreleased/gt-align-issue-status-and-confidential-icon.yml new file mode 100644 index 00000000000..481ce656dc7 --- /dev/null +++ b/changelogs/unreleased/gt-align-issue-status-and-confidential-icon.yml @@ -0,0 +1,5 @@ +--- +title: Align issue status label and confidential icon. +merge_request: 23046 +author: George Tsiolis +type: fixed |