kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'gt-align-issue-status-and-confidential-icon' into 'master'

Browse source 
Align issue status label and confidential icon

Closes #53943

See merge request gitlab-org/gitlab-ce!23046
This commit is contained in:
Fatih Acet 2018-11-20 23:36:14 +00:00
commit 5eea16ad55
4 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/framework/issue_box.scss
View file

@ -22,7 +22,7 @@
margin-right: 10px; margin-right: 10px;
color: $white-light; color: $white-light;
font-size: $gl-font-size; font-size: $gl-font-size;
line-height: 25px; line-height: $gl-line-height-24;
&.status-box-closed, &.status-box-closed,
&.status-box-mr-closed { &.status-box-mr-closed {

1
app/assets/stylesheets/framework/variables.scss
View file

@ -271,6 +271,7 @@ $context-header-height: 60px;
$breadcrumb-min-height: 48px; $breadcrumb-min-height: 48px;
$project-title-row-height: 24px; $project-title-row-height: 24px;
$gl-line-height: 16px; $gl-line-height: 16px;
$gl-line-height-24: 24px;
/* /*
* Common component specific colors * Common component specific colors

8
app/assets/stylesheets/pages/issuable.scss
View file

@ -6,19 +6,16 @@
.issuable-warning-icon { .issuable-warning-icon {
background-color: $orange-100; background-color: $orange-100;
border-radius: $border-radius-default; border-radius: $border-radius-default;
margin: 0 $btn-side-margin 0 0;
width: $issuable-warning-size; width: $issuable-warning-size;
height: $issuable-warning-size; height: $issuable-warning-size;
text-align: center; text-align: center;
margin-right: $issuable-warning-icon-margin;
line-height: $gl-line-height-24;
.icon { .icon {
fill: $orange-600; fill: $orange-600;
vertical-align: text-bottom; vertical-align: text-bottom;
} }
&:first-of-type {
margin-right: $issuable-warning-icon-margin;
}
} }
.limit-container-width { .limit-container-width {
@ -689,7 +686,6 @@
flex: 1; flex: 1;
display: inline-block; display: inline-block;
font-size: 14px; font-size: 14px;
line-height: 24px;
align-self: center; align-self: center;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;

5
changelogs/unreleased/gt-align-issue-status-and-confidential-icon.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Align issue status label and confidential icon.
merge_request: 23046
author: George Tsiolis
type: fixed