Merge pull request #935 from SmoKE585/alpha

Очередные фиксы меню
sergejey · Mar 19, 2021 · 13b3a69 · 13b3a69
2 parents f65046c + 342ca47
commit 13b3a69
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 38 deletions.
diff --git a/3rdparty/bootstrap/css/bootstrap.min.css b/3rdparty/bootstrap/css/bootstrap.min.css
@@ -3758,7 +3758,7 @@
 {
 	overflow-y:auto
 }
-	@media(min-width:768px)
+	@media(min-width:1231px)
 {
 .navbar-collapse
 {
@@ -3902,7 +3902,7 @@
 	padding-bottom:10px;
 	line-height:20px
 }
-	@media(max-width:767px)
+@media(max-width: 1230px)
 {
 .navbar-nav .open .dropdown-menu
 {

diff --git a/css/admin.css b/css/admin.css
@@ -1,39 +1,43 @@
-@media (max-width: 1050px) {
-        .navbar-header {
-                float: none;
-        }
-        .navbar-left,.navbar-right {
-                float: none !important;
-        }
-        .navbar-toggle {
-                display: block;
-        }
-        .navbar-collapse {
-                border-top: 1px solid transparent;
-                box-shadow: inset 0 1px 0 rgba(255,255,255,0.1);
-        }
-        .navbar-fixed-top {
-                top: 0;
-                border-width: 0 0 1px;
-        }
-        .navbar-collapse.collapse {
-                display: none!important;
-        }
-        .navbar-nav {
-                float: none!important;
-                margin-top: 7.5px;
-        }
-        .navbar-nav>li {
-                float: none;
-        }
-        .navbar-nav>li>a {
-                padding-top: 10px;
-                padding-bottom: 10px;
-        }
-        .collapse.in{
-                display:block !important;
-        }
+@media (max-width: 1230px) {
+	.navbar-header {
+			float: none;
+	}
+	.navbar-left,.navbar-right {
+			float: none !important;
+	}
+	.navbar-toggle {
+			display: block;
+	}
+	.navbar-collapse {
+			border-top: 1px solid transparent;
+			box-shadow: inset 0 1px 0 rgba(255,255,255,0.1);
+	}
+	.navbar-fixed-top {
+			top: 0;
+			border-width: 0 0 1px;
+	}
+	.navbar-collapse.collapse {
+			display: none!important;
+	}
+	.navbar-nav {
+			float: none!important;
+			margin-top: 7.5px;
+	}
+	.navbar-nav>li {
+			float: none;
+	}
+	.navbar-nav>li>a {
+			padding-top: 10px;
+			padding-bottom: 10px;
+	}
+	.collapse.in{
+			display:block !important;
+	}
+	#searchbtnhide {
+		display: none;
+	}
 }
+
 s
 .color-white {
         color: white;

diff --git a/templates/panel.html b/templates/panel.html
@@ -802,7 +802,7 @@
 				</li>
 				--->
 			</ul>
-			<div class="hidden-xs hidden-sm">
+			<div id="searchbtnhide">
 				<ul class="nav navbar-nav navbar-right">
 					<li>
 						<a href="javascript://" data-toggle="modal" data-target="#mdmGlobalSearchModal" data-backdrop="static"><span style="border: 1px solid;border-radius: 4px;background: #f0ad4e;color: white;padding: 1rem 2rem;"><i class="glyphicon glyphicon-search"></i> <#LANG_SEARCH#></span></a>