Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
b0f4ad2e
Commit
b0f4ad2e
authored
6 years ago
by
Winnie Hellmann
Committed by
Kushal Pandya
6 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adjust dropdown item and header padding to comply with design specs
parent
2d85d362
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
20 deletions
+14
-20
app/assets/stylesheets/framework/dropdowns.scss
app/assets/stylesheets/framework/dropdowns.scss
+6
-11
app/assets/stylesheets/framework/header.scss
app/assets/stylesheets/framework/header.scss
+1
-7
app/assets/stylesheets/framework/variables_overrides.scss
app/assets/stylesheets/framework/variables_overrides.scss
+2
-0
app/assets/stylesheets/pages/search.scss
app/assets/stylesheets/pages/search.scss
+0
-2
changelogs/unreleased/winh-dropdown-item-padding.yml
changelogs/unreleased/winh-dropdown-item-padding.yml
+5
-0
No files found.
app/assets/stylesheets/framework/dropdowns.scss
View file @
b0f4ad2e
...
...
@@ -176,9 +176,9 @@
display
:
block
;
font-weight
:
$gl-font-weight-normal
;
position
:
relative
;
padding
:
8px
16p
x
;
padding
:
$dropdown-item-padding-y
$dropdown-item-padding-
x
;
color
:
$gl-text-color
;
line-height
:
normal
;
line-height
:
$gl-btn-line-height
;
white-space
:
normal
;
overflow
:
hidden
;
text-align
:
left
;
...
...
@@ -319,8 +319,8 @@
.dropdown-header
{
color
:
$gl-text-color-secondary
;
font-size
:
13px
;
line-height
:
22px
;
padding
:
8px
16p
x
;
line-height
:
$gl-line-height
;
padding
:
$dropdown-item-padding-y
$dropdown-item-padding-
x
;
}
&
.capitalize-header
.dropdown-header
{
...
...
@@ -329,13 +329,8 @@
.dropdown-bold-header
{
font-weight
:
$gl-font-weight-bold
;
line-height
:
22px
;
padding
:
0
16px
;
}
.separator
+
.dropdown-header
,
.separator
+
.dropdown-bold-header
{
padding-top
:
10px
;
line-height
:
$gl-line-height
;
padding
:
$dropdown-item-padding-y
$dropdown-item-padding-x
;
}
.unclickable
{
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/framework/header.scss
View file @
b0f4ad2e
...
...
@@ -127,12 +127,6 @@
}
}
li
.dropdown-bold-header
{
color
:
$gl-text-color-secondary
;
font-size
:
12px
;
padding
:
0
16px
;
}
.navbar-collapse
{
flex
:
0
0
auto
;
border-top
:
0
;
...
...
@@ -541,7 +535,7 @@
left
:
auto
;
li
.current-user
{
padding
:
5px
18p
x
;
padding
:
$dropdown-item-padding-y
$dropdown-item-padding-
x
;
.user-name
{
display
:
block
;
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/framework/variables_overrides.scss
View file @
b0f4ad2e
...
...
@@ -21,6 +21,8 @@ $danger: $red-500;
$zindex-modal-backdrop
:
1040
;
$nav-divider-margin-y
:
(
$grid-size
/
2
);
$dropdown-divider-bg
:
$theme-gray-200
;
$dropdown-item-padding-y
:
8px
;
$dropdown-item-padding-x
:
12px
;
$popover-max-width
:
300px
;
$popover-border-width
:
1px
;
$popover-border-color
:
$border-color
;
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/pages/search.scss
View file @
b0f4ad2e
...
...
@@ -101,8 +101,6 @@ input[type='checkbox']:hover {
.dropdown-header
{
// Necessary because glDropdown doesn't support a second style of headers
font-weight
:
$gl-font-weight-bold
;
// .dropdown-menu li has 1px side padding
padding
:
$gl-padding-8
17px
;
color
:
$gl-text-color
;
font-size
:
$gl-font-size
;
line-height
:
16px
;
...
...
This diff is collapsed.
Click to expand it.
changelogs/unreleased/winh-dropdown-item-padding.yml
0 → 100644
View file @
b0f4ad2e
---
title
:
Adjust dropdown item and header padding to comply with design specs
merge_request
:
23552
author
:
type
:
changed
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment