Fix site logo on skin "Bootstrap Site Tabs"

yurabakhtin · yurabakhtin · commit e4df5ca026bf · 2020-08-06T16:33:56.000+03:00
diff --git a/conf/_application.php b/conf/_application.php
@@ -21,7 +21,7 @@
  * Release date (ISO)
  * @global string
  */
-$app_date = '2020-08-03';
+$app_date = '2020-08-06';
 
 /**
  * Is this b2evolution PRO?
diff --git a/skins/bootstrap_site_tabs_skin/_site_body_header.inc.php b/skins/bootstrap_site_tabs_skin/_site_body_header.inc.php
@@ -33,11 +33,6 @@
 
 <div id="evo_site_header" class="swhead_wrapper">
 
-		<?php if( $site_has_logo_file ) { ?>
-			<div class="swhead_sitename<?php echo $site_title_class; ?>">
-				<a href="<?php echo $baseurl; ?>"><?php echo $site_name_text; ?></a>
-			</div>
-		<?php } ?>
 	<div class="swhead_menus">
 		<div class="container-fluid level1">
 
@@ -65,6 +60,12 @@
 					// ----------------------------- END OF "Right Navigation" CONTAINER -----------------------------
 				?>
 
+				<?php if( $site_has_logo_file ) { ?>
+				<div class="pull-left swhead_sitename<?php echo $site_title_class; ?>">
+					<a href="<?php echo $baseurl; ?>"><?php echo $site_name_text; ?></a>
+				</div>
+				<?php } ?>
+
 				<ul class="nav nav-tabs pull-left">
 <?php
 				if( ! $site_has_logo_file )
diff --git a/skins/bootstrap_site_tabs_skin/style.css b/skins/bootstrap_site_tabs_skin/style.css
@@ -17,7 +17,7 @@
 }
 #evo_site_header .swhead_sitename.swhead_logo {
   display: table-cell;
-  background-color: #ddd;
+  margin: -18px 0 0 -6px;
 }
 #evo_site_header .swhead_sitename.swhead_logo a {
   padding: 0;
@@ -36,10 +36,11 @@
 #evo_site_header .swhead_menus div.level1 nav .pull-right {
   margin-top: -10px;
 }
-#evo_site_header .swhead_menus div.level1 nav .pull-left li {
-  margin-right: 2px;
+#evo_site_header .swhead_menus div.level1 nav .pull-right a {
+  max-height: 40px;
 }
 #evo_site_header .swhead_menus div.level1 nav .pull-left li a {
+  margin-right: 0;
   background-color: #eee;
   border-color: #ddd;
   border-bottom: 1px solid #ccc;
diff --git a/skins/bootstrap_site_tabs_skin/style.less b/skins/bootstrap_site_tabs_skin/style.less
@@ -17,7 +17,7 @@
 		}
 		&.swhead_logo {
 			display: table-cell;
-			background-color: #ddd;
+			margin: -18px 0 0 -6px;
 			a {
 				padding: 0;
 			}
@@ -33,10 +33,13 @@
 		div.level1 {
 			nav .pull-right {
 				margin-top: -10px;
+				a {
+					max-height: 40px;
+				}
 			}
 			nav .pull-left li {
-				margin-right: 2px;
 				a {
+					margin-right: 0;
 					background-color: #eee;
 					border-color: #ddd;
 					border-bottom: 1px solid #ccc;
diff --git a/skins/bootstrap_site_tabs_skin/style.min.css b/skins/bootstrap_site_tabs_skin/style.min.css

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`}`
`18`	`18`	`#evo_site_header .swhead_sitename.swhead_logo {`
`19`	`19`	`display: table-cell;`
`20`		`- background-color: #ddd;`
	`20`	`+ margin: -18px 0 0 -6px;`
`21`	`21`	`}`
`22`	`22`	`#evo_site_header .swhead_sitename.swhead_logo a {`
`23`	`23`	`padding: 0;`
`@@ -36,10 +36,11 @@`
`36`	`36`	`#evo_site_header .swhead_menus div.level1 nav .pull-right {`
`37`	`37`	`margin-top: -10px;`
`38`	`38`	`}`
`39`		`-#evo_site_header .swhead_menus div.level1 nav .pull-left li {`
`40`		`- margin-right: 2px;`
	`39`	`+#evo_site_header .swhead_menus div.level1 nav .pull-right a {`
	`40`	`+ max-height: 40px;`
`41`	`41`	`}`
`42`	`42`	`#evo_site_header .swhead_menus div.level1 nav .pull-left li a {`
	`43`	`+ margin-right: 0;`
`43`	`44`	`background-color: #eee;`
`44`	`45`	`border-color: #ddd;`
`45`	`46`	`border-bottom: 1px solid #ccc;`