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
8b7f4a6a
Commit
8b7f4a6a
authored
Aug 03, 2017
by
Winnie Hellmann
Committed by
Annabel Dunstone Gray
Aug 03, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use mixin for new dropdown style
parent
080cd74a
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
64 deletions
+11
-64
app/assets/stylesheets/framework/dropdowns.scss
app/assets/stylesheets/framework/dropdowns.scss
+6
-1
app/assets/stylesheets/framework/header.scss
app/assets/stylesheets/framework/header.scss
+2
-19
app/assets/stylesheets/pages/cycle_analytics.scss
app/assets/stylesheets/pages/cycle_analytics.scss
+2
-22
app/assets/stylesheets/pages/tree.scss
app/assets/stylesheets/pages/tree.scss
+1
-22
No files found.
app/assets/stylesheets/framework/dropdowns.scss
View file @
8b7f4a6a
...
@@ -725,7 +725,8 @@
...
@@ -725,7 +725,8 @@
// TODO: change global style and remove mixin
// TODO: change global style and remove mixin
@mixin
new-style-dropdown
{
@mixin
new-style-dropdown
{
.dropdown-menu
{
.dropdown-menu
,
.dropdown-menu-nav
{
li
{
li
{
padding
:
0
1px
;
padding
:
0
1px
;
...
@@ -766,4 +767,8 @@
...
@@ -766,4 +767,8 @@
}
}
}
}
}
}
.dropdown-menu-align-right
{
margin-top
:
2px
;
}
}
}
app/assets/stylesheets/framework/header.scss
View file @
8b7f4a6a
...
@@ -4,6 +4,8 @@
...
@@ -4,6 +4,8 @@
*/
*/
header
{
header
{
@include
new-style-dropdown
;
transition
:
padding
$sidebar-transition-duration
;
transition
:
padding
$sidebar-transition-duration
;
&
.navbar-empty
{
&
.navbar-empty
{
...
@@ -313,25 +315,6 @@ header {
...
@@ -313,25 +315,6 @@ header {
.impersonation
i
{
.impersonation
i
{
color
:
$red-500
;
color
:
$red-500
;
}
}
// TODO: fallback to global style
.dropdown-menu
,
.dropdown-menu-nav
{
li
{
padding
:
0
1px
;
a
{
border-radius
:
0
;
padding
:
8px
16px
;
&
:hover
,
&
:active
,
&
:focus
{
background-color
:
$gray-darker
;
}
}
}
}
}
}
.with-performance-bar
header
.navbar-gitlab
{
.with-performance-bar
header
.navbar-gitlab
{
...
...
app/assets/stylesheets/pages/cycle_analytics.scss
View file @
8b7f4a6a
#cycle-analytics
{
#cycle-analytics
{
@include
new-style-dropdown
;
max-width
:
1000px
;
max-width
:
1000px
;
margin
:
24px
auto
0
;
margin
:
24px
auto
0
;
position
:
relative
;
position
:
relative
;
...
@@ -110,10 +112,6 @@
...
@@ -110,10 +112,6 @@
.js-ca-dropdown
{
.js-ca-dropdown
{
top
:
$gl-padding-top
;
top
:
$gl-padding-top
;
.dropdown-menu-align-right
{
margin-top
:
2px
;
}
}
}
.content-list
{
.content-list
{
...
@@ -446,24 +444,6 @@
...
@@ -446,24 +444,6 @@
margin-bottom
:
20px
;
margin-bottom
:
20px
;
}
}
}
}
// TODO: fallback to global style
.dropdown-menu
{
li
{
padding
:
0
1px
;
a
{
border-radius
:
0
;
padding
:
8px
16px
;
&
:hover
,
&
:active
,
&
:focus
{
background-color
:
$gray-darker
;
}
}
}
}
}
}
.cycle-analytics-overview
{
.cycle-analytics-overview
{
...
...
app/assets/stylesheets/pages/tree.scss
View file @
8b7f4a6a
.tree-holder
{
.tree-holder
{
@include
new-style-dropdown
;
.nav-block
{
.nav-block
{
margin
:
10px
0
;
margin
:
10px
0
;
...
@@ -202,28 +203,6 @@
...
@@ -202,28 +203,6 @@
}
}
}
}
}
}
// TODO: fallback to global style
.dropdown-menu
:not
(
.dropdown-menu-selectable
)
{
li
{
padding
:
0
1px
;
&
.dropdown-header
{
padding
:
8px
16px
;
}
a
{
border-radius
:
0
;
padding
:
8px
16px
;
&
:hover
,
&
:active
,
&
:focus
{
background-color
:
$gray-darker
;
}
}
}
}
}
}
.blob-commit-info
{
.blob-commit-info
{
...
...
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