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
Kazuhiko Shiozaki
gitlab-ce
Commits
983dbe2a
Commit
983dbe2a
authored
Feb 22, 2016
by
Alfredo Sumaran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update dropdown menu style
parent
42b277ec
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
85 additions
and
37 deletions
+85
-37
app/assets/stylesheets/framework/buttons.scss
app/assets/stylesheets/framework/buttons.scss
+4
-0
app/assets/stylesheets/framework/common.scss
app/assets/stylesheets/framework/common.scss
+4
-0
app/assets/stylesheets/framework/selects.scss
app/assets/stylesheets/framework/selects.scss
+74
-35
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+1
-1
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+2
-1
No files found.
app/assets/stylesheets/framework/buttons.scss
View file @
983dbe2a
...
@@ -70,6 +70,10 @@
...
@@ -70,6 +70,10 @@
color
:
$gl-text-color
;
color
:
$gl-text-color
;
&
:focus:active
{
outline
:
0
;
}
&
.btn-small
,
&
.btn-small
,
&
.btn-sm
{
&
.btn-sm
{
padding
:
4px
10px
;
padding
:
4px
10px
;
...
...
app/assets/stylesheets/framework/common.scss
View file @
983dbe2a
...
@@ -56,6 +56,10 @@ hr {
...
@@ -56,6 +56,10 @@ hr {
margin
:
$gl-padding
0
;
margin
:
$gl-padding
0
;
}
}
.dropdown-menu
{
margin
:
6px
0
0
;
}
.dropdown-menu
>
li
>
a
{
.dropdown-menu
>
li
>
a
{
text-shadow
:
none
;
text-shadow
:
none
;
}
}
...
...
app/assets/stylesheets/framework/selects.scss
View file @
983dbe2a
/** Select2 selectbox style override **/
/** Select2 selectbox style override **/
.select2-container
{
width
:
100%
!
important
;
}
.select2-container
,
.select2-container.select2-drop-above
{
.select2-container
,
.select2-container.select2-drop-above
{
.select2-choice
{
.select2-choice
{
background
:
#
FFF
;
background
:
#
fff
;
border-color
:
$input-border
;
border-color
:
$input-border
;
border-color
:
$border-white-light
;
height
:
35px
;
height
:
35px
;
padding
:
$gl-vert-padding
$gl-btn-padding
;
padding
:
$gl-vert-padding
$gl-btn-padding
;
font-size
:
$gl-font-size
;
font-size
:
$gl-font-size
;
line-height
:
1
.42857143
;
line-height
:
1
.42857143
;
@include
border-radius
(
$
input-border-radius
);
@include
border-radius
(
$
border-radius-default
);
.select2-arrow
{
.select2-arrow
{
width
:
auto
;
width
:
auto
;
...
@@ -39,14 +44,12 @@
...
@@ -39,14 +44,12 @@
.select2-drop
{
.select2-drop
{
@include
box-shadow
(
rgba
(
76
,
86
,
103
,
0
.247059
)
0px
0px
1px
0px
,
rgba
(
31
,
37
,
50
,
0
.317647
)
0px
2px
18px
0px
);
@include
box-shadow
(
rgba
(
76
,
86
,
103
,
0
.247059
)
0px
0px
1px
0px
,
rgba
(
31
,
37
,
50
,
0
.317647
)
0px
2px
18px
0px
);
@include
border-radius
(
0px
);
@include
border-radius
(
$border-radius-default
);
border
:
none
;
padding
:
16px
;
border
:
none
!
important
;
}
}
.select2-results
.select2-result-label
{
.select2-results
.select2-result-label
{
padding
:
9
px
;
padding
:
10px
15
px
;
}
}
.select2-drop
{
.select2-drop
{
...
@@ -62,11 +65,27 @@
...
@@ -62,11 +65,27 @@
color
:
#313236
;
color
:
#313236
;
}
}
.select2-container-active
{
.select2-choice
,
.select2-choices
{
@include
box-shadow
(
none
);
}
}
.select2-dropdown-open
{
.select2-choice
{
border-color
:
$border-white-normal
;
outline
:
0
;
background-image
:
none
;
background-color
:
$white-dark
;
@include
box-shadow
(
inset
0
0
4px
rgba
(
0
,
0
,
0
,
0
.12
));
}
}
.select2-container-multi
{
.select2-container-multi
{
.select2-choices
{
.select2-choices
{
@include
border-radius
(
$
input-border-radius
);
@include
border-radius
(
$
border-radius-default
);
border-color
:
$input-border
;
border-color
:
$input-border
;
padding-left
:
$gl-padding
/
2
;
background
:
none
;
.select2-search-field
input
{
.select2-search-field
input
{
padding
:
$gl-padding
/
2
;
padding
:
$gl-padding
/
2
;
...
@@ -82,9 +101,12 @@
...
@@ -82,9 +101,12 @@
border-color
:
$input-border
;
border-color
:
$input-border
;
color
:
$gl-text-color
;
color
:
$gl-text-color
;
line-height
:
15px
;
line-height
:
15px
;
background-color
:
$background-color
;
background-image
:
none
;
.select2-search-choice-close
{
.select2-search-choice-close
{
top
:
5px
;
top
:
4px
;
left
:
3px
;
}
}
&
.select2-search-choice-focus
{
&
.select2-search-choice-focus
{
...
@@ -92,28 +114,20 @@
...
@@ -92,28 +114,20 @@
}
}
}
}
}
}
}
.select2-container-active
{
&
.select2-container-active
.select2-choices
,
.select2-choice
,
.select2-choices
{
&
.select2-dropdown-open
.select2-choices
{
@include
box-shadow
(
none
);
border-color
:
$border-white-normal
;
@include
box-shadow
(
inset
0
0
4px
rgba
(
0
,
0
,
0
,
0
.12
));
}
}
}
}
.select2-dropdown-open
{
.select2-container-multi
.select2-choices
.select2-search-choice
{
.select2-choice
,
.select2-choices
{
outline
:
0
;
background-image
:
none
;
border-color
:
#d6dae2
;
background-color
:
$white-dark
;
@include
box-shadow
(
inset
0
0
4px
rgba
(
0
,
0
,
0
,
0
.12
));
}
}
}
.select2-drop-active
{
.select2-drop-active
{
border
:
1px
solid
#BBB
!
important
;
margin-top
:
6px
;
margin-top
:
4px
;
font-size
:
14px
;
font-size
:
13px
;
&
.select2-drop-above
{
&
.select2-drop-above
{
margin-bottom
:
8px
;
margin-bottom
:
8px
;
...
@@ -127,16 +141,32 @@
...
@@ -127,16 +141,32 @@
}
}
}
}
.select2-search
input
{
.select2-search
{
background
:
#fff
image-url
(
'select2.png'
)
no-repeat
99%
-22px
;
padding
:
15px
15px
5px
;
.select2-drop-auto-width
&
{
padding
:
15px
15px
5px
;
}
}
}
.select2-search
input
.select2-active
{
.select2-search
input
{
background
:
#fff
image-url
(
'select2-spinner.gif'
)
no-repeat
99%
;
padding
:
2px
25px
2px
5px
;
background
:
#fff
image-url
(
'select2.png'
);
background-repeat
:
no-repeat
;
background-position
:
calc
(
100%
-
3px
)
-23px
;
border
:
1px
solid
$input-border
;
@include
border-radius
(
$border-radius-default
);
@include
transition
(
border-color
ease-in-out
.15s
,
box-shadow
ease-in-out
.15s
);
&
:focus
{
border-color
:
$input-border-focus
;
}
}
}
.select2-container
{
.select2-search
input
.select2-active
{
width
:
100%
!
important
;
background
:
#fff
image-url
(
'select2-spinner.gif'
);
background-repeat
:
no-repeat
;
background-position
:
calc
(
100%
-
5px
)
4px
;
}
}
/** Branch/tag selector **/
/** Branch/tag selector **/
...
@@ -144,10 +174,19 @@
...
@@ -144,10 +174,19 @@
width
:
160px
!
important
;
width
:
160px
!
important
;
}
}
.ajax-users-dropdown
,
.ajax-project-users-dropdown
{
.select2-results
.select2-no-results
,
.select2-search
{
.select2-results
.select2-searching
,
padding-top
:
2px
;
.select2-results
.select2-ajax-error
,
}
.select2-results
.select2-selection-limit
{
background
:
$gray-light
;
display
:
list-item
;
padding
:
10px
15px
;
}
.select2-results
{
margin
:
0
;
padding
:
10px
0
;
}
}
.ajax-users-select
{
.ajax-users-select
{
...
...
app/assets/stylesheets/framework/variables.scss
View file @
983dbe2a
...
@@ -31,7 +31,7 @@ $gl-padding-top:10px;
...
@@ -31,7 +31,7 @@ $gl-padding-top:10px;
$gl-avatar-size
:
40px
;
$gl-avatar-size
:
40px
;
$secondary-text
:
#7f8fa4
;
$secondary-text
:
#7f8fa4
;
$error-exclamation-point
:
#E62958
;
$error-exclamation-point
:
#E62958
;
$
input-border-radius
:
3px
;
$
border-radius-default
:
3px
;
/*
/*
* Color schema
* Color schema
...
...
app/assets/stylesheets/pages/projects.scss
View file @
983dbe2a
...
@@ -32,6 +32,7 @@
...
@@ -32,6 +32,7 @@
.cover-controls
{
.cover-controls
{
.project-settings-dropdown
{
.project-settings-dropdown
{
margin-left
:
10px
;
margin-left
:
10px
;
display
:
inline-block
;
}
}
}
}
...
@@ -191,7 +192,7 @@
...
@@ -191,7 +192,7 @@
.dropdown-menu
{
.dropdown-menu
{
@include
box-shadow
(
rgba
(
76
,
86
,
103
,
0
.247059
)
0px
0px
1px
0px
,
rgba
(
31
,
37
,
50
,
0
.317647
)
0px
2px
18px
0px
);
@include
box-shadow
(
rgba
(
76
,
86
,
103
,
0
.247059
)
0px
0px
1px
0px
,
rgba
(
31
,
37
,
50
,
0
.317647
)
0px
2px
18px
0px
);
@include
border-radius
(
$
input-border-radius
);
@include
border-radius
(
$
border-radius-default
);
border
:
none
;
border
:
none
;
padding
:
10px
0
;
padding
:
10px
0
;
...
...
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