From 6880ccfb69b3c637dd7ade4eff45eaf318511b24 Mon Sep 17 00:00:00 2001
From: Svetlana Rastegina <rasteginas@yandex.ru>
Date: Mon, 8 Feb 2021 23:29:06 +0100
Subject: [PATCH] Changed extand search styles.

---
 webapp/src/main/webapp/themes/iph/css/iph.css | 52 ++++++++++++++++---
 .../themes/iph/css/query-builder-theme.css    |  2 +
 .../themes/iph/templates/queryBuilder.ftl     |  2 +
 3 files changed, 50 insertions(+), 6 deletions(-)

diff --git a/webapp/src/main/webapp/themes/iph/css/iph.css b/webapp/src/main/webapp/themes/iph/css/iph.css
index dedce56b..80657122 100644
--- a/webapp/src/main/webapp/themes/iph/css/iph.css
+++ b/webapp/src/main/webapp/themes/iph/css/iph.css
@@ -103,7 +103,14 @@ input[type="password"] {
 
 select.form-control {
 	padding: 5px;
+}
 
+.btn-success.set-json {
+	background-color: #ffffff;
+	border: 1px dashed #000000;
+	font-size: 14px;
+	flex-grow: 1;
+	margin-right: 10px;
 }
 
 input.block {
@@ -557,7 +564,7 @@ ul#header-nav a.log-out {
   float: left;
   height: 2rem;
   padding: 0px 0px 0px 5px !important;
-  border-style: solid;
+  border-style: solid !important;
   border-color: #8B4513 !important;
   margin-bottom: 0 !important;
   background-color: #F3F3F3 !important;
@@ -649,10 +656,12 @@ input.search-vivo {
 
 #wrapperButtons {
 	width: 70%;
-	margin-right: 10%;
+	margin-left: 5%;
 	display: flex;
 	justify-content: space-around;
 	background-color: #ffffff;
+	padding: 5px;
+	box-shadow: 0px 4px 4px #aeaeae;
 }
 
 #OuterWrapperButtons {
@@ -660,23 +669,54 @@ input.search-vivo {
 	justify-content: space-between;
 	width: 100%;
 	background-color: #F1F1F1;
-	padding: 10px;
+	padding: 10px 10px 15px 10px;
 	border-left: 1px solid #8B4513;
 	border-right: 1px solid #8B4513;
 	border-bottom: 1px solid #8B4513;
 }
 
+#SelectResults {
+	font-size: 14px;
+	border: 1px dashed #000000;
+	color: #000000;
+	padding-left: 5px;
+	margin-left: 10px;
+} 
+
 #btn-search-expand {
-	width: 10%;
+	width: 15%;
+	margin-right: 2%;
+	background-color: #ffffff;
+	border: 1px solid #DD9F00;
 }
 
 #btn-reset-button {
-	
+	background-color: #ffffff;
+	border: 1px dashed #000000;
+	font-size: 14px;
+	flex-grow: 1;
+}
+
+#hitsPerPageSelect {
+	border-left: 1px dashed #000000;
+	border-right: 0px;
+	border-top: 0px;
+	border-bottom: 0px;
 }
 
 #btn-get-standard-searchform {
-	margin-bottom: 10px;
+	/*margin-bottom: 10px;*/
+	background-color: #ead6a2;
+	border: 0px;
+	padding-top: 5px;
 }
+#backgroundForm {
+	height: 30px;
+	background-color: #ead6a2;
+	clip-path:polygon(0% 0%, 0% 1000%, 80% 0%);
+	width: 40%;
+}
+
 
 /* MAIN NAVIGATION------>  */
 ul#main-nav {
diff --git a/webapp/src/main/webapp/themes/iph/css/query-builder-theme.css b/webapp/src/main/webapp/themes/iph/css/query-builder-theme.css
index d4211ad5..32c372f1 100644
--- a/webapp/src/main/webapp/themes/iph/css/query-builder-theme.css
+++ b/webapp/src/main/webapp/themes/iph/css/query-builder-theme.css
@@ -69,6 +69,7 @@ icons: {
 
 .btn-group.pull-right.group-actions {
 	box-shadow: 0px 4px 2px #aeaeae;
+	margin-right: 10px;
 }
 
 .query-builder .btn-primary {
@@ -89,6 +90,7 @@ icons: {
 
 button.btn.btn-xs.btn-danger {
 	/*box-shadow: 0px 0px 0px #000000;*/	
+	border-left: 1px solid #ead6a2;
 
 }
 
diff --git a/webapp/src/main/webapp/themes/iph/templates/queryBuilder.ftl b/webapp/src/main/webapp/themes/iph/templates/queryBuilder.ftl
index f511e5a6..144bbe91 100644
--- a/webapp/src/main/webapp/themes/iph/templates/queryBuilder.ftl
+++ b/webapp/src/main/webapp/themes/iph/templates/queryBuilder.ftl
@@ -20,8 +20,10 @@
 		</div>
 		 <button id="btn-search-expand" class="btn btn-warning reset" data-target="basic">Поиск</button>
 	</div>
+		<div id="backgroundForm">
 		 <button id="btn-get-standard-searchform" class="btn btn-warning reset" data-target="basic">Стандартная форма поиска</button>
 		</div>
+		</div>
    </div>
 </div>