From 876fe2609a09b35ba7bbeae3c3f0e4cb05606fa0 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew-github@dracos.co.uk>
Date: Fri, 16 Dec 2016 11:02:34 +0000
Subject: Don't fix height of admin multiple selects.

The styling applied to the nice front end multi-select dropdowns should
not be applied to the admin multi-select ones, until such time as they
are using the nice select interface too.
---
 templates/web/base/reports/_list-filters.html | 4 ++--
 web/cobrands/sass/_base.scss                  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/web/base/reports/_list-filters.html b/templates/web/base/reports/_list-filters.html
index 5ca483a1f..9c2a74e57 100644
--- a/templates/web/base/reports/_list-filters.html
+++ b/templates/web/base/reports/_list-filters.html
@@ -1,5 +1,5 @@
 [% select_status = BLOCK %]
-    <select class="form-control" name="status" id="statuses" multiple data-all="[% loc('All reports') %]">
+    <select class="form-control js-multiple" name="status" id="statuses" multiple data-all="[% loc('All reports') %]">
         <option value="open"[% ' selected' IF filter_status.open %]>[% loc('Unfixed reports') %]</option>
         <option value="closed"[% ' selected' IF filter_status.closed %]>[% loc('Closed reports') %]</option>
         <option value="fixed"[% ' selected' IF filter_status.fixed %]>[% loc('Fixed reports') %]</option>
@@ -8,7 +8,7 @@
 
 [% select_category = BLOCK %]
   [% IF filter_categories.size %]
-    <select class="form-control" name="filter_category" id="filter_categories" multiple data-all="[% loc('Everything') %]">
+    <select class="form-control js-multiple" name="filter_category" id="filter_categories" multiple data-all="[% loc('Everything') %]">
         [% FOR cat IN filter_categories %]
             <option value="[% cat | html %]"[% ' selected' IF filter_category.grep(cat).size %]>
                 [% cat | html %]
diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index f3753905b..7fb0c797f 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -289,7 +289,7 @@ select.form-control {
     &[multiple] {
         height: auto;
     }
-    .js &[multiple] {
+    .js &.js-multiple[multiple] {
         height: 2.2em;
     }
 }
-- 
cgit v1.2.3