litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed search block structure.

Browse source
This commit is contained in:
Svetlana Rastegina 2021-02-11 00:07:57 +01:00 • committed by Georgy Litvinov
parent 7e15104fe5
commit cc796ce5cc
4 changed files with 58 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
webapp/src/main/webapp/themes/iph/css/iph.css
View file

@ -642,8 +642,8 @@ input.search-vivo {
/*border-left: 1px solid #8B4513; /*border-left: 1px solid #8B4513;
border-right: 1px solid #8B4513; border-right: 1px solid #8B4513;
border-bottom: 1px solid #8B4513;*/ border-bottom: 1px solid #8B4513;*/
width: 100%; /*width: 100%;*/
margin: 0 10px 0 10px; /*margin: 0 10px 0 10px;*/
} }
#settingsButtons { #settingsButtons {
@ -653,6 +653,7 @@ input.search-vivo {
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-between; justify-content: space-between;
width: 100%; width: 100%;
background-color: #F1F1F1;
/*margin-top: 1%; /*margin-top: 1%;
margin-bottom: 0; margin-bottom: 0;
margin-left: 2%; margin-left: 2%;
@ -660,9 +661,15 @@ input.search-vivo {
} }
#CounterSearchWrapper {
border: 1px solid #8B4513;
box-shadow: 0px 4px 4px #aeaeae;
}
#wrapperButtons { #wrapperButtons {
width: 70%; /*width: 70%;
margin-left: 4%; margin-left: 4%;*/
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
background-color: #ffffff; background-color: #ffffff;
@ -673,12 +680,13 @@ input.search-vivo {
#OuterWrapperButtons { #OuterWrapperButtons {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
width: 100%; width: 70%;
margin-left: 2%;
background-color: #F1F1F1; background-color: #F1F1F1;
padding: 10px 10px 15px 10px; padding: 10px 10px 15px 10px;
border-left: 1px solid #8B4513; /*border-left: 1px solid #8B4513;
border-right: 1px solid #8B4513; border-right: 1px solid #8B4513;
border-bottom: 1px solid #8B4513; border-bottom: 1px solid #8B4513;*/
} }
#SelectResults { #SelectResults {
@ -1083,10 +1091,10 @@ input.search-home-vivo {
#querybuilder-container { #querybuilder-container {
width: 60%; width: 60%;
display: flex; /*display: flex;
flex-direction: row; flex-direction: row;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: center; justify-content: center;*/
} }

2
webapp/src/main/webapp/themes/iph/css/query-builder-theme.css
View file

@ -69,7 +69,7 @@ icons: {
.btn-group.pull-right.group-actions { .btn-group.pull-right.group-actions {
box-shadow: 0px 4px 2px #aeaeae; box-shadow: 0px 4px 2px #aeaeae;
margin-right: 10px; /*margin-right: 10px;*/
} }
.query-builder .btn-primary { .query-builder .btn-primary {

24
webapp/src/main/webapp/themes/iph/css/query-builder.css
View file

@ -6,7 +6,7 @@
.query-builder .rules-group-container, .query-builder .rule-container, .query-builder .rules-group-container, .query-builder .rule-container,
.query-builder .rule-placeholder { .query-builder .rule-placeholder {
position: relative; position: relative;
margin: 10px 10px 0 10px; /*margin: 10px 10px 0 10px;*/
/*border-radius: 5px;*/ /*border-radius: 5px;*/
padding: 5px; padding: 5px;
/*border-top: 1px dashed #000000; /*border-top: 1px dashed #000000;
@ -30,12 +30,24 @@
} }
.query-builder .rules-group-container { .query-builder .rules-group-container {
padding: 20px; padding: 20px 20px 15px 20px;
border-right: 1px solid #8B4513; /*border-right: 1px solid #8B4513;
border-left: 1px solid #8B4513; border-left: 1px solid #8B4513;
border-top: 1px solid #8B4513; border-top: 1px solid #8B4513;
border-bottom: 1px solid #8B4513; border-bottom: 1px solid #8B4513;*/
background: #F1F1F1; background-color: #efe9d9;
}
#builder_group_0 {
background-color: #F1F1F1;
}
#builder_rule_1 {
margin-bottom: 10px;
}
#builder_group_1 {
margin-top: 10px;
} }
.query-builder .rules-group-header { .query-builder .rules-group-header {
@ -62,7 +74,7 @@
.query-builder .rules-list { .query-builder .rules-list {
list-style: none; list-style: none;
padding: 0 0 0 15px; padding: 0 0 0 10px;
margin: 0; margin: 0;
box-shadow: 0px 0px #aeaeae; box-shadow: 0px 0px #aeaeae;
} }

6
webapp/src/main/webapp/themes/iph/templates/queryBuilder.ftl
View file

@ -1,4 +1,5 @@
<div id="querybuilder-container" style="display:none;"> <div id="querybuilder-container" style="display:none;">
<div id="CounterSearchWrapper">
<div id="builder"></div> <div id="builder"></div>
<div class="btn-group-bottom"> <div class="btn-group-bottom">
<div id="settingsButtons"> <div id="settingsButtons">
@ -17,15 +18,16 @@
<option value="100">100</option> <option value="100">100</option>
</select> </select>
</div> </div>
</div>
</div> </div>
<button id="btn-search-expand" class="btn btn-warning reset" data-target="basic">Поиск</button> <button id="btn-search-expand" class="btn btn-warning reset" data-target="basic">Поиск</button>
</div>
</div>
</div> </div>
<div id="backgroundForm"> <div id="backgroundForm">
<button id="btn-get-standard-searchform" class="btn btn-warning reset" data-target="basic">Стандартная форма поиска</button> <button id="btn-get-standard-searchform" class="btn btn-warning reset" data-target="basic">Стандартная форма поиска</button>
</div> </div>
</div> </div>
</div>
</div>
<script src="themes/iph/js/query-builder.standalone.min.js"></script> <script src="themes/iph/js/query-builder.standalone.min.js"></script>
<script src="themes/iph/js/query-builder.ru.js"></script> <script src="themes/iph/js/query-builder.ru.js"></script>