Small css improvements to selectboxes and issue filter

5 files changed, 55 insertions, 47 deletions

diff --git a/app/assets/stylesheets/generic/filters.scss b/app/assets/stylesheets/generic/filters.scss
index 20c6a85de98..bd93a79722d 100644
--- a/app/assets/stylesheets/generic/filters.scss
+++ b/app/assets/stylesheets/generic/filters.scss
@@ -3,10 +3,13 @@
 }
 
 .issues-state-filters {
-  li.active a,
-  li.active a:hover {
-    background: #f5f5f5;
-    border-bottom: 1px solid #f5f5f5 !important;
+  li.active a {
+    border-color: #DDD !important;
+
+    &, &:hover, &:active, &.active {
+      background: #f5f5f5 !important;
+      border-bottom: 1px solid #f5f5f5 !important;
+    }
   }
 }
 
@@ -23,3 +26,30 @@
     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;
+  }
+}
diff --git a/app/assets/stylesheets/generic/selects.scss b/app/assets/stylesheets/generic/selects.scss
index 69613608c82..d8e0dc028d1 100644
--- a/app/assets/stylesheets/generic/selects.scss
+++ b/app/assets/stylesheets/generic/selects.scss
@@ -2,20 +2,25 @@
 .select2-container, .select2-container.select2-drop-above {
   .select2-choice {
     background: #FFF;
-    border-color: #CCC;
+    border-color: #DDD;
+    height: 34px;
     padding: 6px 14px;
+    font-size: 14px;
     line-height: 1.42857143;
-    height: auto;
+
+    @include border-radius(4px);
 
     .select2-arrow {
       background: #FFF;
-      border-left: 1px solid #DDD;
+      border-left: none;
+      padding-top: 3px;
     }
   }
 }
 
 .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 {
diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss
index b8ad26d69cd..cd86a9be8b2 100644
--- a/app/assets/stylesheets/pages/issues.scss
+++ b/app/assets/stylesheets/pages/issues.scss
@@ -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 {
   margin-bottom: 20px;
 }
@@ -120,12 +93,12 @@ form.edit-issue {
   }
 
   &.closed {
-    background: #F5f5f5;
+    background: #F9F9F9;
     border-color: #E5E5E5;
   }
 
   &.merged {
-    background: #F5f5f5;
+    background: #F9F9F9;
     border-color: #E5E5E5;
   }
 }
diff --git a/app/views/projects/issues/index.html.haml b/app/views/projects/issues/index.html.haml
index 210b77a6b15..d3c7ae24a75 100644
--- a/app/views/projects/issues/index.html.haml
+++ b/app/views/projects/issues/index.html.haml
@@ -15,15 +15,5 @@
 
   = 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
   = render "issues"
diff --git a/app/views/shared/_issuable_filter.html.haml b/app/views/shared/_issuable_filter.html.haml
index 77085ccb56b..f169733f2e9 100644
--- a/app/views/shared/_issuable_filter.html.haml
+++ b/app/views/shared/_issuable_filter.html.haml
@@ -40,6 +40,16 @@
         .pull-right
           = 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
   new UsersSelect()