From: Dan Scott <dscott@laurentian.ca>
Date: Wed, 18 Sep 2013 21:16:53 +0000 (-0400)
Subject: Merge branch 'collab/bshum/mobile-cat-hacking' of git.evergreen-ils.org:working/Everg... 
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=020d58578a6f107265701c3c7165a21242d4a525;p=working%2FEvergreen.git

Merge branch 'collab/bshum/mobile-cat-hacking' of git.evergreen-ils.org:working/Evergreen into mobile_facets_down

Signed-off-by: Dan Scott <dscott@laurentian.ca>

Conflicts:
	Open-ILS/src/templates/opac/css/style.css.tt2
---

020d58578a6f107265701c3c7165a21242d4a525
diff --cc Open-ILS/src/templates/opac/css/style.css.tt2
index 184cdb74eb,ed39d94900..fcc116c900
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@@ -1928,9 -1930,13 +1923,15 @@@ a.preflib_change 
      .mobile_hide {
  	display: none;
      } 
 -    .searchbar { width: 200px; line-height: 1.5em; }
 -    #browse-controls { width: 200px; line-height: 1.5em; }
 +    .searchbar { line-height: 1.5em; }
 +    #browse-controls { line-height: 1.5em; }
 +    #search_query_label, #search_qtype_label, #search_locg_label {
 +        display: block;
+     .bookshelf td {
 -	display: block;
 -	width: 100%;
++        display: block;
++        width: 100%;
+     }
+     .bookshelf table thead tr {
 -	display: block;
++        display: block;
      }
  }