Apdated maxsite#41

cuprum · Apr 13, 2015 · 4ca29b2 · 4ca29b2
1 parent a841d4f
commit 4ca29b2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 43 deletions.
diff --git a/application/maxsite/templates/default/assets/less/main/my-template.less b/application/maxsite/templates/default/assets/less/main/my-template.less
@@ -16,12 +16,10 @@ div.social a {
 
 // поиск в меню
 .my-search {
-
 	.bor-none;
 	.h48px;
 	.pad0-tb;
 	.w200px;
-	.b-hide;
 	.bg-gray600; 
 
 	&:focus {
@@ -31,6 +29,11 @@ div.social a {
 	}
 }
 
+.my-search--hidden {
+	.pad0-rl;
+	.w0;
+}
+
 
 // список в сайдбаре
 ul.is_link {

diff --git a/application/maxsite/templates/default/components/top1/top1.php b/application/maxsite/templates/default/components/top1/top1.php
@@ -40,58 +40,24 @@
 
 	<div class="w100-tablet"><?php if ($fn = mso_fe('components/_menu/_menu.php')) require($fn); ?></div>
 
-	<div class="fs">
-		<form class="f_search" name="f_search" method="get" onsubmit="location.href='<?= getinfo('siteurl') ?>search/' + encodeURIComponent(this.s.value).replace(/%20/g, '+'); return false;">
-			<input class="my-search" type="search" name="s" id="sss" placeholder="Поиск..."><label class="label-search i-search icon-square bg-gray700 t-gray300 cursor-pointer" for="sss"></label>
+	<div class="">
+		<form name="f_search" method="get" onsubmit="location.href='<?= getinfo('siteurl') ?>search/' + encodeURIComponent(this.s.value).replace(/%20/g, '+'); return false;">
+			<input class="my-search my-search--hidden" type="search" name="s" id="sss" placeholder="Поиск..."><label class="label-search i-search icon-square bg-gray700 t-gray300 cursor-pointer" for="sss"></label>
 		</form>
-		<style>
-			.f_search .my-search {
-				display: inline-block;
-				padding-left: 0;
-				padding-right: 0;
-				width: 0;
-			}
-
-			.slided-input .my-search {
-				padding-left: 6px;
-				padding-right: 6px;
-				width: 180px;
-			}
-
-			@media (max-width: 480px) {
-				.fs {
-					width: 100%
-				}
-
-				.f_search {
-					display: flex;
-					justify-content: flex-end;
-				}
-
-				.slided-input .my-search {
-					box-sizing: border-box;
-					width: calc(100% - 48px);
-				}
-			}
-		</style>
 		<script>
 			$(document).on("click", function(e) {
-				var searchForm = $(".f_search");
 				var searchInput = $(".my-search");
 
 				if ( $(e.target).hasClass("label-search") ) {
-					if ( !searchInput.hasClass("visible") ) {
-						searchForm.addClass("slided-input");
-						searchInput.addClass("visible");
+					if ( searchInput.hasClass("my-search--hidden") ) {
+						searchInput.removeClass("my-search--hidden");
 					}
 					else {
-						searchForm.removeClass("slided-input");
-						searchInput.removeClass("visible");
+						searchInput.addClass("my-search--hidden");
 					}
 				}
 				else if ( !$(e.target).hasClass("label-search") && !$(e.target).hasClass("my-search") ) {
-					searchForm.removeClass("slided-input");
-					searchInput.removeClass("visible");
+					searchInput.addClass("my-search--hidden");
 				}
 			});
 		</script>