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
fed7c1ed
Commit
fed7c1ed
authored
Sep 05, 2017
by
Clement Ho
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'winh-search-dropdowns' into 'master'
Make search dropdowns consistent See merge request !13615
parents
597b0517
87699616
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
5 deletions
+12
-5
gl_dropdown.js
app/assets/javascripts/gl_dropdown.js
+9
-5
dropdowns.scss
app/assets/stylesheets/framework/dropdowns.scss
+1
-0
search.scss
app/assets/stylesheets/pages/search.scss
+2
-0
gl_dropdown_spec.js
spec/javascripts/gl_dropdown_spec.js
+0
-0
No files found.
app/assets/javascripts/gl_dropdown.js
View file @
fed7c1ed
...
@@ -637,11 +637,15 @@ GitLabDropdown = (function() {
...
@@ -637,11 +637,15 @@ GitLabDropdown = (function() {
value
=
this
.
options
.
id
?
this
.
options
.
id
(
data
)
:
data
.
id
;
value
=
this
.
options
.
id
?
this
.
options
.
id
(
data
)
:
data
.
id
;
fieldName
=
this
.
options
.
fieldName
;
fieldName
=
this
.
options
.
fieldName
;
if
(
value
)
{
value
=
value
.
toString
().
replace
(
/'/g
,
'
\\
\'
'
);
}
if
(
value
)
{
value
=
value
.
toString
().
replace
(
/'/g
,
'
\\
\'
'
);
field
=
this
.
dropdown
.
parent
().
find
(
"input[name='"
+
fieldName
+
"'][value='"
+
value
+
"']"
);
field
=
this
.
dropdown
.
parent
().
find
(
`input[name='
${
fieldName
}
'][value='
${
value
}
']`
);
if
(
field
.
length
)
{
if
(
field
.
length
)
{
selected
=
true
;
selected
=
true
;
}
}
else
{
field
=
this
.
dropdown
.
parent
().
find
(
`input[name='
${
fieldName
}
']`
);
selected
=
!
field
.
length
;
}
}
}
}
// Set URL
// Set URL
...
...
app/assets/stylesheets/framework/dropdowns.scss
View file @
fed7c1ed
...
@@ -766,6 +766,7 @@
...
@@ -766,6 +766,7 @@
box-shadow
:
none
;
box-shadow
:
none
;
padding
:
8px
16px
;
padding
:
8px
16px
;
text-align
:
left
;
text-align
:
left
;
white-space
:
normal
;
width
:
100%
;
width
:
100%
;
// make sure the text color is not overriden
// make sure the text color is not overriden
...
...
app/assets/stylesheets/pages/search.scss
View file @
fed7c1ed
...
@@ -190,6 +190,8 @@ input[type="checkbox"]:hover {
...
@@ -190,6 +190,8 @@ input[type="checkbox"]:hover {
}
}
.search-holder
{
.search-holder
{
@include
new-style-dropdown
;
@media
(
min-width
:
$screen-sm-min
)
{
@media
(
min-width
:
$screen-sm-min
)
{
display
:
-
webkit-flex
;
display
:
-
webkit-flex
;
display
:
flex
;
display
:
flex
;
...
...
spec/javascripts/gl_dropdown_spec.js
View file @
fed7c1ed
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