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

Adjust dropdown item and header padding to comply with design specs

This commit is contained in:
Winnie Hellmann 2018-12-10 14:29:16 +00:00 committed by Kushal Pandya
parent 2d85d362c6
commit b0f4ad2e06
5 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/assets/stylesheets/framework/dropdowns.scss
View File

@ -176,9 +176,9 @@
display: block; display: block;
font-weight: $gl-font-weight-normal; font-weight: $gl-font-weight-normal;
position: relative; position: relative;
padding: 8px 16px; padding: $dropdown-item-padding-y $dropdown-item-padding-x;
color: $gl-text-color; color: $gl-text-color;
line-height: normal; line-height: $gl-btn-line-height;
white-space: normal; white-space: normal;
overflow: hidden; overflow: hidden;
text-align: left; text-align: left;
@ -319,8 +319,8 @@
.dropdown-header { .dropdown-header {
color: $gl-text-color-secondary; color: $gl-text-color-secondary;
font-size: 13px; font-size: 13px;
line-height: 22px; line-height: $gl-line-height;
padding: 8px 16px; padding: $dropdown-item-padding-y $dropdown-item-padding-x;
} }
&.capitalize-header .dropdown-header { &.capitalize-header .dropdown-header {
@ -329,13 +329,8 @@
.dropdown-bold-header { .dropdown-bold-header {
font-weight: $gl-font-weight-bold; font-weight: $gl-font-weight-bold;
line-height: 22px; line-height: $gl-line-height;
padding: 0 16px; padding: $dropdown-item-padding-y $dropdown-item-padding-x;
}
.separator + .dropdown-header,
.separator + .dropdown-bold-header {
padding-top: 10px;
} }
.unclickable { .unclickable {

8
app/assets/stylesheets/framework/header.scss
View File

@ -127,12 +127,6 @@
} }
} }
li.dropdown-bold-header {
color: $gl-text-color-secondary;
font-size: 12px;
padding: 0 16px;
}
.navbar-collapse { .navbar-collapse {
flex: 0 0 auto; flex: 0 0 auto;
border-top: 0; border-top: 0;
@ -541,7 +535,7 @@
left: auto; left: auto;
li.current-user { li.current-user {
padding: 5px 18px; padding: $dropdown-item-padding-y $dropdown-item-padding-x;
.user-name { .user-name {
display: block; display: block;

2
app/assets/stylesheets/framework/variables_overrides.scss
View File

@ -21,6 +21,8 @@ $danger: $red-500;
$zindex-modal-backdrop: 1040; $zindex-modal-backdrop: 1040;
$nav-divider-margin-y: ($grid-size / 2); $nav-divider-margin-y: ($grid-size / 2);
$dropdown-divider-bg: $theme-gray-200; $dropdown-divider-bg: $theme-gray-200;
$dropdown-item-padding-y: 8px;
$dropdown-item-padding-x: 12px;
$popover-max-width: 300px; $popover-max-width: 300px;
$popover-border-width: 1px; $popover-border-width: 1px;
$popover-border-color: $border-color; $popover-border-color: $border-color;

2
app/assets/stylesheets/pages/search.scss
View File

@ -101,8 +101,6 @@ input[type='checkbox']:hover {
.dropdown-header { .dropdown-header {
// Necessary because glDropdown doesn't support a second style of headers // Necessary because glDropdown doesn't support a second style of headers
font-weight: $gl-font-weight-bold; font-weight: $gl-font-weight-bold;
// .dropdown-menu li has 1px side padding
padding: $gl-padding-8 17px;
color: $gl-text-color; color: $gl-text-color;
font-size: $gl-font-size; font-size: $gl-font-size;
line-height: 16px; line-height: 16px;

5
changelogs/unreleased/winh-dropdown-item-padding.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Adjust dropdown item and header padding to comply with design specs
merge_request: 23552
author:
type: changed