v2.4.3

* Added option to hide admin bar logo drop-down menu. * Fixed issue with Gutenberg blocks being hidden behind admin menu. * Fixed issue with Gutenberg notices being partially obstructed behind Gutenberg top bar. * Fixed admin bar CSS on front-end. * Fixed alignment of WPBakery Page Builder modal windows.
GuyPrimavera · May 19, 2019 · 72015f7 · 72015f7
1 parent a7e8e3b
commit 72015f7
Show file tree

Hide file tree

Showing 9 changed files with 147 additions and 61 deletions.
diff --git a/admin/adminBar/adminBarLinks.php b/admin/adminBar/adminBarLinks.php
@@ -35,7 +35,9 @@ function aquila_remove_wp_logo_nodes() {
 }
 
 // Add Aquila links
-add_action('admin_bar_menu', 'aquila_wp_logo_links', 100);
+if (!$GLOBALS['aquilaHideLogoMenu']) {
+    add_action('admin_bar_menu', 'aquila_wp_logo_links', 100);
+}
 function aquila_wp_logo_links($admin_bar){
     $admin_bar->add_menu( array(
         'id'    => 'wpLessons',

diff --git a/admin/adminBar/customLogo.php b/admin/adminBar/customLogo.php
@@ -26,64 +26,68 @@ function clean_output_buffer() {
 
 // Admin bar
 function aquila_new_logo_admin() {
-	echo "<style type='text/css'>
-		#wpadminbar li#wp-admin-bar-wp-logo > .ab-item .ab-icon:before {
-			display: none!important;
-		}
-		#wpadminbar #wp-toolbar li#wp-admin-bar-wp-logo > .ab-item span.ab-icon {
-			background-image: url('" . $GLOBALS['aquilaNewLogo'] . "')!important;
-			background-size: contain;
-	    background-repeat: no-repeat;
-	    background-position: center center;
-	    margin: 0%!important;
-	    max-width: 80%;
-	    height: 70%;
-	    top: 15%;
-	    left: 10%;
-		}
-		#aquilaAdminbarIcon {
-			background-image: url('" . $GLOBALS['aquilaNewLogoSqr'] . "')!important;
-			background-size: 40px;
-	    background-repeat: no-repeat;
-	    background-position: center center;
-		}
-		#aquilaAdminbarIcon:before {
-			display: none!important;
-		}
-		body.folded #wpadminbar li#wp-admin-bar-wp-logo > .ab-item .ab-icon:before {
-			display: none!important;
-		}
-		body.folded #wpadminbar #wp-toolbar li#wp-admin-bar-wp-logo > .ab-item span.ab-icon {
-			background-image: url('" . $GLOBALS['aquilaNewLogoSqr'] . "')!important;
-			background-size: contain;
-	    background-repeat: no-repeat;
-	    background-position: center center;
-			margin: 0%!important;
-			max-width: 80%;
-			height: 70%;
-			top: 15%;
-			left: 10%;
-		}		
-	</style>";
+	if ( is_admin_bar_showing() ) {
+		echo "<style type='text/css'>
+			#wpadminbar li#wp-admin-bar-wp-logo > .ab-item .ab-icon:before {
+				display: none!important;
+			}
+			#wpadminbar #wp-toolbar li#wp-admin-bar-wp-logo > .ab-item span.ab-icon {
+				background-image: url('" . $GLOBALS['aquilaNewLogo'] . "')!important;
+				background-size: contain;
+				background-repeat: no-repeat;
+				background-position: center center;
+				margin: 0%!important;
+				max-width: 80%;
+				height: 70%;
+				top: 15%;
+				left: 10%;
+			}
+			#aquilaAdminbarIcon {
+				background-image: url('" . $GLOBALS['aquilaNewLogoSqr'] . "')!important;
+				background-size: 40px;
+				background-repeat: no-repeat;
+				background-position: center center;
+			}
+			#aquilaAdminbarIcon:before {
+				display: none!important;
+			}
+			body.folded #wpadminbar li#wp-admin-bar-wp-logo > .ab-item .ab-icon:before {
+				display: none!important;
+			}
+			body.folded #wpadminbar #wp-toolbar li#wp-admin-bar-wp-logo > .ab-item span.ab-icon {
+				background-image: url('" . $GLOBALS['aquilaNewLogoSqr'] . "')!important;
+				background-size: contain;
+				background-repeat: no-repeat;
+				background-position: center center;
+				margin: 0%!important;
+				max-width: 80%;
+				height: 70%;
+				top: 15%;
+				left: 10%;
+			}		
+		</style>";
+	}
 }
 
 function aquila_new_logo_sqr_admin() {
-	echo "<style type='text/css'>
-		body.folded #wpadminbar li#wp-admin-bar-wp-logo > .ab-item .ab-icon:before {
-			display: none!important;
-		}
-		body.folded #wpadminbar #wp-toolbar li#wp-admin-bar-wp-logo > .ab-item span.ab-icon {
-			background-image: url('" . $GLOBALS['aquilaNewLogoSqr'] . "')!important;
-			background-size: contain;
-	    background-repeat: no-repeat;
-	    background-position: center center;
-			margin: 0%!important;
-			max-width: 80%;
-			height: 80%;
-			top: 10%;
-			left: 10%;
-		}
-	</style>";
+	if ( is_admin_bar_showing() ) {
+		echo "<style type='text/css'>
+			body.folded #wpadminbar li#wp-admin-bar-wp-logo > .ab-item .ab-icon:before {
+				display: none!important;
+			}
+			body.folded #wpadminbar #wp-toolbar li#wp-admin-bar-wp-logo > .ab-item span.ab-icon {
+				background-image: url('" . $GLOBALS['aquilaNewLogoSqr'] . "')!important;
+				background-size: contain;
+				background-repeat: no-repeat;
+				background-position: center center;
+				margin: 0%!important;
+				max-width: 80%;
+				height: 80%;
+				top: 10%;
+				left: 10%;
+			}
+		</style>";
+	}
 }
 
 ?>
