expo-33 clear button done

templates/client/includes/catalog_search_main.html

@@ -35,7 +35,7 @@
 							</div>
 						</div>
 						<div class="sf-field-wrap">
-							<button type="submit"><span>{% trans 'найти' %}</span></button>
+							<button type="submit" class="search_submit"><span>{% trans 'найти' %}</span></button>
 						</div>
 					</div>
 					<div class="search-line sl-options">

templates/client/popups/place.html

@@ -65,7 +65,6 @@
 
 							</div>
 							<div class="q-sel">
-								<a class="clear" href="#">{% trans 'Сбросить выбранное' %}</a>
 								<div class="q-sel-title">{% trans 'Быстрый выбор' %}:</div>
 								<ul>
                                     <li><a href="#" data-name="ci" data-id="-2960561">{% trans 'Москва' %}</a></li>
@@ -85,7 +84,9 @@
 				</div>
 			</div>
 			<div class="pwf-buttons-line">
-				<button class="icon-check modal-approve" type="submit">{% if submitText %}{{ submitText }}{% else %}{% trans 'Искать' %}{% endif %}</button><a class="{% if filter %}{{ filter }}{% else %}search-{% endif %}modal-open specify-link" href="#{{ filter }}pwSubj">{% trans 'Уточнить тему' %}</a>
+				<button class="icon-check modal-approve" type="submit">{% if submitText %}{{ submitText }}{% else %}{% trans 'Искать' %}{% endif %}</button>
+				<button class="gray modal-clear" type="submit">{% trans 'Очистить' %}</button>
+				<a class="{% if filter %}{{ filter }}{% else %}search-{% endif %}modal-open specify-link" href="#{{ filter }}pwSubj">{% trans 'Уточнить тему' %}</a>
 				{% if hasDate %}<a class=" search-modal-open specify-link" href="#pwPeriod">{% trans 'Уточнить дату' %}</a>{% endif %}
 			</div>
 		</div>

templates/client/popups/theme.html

@@ -68,15 +68,14 @@
 										</ul>
 
 									</div>
-									<div class="q-sel">
-										<a class="clear" href="#">{% trans 'Сбросить выбранное' %}</a>
-									</div>
 								</div>
 							</div>
 						</div>
 					</div>
 					<div class="pwf-buttons-line">
-						<button class="icon-check modal-approve" type="submit">{% if submitText %}{{ submitText }}{% else %}{% trans 'Искать' %}{% endif %}</button><a class="{% if filter %}{{ filter }}{% else %}search-{% endif %}modal-open specify-link" href="#{{ filter }}pwPlace">{% trans 'Уточнить географию' %}</a>
+						<button class="icon-check modal-approve" type="submit">{% if submitText %}{{ submitText }}{% else %}{% trans 'Искать' %}{% endif %}</button>
+						<button class="gray modal-clear" type="submit">{% trans 'Очистить' %}</button>
+						<a class="{% if filter %}{{ filter }}{% else %}search-{% endif %}modal-open specify-link" href="#{{ filter }}pwPlace">{% trans 'Уточнить географию' %}</a>
 						{% if hasDate %}<a class=" search-modal-open specify-link" href="#pwPeriod">{% trans 'Уточнить дату' %}</a>{% endif %}
 					</div>
 				</div>

templates/client/static_client/css/main.css

@@ -2059,8 +2059,10 @@ button.icon-save:before {
 		box-sizing: border-box;
 	}
 
-.search-form button,
+	.search-form button.search_submit,
-.in-search-form button{
+	.search-form button.modal-approve,
+	.in-search-form button.search_submit,
+	.in-search-form button.modal-approve{
 		display: inline-block;
 		vertical-align: top;
 		height: 40px;
@@ -2081,12 +2083,14 @@ button.icon-save:before {
 		-webkit-filter: none;
 		filter: none;
 	}
-.pwf-buttons-line button{
+	button.modal-approve{
-	border-radius: 4px;
+		border-radius: 4px !important;
 	}
 
-.search-form button:before,
+	.search-form button.search_submit:before,
-.in-search-form button:before {
+	.search-form button.modal-approve:before,
+	.in-search-form button.search_submit:before ,
+	.in-search-form button.modal-approve:before {
 		content: ' ';
 		display: inline-block;
 		vertical-align: middle;
@@ -2189,10 +2193,13 @@ button.icon-save:before {
 		font-style: normal;
 		color: #a2a2a2;
 	}
-
+	/* # clear all button*/
-
+	.in-search-form .modal-clear,
-.mp-catalog {
+	.search-form .modal-clear{
-
+		height: 40px;
+		border: 1px solid #fff;
+		padding: 0 25px;
+		box-shadow: 0 1px 0 rgba(0, 0, 0, .2), inset 0 1px 0 rgba(0, 0, 0, .2);
 	}
 
 /* end of search block*/
@@ -4032,7 +4039,6 @@ form.s-message {
 .c-select-box .csb-menu .q-sel {
 	width: 190px;
 	float: right;
-	margin-top: 1em;
 
 }
 
@@ -12013,6 +12019,21 @@ hr + .rq-note {
 	.mt-0{
 		margin-top: 0;
 	}
+	button.gray{
+		background: #dbdbdb; /* Old browsers */
+		background: -moz-linear-gradient(top,  #dbdbdb 0%, #bdbdbd 100%); /* FF3.6+ */
+		background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#dbdbdb), color-stop(100%,#bdbdbd)); /* Chrome,Safari4+ */
+		background: -webkit-linear-gradient(top,  #dbdbdb 0%,#bdbdbd 100%); /* Chrome10+,Safari5.1+ */
+		background: -o-linear-gradient(top,  #dbdbdb 0%,#bdbdbd 100%); /* Opera 11.10+ */
+		background: -ms-linear-gradient(top,  #dbdbdb 0%,#bdbdbd 100%); /* IE10+ */
+		background: linear-gradient(to bottom,  #dbdbdb 0%,#bdbdbd 100%); /* W3C */
+		filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#dbdbdb', endColorstr='#bdbdbd',GradientType=0 ); /* IE6-9 */
+
+	}
+	button.gray:hover{
+		background: #dbdbdb; /* Old browsers */
+
+	}
 
 
 

templates/client/static_client/js/_modules/block.search.js

@@ -359,7 +359,7 @@ if (EXPO.searchBlock){
 					}
 					return false;
 				});
-				$('.clear', $modal).on('click', function () {
+				$('.modal-clear', $modal).on('click', function () {
 					self.resetList();
 					return false;
 				});
@@ -1118,7 +1118,7 @@ if (EXPO.searchBlock){
 				/**
 				 * clear all button behavior
 				 */
-				$('.clear',$modal).on('click', function () {
+				$('.modal-clear',$modal).on('click', function () {
 					self.resetList();
 					return false;
 				});