BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
3109623d
Commit
3109623d
authored
Jul 28, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '34921-global-dropdown-ui-improvement' into 'master'
Global nav (9.0) UI improvement Closes #34921 See merge request !12772
parents
ba81e6de
cc25e2ba
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
8 deletions
+12
-8
dropdowns.scss
app/assets/stylesheets/framework/dropdowns.scss
+5
-7
filters.scss
app/assets/stylesheets/framework/filters.scss
+2
-1
projects.scss
app/assets/stylesheets/pages/projects.scss
+1
-0
34921-global-dropdown-ui-improvement.yml
...elogs/unreleased/34921-global-dropdown-ui-improvement.yml
+4
-0
No files found.
app/assets/stylesheets/framework/dropdowns.scss
View file @
3109623d
...
...
@@ -148,7 +148,6 @@
padding
:
5px
8px
;
color
:
$gl-text-color
;
line-height
:
initial
;
text-overflow
:
ellipsis
;
border-radius
:
2px
;
white-space
:
nowrap
;
overflow
:
hidden
;
...
...
@@ -203,11 +202,6 @@
border-radius
:
$border-radius-base
;
box-shadow
:
0
2px
4px
$dropdown-shadow-color
;
@media
(
max-width
:
$screen-sm-min
)
{
width
:
100%
;
min-width
:
180px
;
}
&
.dropdown-open-left
{
right
:
0
;
left
:
auto
;
...
...
@@ -289,6 +283,11 @@
padding
:
5px
8px
;
color
:
$gl-text-color-secondary
;
}
.badge
+
span
:not
(
.badge
)
{
// Expects up to 3 digits on the badge
margin-right
:
40px
;
}
}
.droplab-dropdown
{
...
...
@@ -373,7 +372,6 @@
.dropdown-menu
,
.dropdown-menu-nav
{
max-width
:
280px
;
width
:
auto
;
}
}
...
...
app/assets/stylesheets/framework/filters.scss
View file @
3109623d
...
...
@@ -393,7 +393,8 @@
@media
(
max-width
:
$screen-xs
)
{
.filter-dropdown-container
{
.dropdown-toggle
,
.dropdown
{
.dropdown
,
.dropdown-menu
{
width
:
100%
;
}
...
...
app/assets/stylesheets/pages/projects.scss
View file @
3109623d
...
...
@@ -707,6 +707,7 @@ pre.light-well {
background-color
:
transparent
;
border
:
0
;
text-align
:
left
;
text-overflow
:
ellipsis
;
}
.protected-branches-list
,
...
...
changelogs/unreleased/34921-global-dropdown-ui-improvement.yml
0 → 100644
View file @
3109623d
---
title
:
Improve CSS for global nav dropdown UI
merge_request
:
12772
author
:
Takuya Noguchi
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