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
0c4cda24
Commit
0c4cda24
authored
Oct 09, 2017
by
Winnie Hellmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make new dropdown-item-hover style global
parent
915d2b9b
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
39 deletions
+23
-39
app/assets/stylesheets/framework/dropdowns.scss
app/assets/stylesheets/framework/dropdowns.scss
+23
-39
No files found.
app/assets/stylesheets/framework/dropdowns.scss
View file @
0c4cda24
...
@@ -143,6 +143,16 @@
...
@@ -143,6 +143,16 @@
}
}
}
}
@mixin
dropdown-item-hover
{
background-color
:
$dropdown-item-hover-bg
;
color
:
$gl-text-color
;
// make sure the text color is not overriden
&
.text-danger
{
color
:
$brand-danger
;
}
}
@mixin
dropdown-link
{
@mixin
dropdown-link
{
display
:
block
;
display
:
block
;
position
:
relative
;
position
:
relative
;
...
@@ -159,9 +169,11 @@
...
@@ -159,9 +169,11 @@
}
}
&
:hover
,
&
:hover
,
&
:active
,
&
:focus
,
&
:focus
,
&
.is-focused
{
&
.is-focused
{
background-color
:
$dropdown-link-hover-bg
;
@include
dropdown-item-hover
;
text-decoration
:
none
;
text-decoration
:
none
;
.badge
{
.badge
{
...
@@ -239,6 +251,12 @@
...
@@ -239,6 +251,12 @@
text-align
:
left
;
text-align
:
left
;
list-style
:
none
;
list-style
:
none
;
padding
:
0
10px
;
padding
:
0
10px
;
a
,
button
,
.menu-item
{
@include
dropdown-link
;
}
}
}
.divider
{
.divider
{
...
@@ -260,10 +278,6 @@
...
@@ -260,10 +278,6 @@
background-color
:
$dropdown-divider-color
;
background-color
:
$dropdown-divider-color
;
}
}
a
{
@include
dropdown-link
;
}
.dropdown-menu-empty-item
a
{
.dropdown-menu-empty-item
a
{
&
:hover
,
&
:hover
,
&
:focus
{
&
:focus
{
...
@@ -314,6 +328,10 @@
...
@@ -314,6 +328,10 @@
padding
:
$gl-btn-padding
;
padding
:
$gl-btn-padding
;
cursor
:
pointer
;
cursor
:
pointer
;
&
.droplab-item-active
button
{
@include
dropdown-item-hover
;
}
>
a
,
>
a
,
>
button
{
>
button
{
display
:
flex
;
display
:
flex
;
...
@@ -321,17 +339,9 @@
...
@@ -321,17 +339,9 @@
padding
:
0
;
padding
:
0
;
border-radius
:
0
;
border-radius
:
0
;
text-overflow
:
inherit
;
text-overflow
:
inherit
;
background-color
:
inherit
;
color
:
inherit
;
border
:
inherit
;
border
:
inherit
;
text-align
:
left
;
text-align
:
left
;
&
:hover
,
&
:focus
{
background-color
:
inherit
;
color
:
inherit
;
}
&
.btn
.fa
:not
(
:last-child
)
{
&
.btn
.fa
:not
(
:last-child
)
{
margin-left
:
5px
;
margin-left
:
5px
;
}
}
...
@@ -744,11 +754,6 @@
...
@@ -744,11 +754,6 @@
}
}
}
}
@mixin
dropdown-item-hover
{
background-color
:
$dropdown-item-hover-bg
;
color
:
$gl-text-color
;
}
// TODO: change global style and remove mixin
// TODO: change global style and remove mixin
@mixin
new-style-dropdown
(
$selector
:
''
)
{
@mixin
new-style-dropdown
(
$selector
:
''
)
{
#{
$selector
}
.dropdown-menu
,
#{
$selector
}
.dropdown-menu
,
...
@@ -763,10 +768,6 @@
...
@@ -763,10 +768,6 @@
background-color
:
transparent
;
background-color
:
transparent
;
}
}
&
.droplab-item-active
button
{
@include
dropdown-item-hover
;
}
a
,
a
,
button
,
button
,
.menu-item
{
.menu-item
{
...
@@ -787,23 +788,6 @@
...
@@ -787,23 +788,6 @@
display
:
block
;
display
:
block
;
}
}
}
}
&
.is-focused
,
&
:hover
,
&
:active
,
&
:focus
{
@include
dropdown-item-hover
;
background-color
:
$dropdown-item-hover-bg
;
color
:
$gl-text-color
;
}
}
&
.dropdown-menu-empty-item
a
{
&
:hover
,
&
:focus
{
background-color
:
transparent
;
}
}
}
}
}
...
...
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