diff --git a/admin/options/createFields.php b/admin/options/createFields.php
@@ -24,6 +24,9 @@ function aquila_chk_abLinks_render(  ) {
 function aquila_chk_abVisible_render(  ) { 
 	aquila_checkbox ('aquila_settings', 'aquila_chk_abVisible', '');
 }
+function aquila_chk_abLogoMenuHide_render(  ) { 
+	aquila_checkbox ('aquila_settings', 'aquila_chk_abLogoMenuHide', '');
+}
 
 // Login page
 function aquila_chk_loginDisable_render(  ) { 

diff --git a/admin/options/registerSettings.php b/admin/options/registerSettings.php
@@ -120,6 +120,13 @@ function aquila_settings_init(  ) {
 		'aquilaGeneralSettings', 
 		'aquila_adminbarSettings_section'
 	);
+	add_settings_field( 
+		'aquila_chk_abLogoMenuHide', 
+		__( '<strong>Hide Adminbar Logo Menu?</strong>', 'aquila-admin-theme' ), 
+		'aquila_chk_abLogoMenuHide_render', 
+		'aquilaGeneralSettings', 
+		'aquila_adminbarSettings_section'
+	);
 
 	// Admin bar
 	add_settings_field( 

diff --git a/admin/options/setVariables.php b/admin/options/setVariables.php
@@ -38,6 +38,11 @@
 if ( aquila_isset('aquila_chk_abVisible') ) {
 	$aquilaShowFullAdminbar = true;
 }
+
+if ( aquila_isset('aquila_chk_abLogoMenuHide') ) {
+	$aquilaHideLogoMenu = true;
+}
+
 /*
 if ( aquila_isset('aquila_new_logo') ) {
 	$aquilaCustomLogo = true;

diff --git a/aquila-admin-theme.php b/aquila-admin-theme.php
@@ -5,7 +5,7 @@
  * Description: The Aquila Admin Theme
  * Author: Guy Primavera
  * Author URI: https://guyprimavera.com/
- * Version: 2.4.2
+ * Version: 2.4.3
  * Text Domain: aquila-admin-theme
  * Domain Path: /lang/
  * License: GPL2

diff --git a/css/aquila.css b/css/aquila.css
@@ -2732,6 +2732,28 @@ body.auto-fold #adminmenu .update-plugins .plugin-count {
 .wp-responsive-open div#wp-responsive-toggle a {
   border-color: transparent;
 }
+@media (min-width: 782px) {
+  body.auto-fold .edit-post-layout__content {
+    margin-left: 60px;
+  }
+}
+@media (min-width: 782px) and (min-width: 960px) {
+  body.auto-fold .edit-post-layout__content {
+    margin-left: 250px;
+  }
+}
+@media (min-width: 782px) {
+  .edit-post-layout__content {
+    margin-left: 250px;
+    top: 120px;
+    min-height: calc(-20%);
+  }
+}
+@media (min-width: 782px) {
+  body.folded .edit-post-layout__content {
+    margin-left: 60px;
+  }
+}
 #adminmenu,
 #adminmenu .wp-submenu,
 #adminmenuback,
@@ -3659,6 +3681,9 @@ body.wp-admin.folded .components-notice-list {
 body.wp-admin.is-fullscreen-mode .components-notice-list {
   left: 0 !important;
 }
+body.aquila #vc_ui-panel-add-element {
+  top: 10vh;
+}
 .media-frame.mode-grid .media-toolbar {
   height: 50px;
 }

diff --git a/css/aquila.less b/css/aquila.less
@@ -1,6 +1,6 @@
 @import "vars.less";
-@import "/../icons/faVars.less";
-@import "/../icons/variables.less";
+@import "../icons/faVars.less";
+@import "../icons/variables.less";
 @import "mdColours.less";
 @import url(https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css);
 
@@ -281,6 +281,30 @@ input[type=radio]:checked:before {
 	border-color: transparent;
 }
 
+// Gutenberg
+@media (min-width: 782px) {
+	body.auto-fold .edit-post-layout__content {
+			margin-left: @sideWidthFolded;
+	}
+}
+@media (min-width: 782px) and (min-width: 960px) {
+	body.auto-fold .edit-post-layout__content {
+			margin-left: @sideWidth;
+	}
+}
+@media (min-width: 782px) {
+	.edit-post-layout__content {
+			margin-left: @sideWidth;
+			top: 120px;
+			min-height: calc(100% - 120px);
+	}
+}
+@media (min-width: 782px) {
+	body.folded .edit-post-layout__content {
+			margin-left: @sideWidthFolded;
+	}
+}
+
 /// Admin Menu
 
 #adminmenu, #adminmenu .wp-submenu, #adminmenuback, #adminmenuwrap {
@@ -1205,6 +1229,12 @@ body.wp-admin {
 
 }
 
+// WpBakery Page Builder
+
+body.aquila #vc_ui-panel-add-element {
+	top: 10vh;
+}
+
 
 // Temp fixes 
 

diff --git a/readme.txt b/readme.txt
@@ -3,8 +3,8 @@ Contributors: GuyPrimavera
 Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=YVPWSJB4SPN5N
 Tags: admin theme, material design wordpress, material design admin theme, material design wordpress admin, material wordpress, admin, admin panel, admin theme style plugin, admin-theme, admin theme, aquila, backend theme, clean admin, color scheme, colour scheme, custom admin theme, flat admin theme, free admin theme, modern admin theme, new admin ui, plugin, simple admin theme, white label, white label admin, wordpress, WordPress admin, wordpress admin theme, wp-admin, wp admin page, wp admin theme
 Requires at least: 4.0
-Tested up to: 5.0-beta4
-Stable tag: 2.4.2
+Tested up to: 5.2
+Stable tag: 2.4.3
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -83,6 +83,13 @@ No. It only changes the admin area, the login page and the admin bar for logged-
 
 == Changelog ==
 
+= 2.4.3 - 19/05/2019 =
+* Added option to hide admin bar logo drop-down menu.
+* Fixed issue with Gutenberg blocks being hidden behind admin menu.
+* Fixed issue with Gutenberg notices being partially obstructed behind Gutenberg top bar.
+* Fixed admin bar CSS on front-end.
+* Fixed alignment of WPBakery Page Builder modal windows.
+
 = 2.4.2 - 31/01/2019 =
 * Fixed error with lessc_formatter_compressed class.
 * Added option to disable login page styling.
@@ -206,6 +213,9 @@ No. It only changes the admin area, the login page and the admin bar for logged-
 
 == Upgrade Notice ==
 
+= 2.4.3 =
+* Minor bug fixes.
+
 = 2.4.2 =
 * Bug fixes.