#64 #76 fix of search filtering

rinfo · Mar 13, 2012 · 2a42f1f · 2a42f1f
1 parent f209640
commit 2a42f1f
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 11 deletions.
diff --git a/grails-app/views/layouts/main.gsp b/grails-app/views/layouts/main.gsp
@@ -30,7 +30,6 @@
 			</nav>
 			<g:form mapping="search" method="GET" name="search">
 				<div class="input" id="searchCategory">
-					Vad vill du söka?
 					<label for="cat">Avgränsa din sökning</label>
 					<select id="cat" name="cat">
 					<g:each in="${siteProps?.searchCats}">

diff --git a/web-app/css/ie.css b/web-app/css/ie.css
@@ -9,8 +9,15 @@
 #siteHeader {z-index: 13;
 	*left: 40px;
 }
+#searchCurrentCategory {
+	left: 10px;
+}
 #search #query {padding: 0; margin: 2px 5px; width:290px;}
 #search #searchCategory {z-index: 11; position: relative; padding: 5px 5px 5px 10px;}
+#search div.input, #searchSubmit {
+	background: url(../images/ddd-fff-gradient-40px.png) repeat-x;
+}
+
 #siteHeader > p.extSearchLabel {
 	*position: relative;
 	*top: 5em;

diff --git a/web-app/css/main.css b/web-app/css/main.css
@@ -647,8 +647,8 @@ article.legalSources section.Foreskrifter h2 {
 
 #search > *{
 	height: 30px;
-	width: 310px;
-	margin-left: 5px;
+	width: 314px;
+	margin-left: 1px;
 	padding: 5px;
 	border: 1px solid #ddd;
 	display: block;
@@ -659,6 +659,7 @@ article.legalSources section.Foreskrifter h2 {
 	background-image:    -moz-linear-gradient(top, #ddd, #f7f7f7, #fff);
 	background-image:     -ms-linear-gradient(top, #ddd, #f7f7f7, #fff);
 	background-image:      -o-linear-gradient(top, #ddd, #f7f7f7, #fff);
+	background-image: 	      linear-gradient(top, #ddd, #f7f7f7, #fff);
 	-moz-border-radius: 5px;
 	border-radius: 5px;
 }
@@ -669,11 +670,11 @@ article.legalSources section.Foreskrifter h2 {
 	position: relative;
 }
 
-#search .input label {
+/*#search .input label {
 	font-size: 0.9em;
 	font-weight: normal;
 	font-style: normal;
-}
+}*/
 
 #cat {
 	clear: none;
@@ -702,29 +703,31 @@ article.legalSources section.Foreskrifter h2 {
 	background-image:    -moz-linear-gradient(top, #c7c7c7, #f7f7f7, #fff);
 	background-image:     -ms-linear-gradient(top, #c7c7c7, #f7f7f7, #fff);
 	background-image:      -o-linear-gradient(top, #c7c7c7, #f7f7f7, #fff);
+	background-image: 		  linear-gradient(top, #c7c7c7, #f7f7f7, #fff);
 }
 
 #searchCategory:active, #searchSubmit:active, #extendedSearchSubmit:active {
 	background-image: -webkit-linear-gradient(top, #fff, #f7f7f7, #ddd);
 	background-image:    -moz-linear-gradient(top, #fff, #f7f7f7, #ddd);
 	background-image:     -ms-linear-gradient(top, #fff, #f7f7f7, #ddd);
 	background-image:      -o-linear-gradient(top, #fff, #f7f7f7, #ddd);
+	background-image: 	      linear-gradient(top, #fff, #f7f7f7, #ddd);
 }
 
-
 #searchCurrentCategory {
 	position: absolute;
-	right: 0;
-	bottom: 4px;
-	padding-right: 20px;
+	left: 5px;
+	bottom: 2px;
+	padding-left: 20px;
 	margin-right: 1em;
 	font-size: 0.8em;
 	cursor: pointer;
-	background: transparent url(../images/arrow-down.png) no-repeat right center;
+	font-weight: normal;
+	background: transparent url(../images/arrow-down.png) no-repeat left center;
 }
 
 #searchCurrentCategory.active {
-	background: transparent url(../images/arrow-up.png) no-repeat right center;
+	background: transparent url(../images/arrow-up.png) no-repeat left center;
 }
 
 #searchCategoryList {

diff --git a/web-app/js/application.js b/web-app/js/application.js