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
iv
gitlab-ce
Commits
6664da43
Commit
6664da43
authored
Mar 27, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Small css improvements to selectboxes and issue filter
parent
4d9b4d35
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
55 additions
and
47 deletions
+55
-47
app/assets/stylesheets/generic/filters.scss
app/assets/stylesheets/generic/filters.scss
+34
-4
app/assets/stylesheets/generic/selects.scss
app/assets/stylesheets/generic/selects.scss
+9
-4
app/assets/stylesheets/pages/issues.scss
app/assets/stylesheets/pages/issues.scss
+2
-29
app/views/projects/issues/index.html.haml
app/views/projects/issues/index.html.haml
+0
-10
app/views/shared/_issuable_filter.html.haml
app/views/shared/_issuable_filter.html.haml
+10
-0
No files found.
app/assets/stylesheets/generic/filters.scss
View file @
6664da43
...
@@ -3,10 +3,13 @@
...
@@ -3,10 +3,13 @@
}
}
.issues-state-filters
{
.issues-state-filters
{
li
.active
a
,
li
.active
a
{
li
.active
a
:hover
{
border-color
:
#DDD
!
important
;
background
:
#f5f5f5
;
border-bottom
:
1px
solid
#f5f5f5
!
important
;
&
,
&
:hover
,
&
:active
,
&
.active
{
background
:
#f5f5f5
!
important
;
border-bottom
:
1px
solid
#f5f5f5
!
important
;
}
}
}
}
}
...
@@ -23,3 +26,30 @@
...
@@ -23,3 +26,30 @@
font-size
:
13px
;
font-size
:
13px
;
}
}
}
}
@media
(
min-width
:
800px
)
{
.issues-filters
,
.issues_bulk_update
{
select
,
.select2-container
{
width
:
120px
!
important
;
display
:
inline-block
;
}
}
}
@media
(
min-width
:
1200px
)
{
.issues-filters
,
.issues_bulk_update
{
select
,
.select2-container
{
width
:
150px
!
important
;
display
:
inline-block
;
}
}
}
.issues-filters
,
.issues_bulk_update
{
.select2-container
.select2-choice
{
color
:
#444
!
important
;
}
}
app/assets/stylesheets/generic/selects.scss
View file @
6664da43
...
@@ -2,20 +2,25 @@
...
@@ -2,20 +2,25 @@
.select2-container
,
.select2-container.select2-drop-above
{
.select2-container
,
.select2-container.select2-drop-above
{
.select2-choice
{
.select2-choice
{
background
:
#FFF
;
background
:
#FFF
;
border-color
:
#CCC
;
border-color
:
#DDD
;
height
:
34px
;
padding
:
6px
14px
;
padding
:
6px
14px
;
font-size
:
14px
;
line-height
:
1
.42857143
;
line-height
:
1
.42857143
;
height
:
auto
;
@include
border-radius
(
4px
);
.select2-arrow
{
.select2-arrow
{
background
:
#FFF
;
background
:
#FFF
;
border-left
:
1px
solid
#DDD
;
border-left
:
none
;
padding-top
:
3px
;
}
}
}
}
}
}
.select2-container-multi
.select2-choices
{
.select2-container-multi
.select2-choices
{
@include
border-radius
(
4px
)
@include
border-radius
(
4px
);
border-color
:
#CCC
;
}
}
.select2-container-multi
.select2-choices
.select2-search-field
input
{
.select2-container-multi
.select2-choices
.select2-search-field
input
{
...
...
app/assets/stylesheets/pages/issues.scss
View file @
6664da43
...
@@ -56,33 +56,6 @@
...
@@ -56,33 +56,6 @@
}
}
}
}
@media
(
min-width
:
800px
)
{
.issues-filters
,
.issues_bulk_update
{
select
,
.select2-container
{
width
:
120px
!
important
;
display
:
inline-block
;
}
}
}
@media
(
min-width
:
1200px
)
{
.issues-filters
,
.issues_bulk_update
{
select
,
.select2-container
{
width
:
150px
!
important
;
display
:
inline-block
;
}
}
}
.issues-filters
,
.issues_bulk_update
{
.select2-container
.select2-choice
{
color
:
#444
!
important
;
}
}
.participants
{
.participants
{
margin-bottom
:
20px
;
margin-bottom
:
20px
;
}
}
...
@@ -120,12 +93,12 @@ form.edit-issue {
...
@@ -120,12 +93,12 @@ form.edit-issue {
}
}
&
.closed
{
&
.closed
{
background
:
#F
5f5f5
;
background
:
#F
9F9F9
;
border-color
:
#E5E5E5
;
border-color
:
#E5E5E5
;
}
}
&
.merged
{
&
.merged
{
background
:
#F
5f5f5
;
background
:
#F
9F9F9
;
border-color
:
#E5E5E5
;
border-color
:
#E5E5E5
;
}
}
}
}
...
...
app/views/projects/issues/index.html.haml
View file @
6664da43
...
@@ -15,15 +15,5 @@
...
@@ -15,15 +15,5 @@
=
render
'shared/issuable_filter'
=
render
'shared/issuable_filter'
.clearfix
.issues_bulk_update.hide
=
form_tag
bulk_update_namespace_project_issues_path
(
@project
.
namespace
,
@project
),
method: :post
do
=
select_tag
(
'update[state_event]'
,
options_for_select
([[
'Open'
,
'reopen'
],
[
'Closed'
,
'close'
]]),
prompt:
"Status"
,
class:
'form-control'
)
=
users_select_tag
(
'update[assignee_id]'
,
placeholder:
'Assignee'
,
null_user:
true
)
=
select_tag
(
'update[milestone_id]'
,
bulk_update_milestone_options
,
prompt:
"Milestone"
)
=
hidden_field_tag
'update[issues_ids]'
,
[]
=
hidden_field_tag
:state_event
,
params
[
:state_event
]
=
button_tag
"Update issues"
,
class:
"btn update_selected_issues btn-save"
.issues-holder
.issues-holder
=
render
"issues"
=
render
"issues"
app/views/shared/_issuable_filter.html.haml
View file @
6664da43
...
@@ -40,6 +40,16 @@
...
@@ -40,6 +40,16 @@
.pull-right
.pull-right
=
render
'shared/sort_dropdown'
=
render
'shared/sort_dropdown'
-
if
controller
.
controller_name
==
'issues'
.issues_bulk_update.hide
=
form_tag
bulk_update_namespace_project_issues_path
(
@project
.
namespace
,
@project
),
method: :post
do
=
select_tag
(
'update[state_event]'
,
options_for_select
([[
'Open'
,
'reopen'
],
[
'Closed'
,
'close'
]]),
prompt:
"Status"
,
class:
'form-control'
)
=
users_select_tag
(
'update[assignee_id]'
,
placeholder:
'Assignee'
,
null_user:
true
)
=
select_tag
(
'update[milestone_id]'
,
bulk_update_milestone_options
,
prompt:
"Milestone"
)
=
hidden_field_tag
'update[issues_ids]'
,
[]
=
hidden_field_tag
:state_event
,
params
[
:state_event
]
=
button_tag
"Update issues"
,
class:
"btn update_selected_issues btn-save"
:coffeescript
:coffeescript
new UsersSelect()
new UsersSelect()
...
...
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