Commit 6664da43 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Small css improvements to selectboxes and issue filter

parent 4d9b4d35
...@@ -3,11 +3,14 @@ ...@@ -3,11 +3,14 @@
} }
.issues-state-filters { .issues-state-filters {
li.active a, li.active a {
li.active a:hover { border-color: #DDD !important;
background: #f5f5f5;
&, &:hover, &:active, &.active {
background: #f5f5f5 !important;
border-bottom: 1px solid #f5f5f5 !important; border-bottom: 1px solid #f5f5f5 !important;
} }
}
} }
.issues-details-filters { .issues-details-filters {
...@@ -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;
}
}
...@@ -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 {
......
...@@ -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: #F5f5f5; background: #F9F9F9;
border-color: #E5E5E5; border-color: #E5E5E5;
} }
&.merged { &.merged {
background: #F5f5f5; background: #F9F9F9;
border-color: #E5E5E5; border-color: #E5E5E5;
} }
} }
......
...@@ -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"
...@@ -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()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment