Merge branch 'release/7.1.x' into release/7.2.x

yurabakhtin · yurabakhtin · commit 44f0335248b2 · 2020-08-13T15:52:19.000+03:00
# Conflicts:
#	skins/bootstrap_site_tabs_skin/style.min.css
diff --git a/conf/_application.php b/conf/_application.php
@@ -21,7 +21,7 @@
  * Release date (ISO)
  * @global string
  */
-$app_date = '2020-08-12';
+$app_date = '2020-08-13';
 
 /**
  * Is this b2evolution PRO?
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;
-  margin: -17px 0 0 -6px;
+  margin: -17px 0 -1px -6px;
 }
 #evo_site_header .swhead_sitename.swhead_logo a {
   padding: 0;
@@ -63,7 +63,7 @@ div.level1 {
 div.level1 nav ul.nav.nav-tabs {
   margin: 0;
   position: relative;
-  top: 2px;
+  top: 1px;
   border-bottom: 1px solid #ccc;
 }
 div.level1 nav ul.nav.nav-tabs li {
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;
-			margin: -17px 0 0 -6px;
+			margin: -17px 0 -1px -6px;
 			a {
 				padding: 0;
 			}
@@ -67,7 +67,7 @@ div.level1 {
 		ul.nav.nav-tabs {
 			margin: 0;
 			position: relative;
-			top: 2px;
+			top: 1px;
 			border-bottom: 1px solid #ccc;
 			li {
 				vertical-align: bottom;
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`		`- margin: -17px 0 0 -6px;`
	`20`	`+ margin: -17px 0 -1px -6px;`
`21`	`21`	`}`
`22`	`22`	`#evo_site_header .swhead_sitename.swhead_logo a {`
`23`	`23`	`padding: 0;`
`@@ -63,7 +63,7 @@ div.level1 {`
`63`	`63`	`div.level1 nav ul.nav.nav-tabs {`
`64`	`64`	`margin: 0;`
`65`	`65`	`position: relative;`
`66`		`- top: 2px;`
	`66`	`+ top: 1px;`
`67`	`67`	`border-bottom: 1px solid #ccc;`
`68`	`68`	`}`
`69`	`69`	`div.level1 nav ul.nav.nav-tabs li {`