From 73686000a5ac6f65a3b22848c843d954a3f8634d Mon Sep 17 00:00:00 2001
From: Guy Primavera <17991356+GuyPrimavera@users.noreply.github.com>
Date: Sun, 19 May 2019 13:45:44 +0100
Subject: [PATCH] v2.4.2

* Fixed error with lessc_formatter_compressed class.
* Added option to disable login page styling.
* Fixed styling of password reset page.
* Fixed styling of registration page.
* Fixed undefined variable "visibleText".
* Fixed styling of input boxes.
* Updated part of welcome widget.
* Added darker background to clear PNG images in Media Library.
* Added option to change the admin area link colors.
---
 admin/adminBar/adminBarIcon.php    |  6 +--
 admin/adminBar/adminBarLinks.php   |  6 +--
 admin/adminBar/customLogo.php      | 22 ----------
 admin/colour/colourScheme.php      | 18 ++++++--
 admin/options/callbacks.php        |  8 ++++
 admin/options/createFields.php     | 12 ++++++
 admin/options/helpers.php          | 14 ++++++
 admin/options/options.php          |  1 +
 admin/options/registerSettings.php | 30 +++++++++++--
 admin/options/setVariables.php     | 69 ++++++++++++++++++++++++++++++
 admin/widgets/pluginWidget.php     |  1 +
 admin/widgets/welcomeWidget.php    |  2 +-
 aquila-admin-theme.php             |  9 ++--
 css/aquila.css                     | 25 ++++++-----
 css/aquila.less                    | 30 ++++++++-----
 css/login.css                      | 46 ++++++++++++++++++++
 css/login.less                     | 48 +++++++++++++++++++++
 login/aquila-login-screen.php      | 32 +++++++++++++-
 readme.txt                         | 18 +++++++-
 scripts.php                        | 34 +++++++++------
 20 files changed, 348 insertions(+), 83 deletions(-)
 create mode 100644 admin/options/setVariables.php

diff --git a/admin/adminBar/adminBarIcon.php b/admin/adminBar/adminBarIcon.php
index d78c36e..8e08291 100644
--- a/admin/adminBar/adminBarIcon.php
+++ b/admin/adminBar/adminBarIcon.php
@@ -3,8 +3,7 @@
 // Add icon in place of admin bar
 function aquila_adminbar_icon() {
 	if ( is_admin_bar_showing() ) {
-		$aquilaOptions = get_option( 'aquila_settings' );
-		if(isset($aquilaOptions['aquila_chk_abVisible']) && $aquilaOptions['aquila_chk_abVisible'] == 1) {
+		if ($GLOBALS['aquilaShowFullAdminbar']) {
 			echo '<style>
 				.aquilaFront #wpadminbar {
 					display: block;
@@ -19,8 +18,7 @@ function aquila_adminbar_icon() {
 // Add body class
 function aquila_adminbar_open_class( $classes ) {
 	if ( is_admin_bar_showing() ) {
-		$aquilaOptions = get_option( 'aquila_settings' );
-		if(isset($aquilaOptions['aquila_chk_abVisible']) && $aquilaOptions['aquila_chk_abVisible'] == 1) {
+		if ($GLOBALS['aquilaShowFullAdminbar']) {
 	    $classes[] = 'aquilaOpenBar';
 	  } else {
 	    $classes[] = 'aquilaClosedBar';
diff --git a/admin/adminBar/adminBarLinks.php b/admin/adminBar/adminBarLinks.php
index 19e6fd1..6f05cfc 100644
--- a/admin/adminBar/adminBarLinks.php
+++ b/admin/adminBar/adminBarLinks.php
@@ -1,11 +1,7 @@
 <?php if ( __FILE__ == $_SERVER['SCRIPT_FILENAME'] ) { exit; }
 
 // Admin Bar links
-$aquilaOptions = get_option( 'aquila_settings' );
-
-if(isset($aquilaOptions['aquila_chk_abLinks']) && $aquilaOptions['aquila_chk_abLinks'] == 1){
-    // do nothing
-} else {
+if (!$GLOBALS['aquilaShowAdminbarLinks']) {
     add_action( 'admin_bar_menu', 'aquila_admin_bar_cleanup', 200 );
     function aquila_admin_bar_cleanup() 
     {
diff --git a/admin/adminBar/customLogo.php b/admin/adminBar/customLogo.php
index 0c22a38..1380665 100644
--- a/admin/adminBar/customLogo.php
+++ b/admin/adminBar/customLogo.php
@@ -16,7 +16,6 @@ function clean_output_buffer() {
 if( isset($aquilaLogoSettings['aquila_new_logo']) && $aquilaLogoSettings['aquila_new_logo'] !== "" ) {
 	add_action( 'admin_head', 'aquila_new_logo_admin', 90); 
 	add_action( 'wp_head', 'aquila_new_logo_admin', 90); 
-	add_action( 'login_head', 'aquila_new_logo_login', 90 ); 
 }
 
 // Custom Logo (square)
@@ -68,27 +67,6 @@ function aquila_new_logo_admin() {
 	</style>";
 }
 
-// Login screen
-function aquila_new_logo_login() {
-	echo "<style type='text/css'>
-		body.login #login:before {
-			display: none!important;
-		}
-		body.login #login h1 a {
-			display: block!important;
-		}
-		body.login #login h1 a {
-			background-image: url('" . $GLOBALS['aquilaNewLogo'] . "')!important;
-			background-size: contain;
-	    background-repeat: no-repeat;
-	    background-position: center center;
-	    width: auto;
-	    height: 80px;
-	    max-width: 350px;
-		}
-	</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 {
diff --git a/admin/colour/colourScheme.php b/admin/colour/colourScheme.php
index 0703487..36138e6 100644
--- a/admin/colour/colourScheme.php
+++ b/admin/colour/colourScheme.php
@@ -5,8 +5,7 @@
 } else {
 	add_action('wp_before_admin_bar_render', 'colourSchemeCSS');
 }
-
-add_action('login_head', 'colourSchemeCSS');
+//add_action('login_head', 'colourSchemeCSS');
 function colourSchemeCSS() {
 include('mdColours.php');
 include('bright.php');
@@ -16,6 +15,7 @@ function colourSchemeCSS() {
 $aquilaColourSettings = get_option( 'aquilaColourSettings' );
 $aquilaPrimary = $aquilaColourSettings['aquila_primary_colour'];
 $aquilaSecondary = $aquilaColourSettings['aquila_secondary_colour'];
+$aquilaLinkText = $aquilaColourSettings['aquila_link_text_colour'];
 $aquilaMenuBack = $aquilaColourSettings['aquila_menu_back_colour'];
 $aquilaMenuText = $aquilaColourSettings['aquila_menu_text_colour'];
 
@@ -41,6 +41,12 @@ function colourSchemeCSS() {
   $secNew = $sec;
 }
 
+if ( $aquilaLinkText ) {
+  $linkText = $aquilaLinkText;
+} else {
+  $linkText = $mdGrey900;
+}
+
 if ( $aquilaMenuBack ) {
   $menu = $menuNew = $aquilaMenuBack;
   /*if( isDark( $menu, 99 ) ) {
@@ -102,7 +108,7 @@ function colourSchemeCSS() {
 }
 $bodyBack = $mdGrey100;
 $disabled = $mdGrey500;
-$linkText = $mdGrey900;
+//$linkText = $mdGrey900;
 
 // LessPHP
 if ( !class_exists( 'lessc' ) ) {
@@ -249,6 +255,10 @@ function colourSchemeCSS() {
   a:focus {
     color: @priD;
   }
+  .wp-block-freeform.block-library-rich-text__tinymce a,
+  .components-button.is-link {
+    color: @linkText;
+  }
   #media-upload a.del-link:hover,
   div.dashboard-widget-submit input:hover,
   .subsubsub a:hover,
@@ -723,7 +733,7 @@ function colourSchemeCSS() {
   background: @menu;
   color: @menuText;
   #login {
-    form#loginform {
+    & > form {
       background: @menu2;
     }
   }
diff --git a/admin/options/callbacks.php b/admin/options/callbacks.php
index 91629fb..4292eac 100644
--- a/admin/options/callbacks.php
+++ b/admin/options/callbacks.php
@@ -7,6 +7,14 @@ function aquilaDashboardCallback(  ) {
 function aquilaAdminbarCallback(  ) {
 	//echo __( 'Configure your admin bar', 'aquila-admin-theme' );
 }
+function aquilaLoginCallback(  ) {
+	/*echo '<form action="#">
+  <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
+    <input class="mdl-textfield__input" type="text" id="sample3">
+    <label class="mdl-textfield__label" for="sample3">Text...</label>
+  </div>
+</form>';*/
+}
 function aquilaLogoCallback(  ) {
 	echo __( 'Choose a custom logo for your admin area.', 'aquila-admin-theme' );
 }
diff --git a/admin/options/createFields.php b/admin/options/createFields.php
index c80bf0e..0a37366 100644
--- a/admin/options/createFields.php
+++ b/admin/options/createFields.php
@@ -1,5 +1,6 @@
 <?php if ( __FILE__ == $_SERVER['SCRIPT_FILENAME'] ) { exit; }
 
+// Dashboard
 function aquila_chk_pluginSupport_render() {
 	aquila_checkbox ('aquila_settings', 'aquila_chk_pluginSupport', '');
 }
@@ -15,6 +16,8 @@ function aquila_chk_hideFooter_render(  ) {
 function aquila_chk_showNag_render(  ) { 
 	aquila_checkbox ('aquila_settings', 'aquila_chk_showNag', '');
 }
+
+// Admin Bar
 function aquila_chk_abLinks_render(  ) { 
 	aquila_checkbox ('aquila_settings', 'aquila_chk_abLinks', '');
 }
@@ -22,6 +25,11 @@ function aquila_chk_abVisible_render(  ) {
 	aquila_checkbox ('aquila_settings', 'aquila_chk_abVisible', '');
 }
 
+// Login page
+function aquila_chk_loginDisable_render(  ) { 
+	aquila_checkbox ('aquila_settings', 'aquila_chk_loginDisable', '');
+}
+
 // Logo upload
 function aquila_new_logo_render(  ) { 
 	aquila_img_upload( 'aquilaLogoSettings', 'aquila_new_logo' );
@@ -38,6 +46,10 @@ function aquila_primary_colour_render() {
 function aquila_secondary_colour_render() {
 	aquila_colour_picker( 'aquilaColourSettings', 'aquila_secondary_colour' );
 }
+function aquila_link_text_colour_render() {
+	aquila_colour_picker( 'aquilaColourSettings', 'aquila_link_text_colour' );
+}
+
 /*
 function aquila_text_colour_render() {
 	aquila_colour_picker( 'aquilaColourSettings', 'aquila_text_colour' );
diff --git a/admin/options/helpers.php b/admin/options/helpers.php
index 85b4d7e..605569c 100644
--- a/admin/options/helpers.php
+++ b/admin/options/helpers.php
@@ -49,6 +49,9 @@ function aquila_colour_picker( $optionGroup, $optionName ) {
 		case 'aquila_background_colour':
 			$colour = '#f5f5f5'; 
 			break;
+		case 'aquila_link_text_colour':
+			$colour = '#212121'; 
+			break;
 		case 'aquila_text_colour':
 			$colour = '#23282d'; 
 			break;
@@ -77,4 +80,15 @@ function aquila_help_box( $url, $title, $subtitle ) {
 	';
 }
 
+// Check checkbox values
+function aquila_isset( $var ) {
+	$aquilaOptions = get_option( 'aquila_settings' );
+	if(isset($aquilaOptions[$var]) && $aquilaOptions[$var] == 1) {
+		return true;
+	} else {
+		return false;
+	}
+}
+
+
 ?>
\ No newline at end of file
diff --git a/admin/options/options.php b/admin/options/options.php
index 786732d..08b8e04 100644
--- a/admin/options/options.php
+++ b/admin/options/options.php
@@ -6,5 +6,6 @@
 include('callbacks.php');
 include('createOptionsPage.php');
 include('help.php');
+include('setVariables.php');
 
 ?>
\ No newline at end of file
diff --git a/admin/options/registerSettings.php b/admin/options/registerSettings.php
index 6d2a4cb..d59a08f 100644
--- a/admin/options/registerSettings.php
+++ b/admin/options/registerSettings.php
@@ -36,6 +36,12 @@ function aquila_settings_init(  ) {
 		'aquilaAdminbarCallback', 
 		'aquilaGeneralSettings'
 	);
+	add_settings_section(
+		'aquila_loginSettings_section', 
+		__( 'Login page', 'aquila-admin-theme' ), 
+		'aquilaLoginCallback', 
+		'aquilaGeneralSettings'
+	);
 	add_settings_section(
 		'aquila_logoSettings_section', 
 		__( 'Custom Logo', 'aquila-admin-theme' ), 
@@ -62,7 +68,7 @@ function aquila_settings_init(  ) {
 	);
 
 	// Add settings fields
-	/// Dashboard settings
+	// Dashboard settings
 	add_settings_field( 
 		'aquila_chk_pluginSupport', 
 		__( 'Show Editors <strong>Plugins Support</strong> metabox?', 'aquila-admin-theme' ), 
@@ -99,7 +105,7 @@ function aquila_settings_init(  ) {
 		'aquila_dashboardSettings_section' 
 	);
 
-	/// Admin bar
+	// Admin bar
 	add_settings_field( 
 		'aquila_chk_abLinks', 
 		__( 'Show <strong>Adminbar</strong> links?', 'aquila-admin-theme' ), 
@@ -115,7 +121,16 @@ function aquila_settings_init(  ) {
 		'aquila_adminbarSettings_section'
 	);
 
-	/// Custom Logo
+	// Admin bar
+	add_settings_field( 
+		'aquila_chk_loginDisable', 
+		__( '<strong>Disable</strong> Aquila login page styling?', 'aquila-admin-theme' ), 
+		'aquila_chk_loginDisable_render', 
+		'aquilaGeneralSettings', 
+		'aquila_loginSettings_section' 
+	);
+
+	// Custom Logo
 	add_settings_field( 
 		'aquila_new_logo', 
 		__( 'Custom logo', 'aquila-admin-theme' ), 
@@ -131,7 +146,7 @@ function aquila_settings_init(  ) {
 		'aquila_logoSettings_section' 
 	);
 
-	/// Colour Scheme
+	// Colour Scheme
 	add_settings_field( 
 		'aquila_primary_colour', 
 		__( 'Primary Color', 'aquila-admin-theme' ), 
@@ -146,6 +161,13 @@ function aquila_settings_init(  ) {
 		'aquilaColourSettings', 
 		'aquila_colourSettings_section' 
 	);
+	add_settings_field( 
+		'aquila_link_text_colour', 
+		__( 'Link Text Color', 'aquila-admin-theme' ), 
+		'aquila_link_text_colour_render', 
+		'aquilaColourSettings', 
+		'aquila_colourSettings_section' 
+	);
 	/*
 	add_settings_field( 
 		'aquila_text_colour', 
diff --git a/admin/options/setVariables.php b/admin/options/setVariables.php
new file mode 100644
index 0000000..1bf6f59
--- /dev/null
+++ b/admin/options/setVariables.php
@@ -0,0 +1,69 @@
+<?php if ( __FILE__ == $_SERVER['SCRIPT_FILENAME'] ) { exit; }
+$aquilaOptions = get_option( 'aquila_settings' );
+
+if ( ! function_exists( 'get_plugins' ) ) {
+  require_once ABSPATH . 'wp-admin/includes/plugin.php';
+}
+
+$aquilaShowPluginSupport = $aquilaHideDashboardMetaboxes = $aquilaNoPostToBlog = $aquilaHideFooter = $aquilaShowNag = $aquilaShowAdminbarLinks = $aquilaShowFullAdminbar = $aquilaCustomLogo = $aquilaCustomLogoSquare = $aquilaColourPrimary = $aquilaColourSecondary = $aquilaColourMenuBackground = $aquilaColourMenuText = $aquilaLoginDisable = false;
+
+$aquilaDetails = get_plugins()['aquila-admin-theme/aquila-admin-theme.php'];
+$aquilaVer = $aquilaDetails['Version'];
+
+// Checkboxes
+if ( aquila_isset('aquila_chk_pluginSupport') ) {
+	$aquilaShowPluginSupport = true;
+}
+
+if ( aquila_isset('aquila_chk_dashBoxes') ) {
+	$aquilaHideDashboardMetaboxes = true;
+}
+
+if ( aquila_isset('aquila_chk_postBlog') ) {
+	$aquilaNoPostToBlog = true;
+}
+
+if ( aquila_isset('aquila_chk_hideFooter') ) {
+	$aquilaHideFooter = true;
+}
+
+if ( aquila_isset('aquila_chk_showNag') ) {
+	$aquilaShowNag = true;
+}
+
+if ( aquila_isset('aquila_chk_abLinks') ) {
+	$aquilaShowAdminbarLinks = true;
+}
+
+if ( aquila_isset('aquila_chk_abVisible') ) {
+	$aquilaShowFullAdminbar = true;
+}
+/*
+if ( aquila_isset('aquila_new_logo') ) {
+	$aquilaCustomLogo = true;
+}
+
+if ( aquila_isset('aquila_new_logo_sqr') ) {
+	$aquilaCustomLogoSquare = true;
+}
+
+if ( aquila_isset('aquila_primary_colour') ) {
+	$aquilaColourPrimary = true;
+}
+if ( aquila_isset('aquila_secondary_colour') ) {
+	$aquilaColourSecondary = true;
+}
+if ( aquila_isset('aquila_menu_back_colour') ) {
+	$aquilaColourMenuBackground = true;
+}
+if ( aquila_isset('aquila_menu_text_colour') ) {
+	$aquilaColourMenuText = true;
+}
+*/
+if ( aquila_isset('aquila_chk_loginDisable') ) {
+	$aquilaLoginDisable = true;
+}
+
+
+
+?>
\ No newline at end of file
diff --git a/admin/widgets/pluginWidget.php b/admin/widgets/pluginWidget.php
index afe6815..77d83c6 100644
--- a/admin/widgets/pluginWidget.php
+++ b/admin/widgets/pluginWidget.php
@@ -22,6 +22,7 @@ function aquila_plugin_widget() {
 
 add_action( 'wp_dashboard_setup', 'aquila_plugin_widget' );
 function aquila_plugin_widget_function() {
+	$visibleText = '';
 echo "<p class='about-description'>"; 
 
 	$aquilaOptions = get_option( 'aquila_settings' );
diff --git a/admin/widgets/welcomeWidget.php b/admin/widgets/welcomeWidget.php
index 218990a..917a290 100644
--- a/admin/widgets/welcomeWidget.php
+++ b/admin/widgets/welcomeWidget.php
@@ -38,7 +38,7 @@ function aquila_welcome_widget_function() {
 		<ul>
 			<li><i class='aquila-wordpress'></i><strong>" . __( 'WordPress', 'aquila-admin-theme' ) . "</strong><br/>" . $wordpressVer . "</li>
 			<li><i class='aquila-aquila'></i><strong>" . __( 'Aquila', 'aquila-admin-theme' ) . "</strong><br/>" . $aquilaVer . "</li>
-			<li><i class='aquila-palette'></i><strong>" . $themeInfo->get( 'Name' ) . "</strong><br/>" . $themeInfo->get( 'Version' ) . "</li>
+			<li><i class='aquila-palette'></i><strong>Theme</strong><br/>" . $themeInfo->get( 'Name' ) . " (" . $themeInfo->get( 'Version' ) . ")</li>
 			<li><i class='aquila-terminal'></i><strong>" . __( 'Server IP', 'aquila-admin-theme' ) . "</strong><br/>" . $server_ip_address . "</li>
 			<li><i class='aquila-php'></i><strong>" . __( 'PHP', 'aquila-admin-theme' ) . "</strong><br/>" . $phpVersion . "</li>
 			<li><i class='aquila-cubes'></i><strong>" . __( 'Memory Usage', 'aquila-admin-theme' ) . "</strong><br/>" . $memUsage . " / " . $memLimit . "MB (" . $memPercent . "%)</li>
diff --git a/aquila-admin-theme.php b/aquila-admin-theme.php
index a892212..09463e3 100644
--- a/aquila-admin-theme.php
+++ b/aquila-admin-theme.php
@@ -5,21 +5,20 @@
  * Description: The Aquila Admin Theme
  * Author: Guy Primavera
  * Author URI: https://guyprimavera.com/
- * Version: 2.4.1
+ * Version: 2.4.2
  * Text Domain: aquila-admin-theme
  * Domain Path: /lang/
  * License: GPL2
  *
- * 2018 Guy Primavera
+ * 2019 Guy Primavera
  */ 
 
-$aquilaVer = "2.4.1";
-
+include ('admin/options/options.php');
 include ('scripts.php');
+
 include ('login/aquila-login-screen.php');
 include ('admin/dashboard.php');
 include ('admin/adminBar.php');
-include ('admin/options/options.php');
 include ('admin/colour/colourScheme.php');
 
 // Plugin action links
diff --git a/css/aquila.css b/css/aquila.css
index fa4f537..6466b51 100644
--- a/css/aquila.css
+++ b/css/aquila.css
@@ -2491,16 +2491,17 @@ body.wp-admin .add-new-h2:active,
 body.wp-admin .page-title-action,
 .wp-core-ui .page-title-action:active,
 body.wp-admin .page-title-action:active {
-  -webkit-border-radius: 0px;
-  border-radius: 0;
+  -webkit-border-radius: 4px;
+  border-radius: 4px;
   outline: 0;
   text-transform: uppercase;
-  letter-spacing: 1px;
-  font-weight: 700;
-  line-height: 2.3;
+  letter-spacing: 0px;
+  font-weight: 500;
+  line-height: 2.1;
   border: none!important;
   box-shadow: none!important;
   text-shadow: none!important;
+  font-size: 14px;
   transition: 0.2s all linear;
   -webkit-transition: 0.2s all linear;
   -moz-transition: 0.2s all linear;
@@ -2555,10 +2556,8 @@ body.wp-admin .page-title-action.cpac-edit {
 .wp-core-ui input[type=number],
 .wp-core-ui select,
 .wp-core-ui textarea {
-  background: none;
   box-shadow: none;
-  border: none;
-  border-bottom: 2px solid transparent;
+  border-bottom: 2px solid #616161;
   transition: 0.2s all linear;
   -webkit-transition: 0.2s all linear;
   -moz-transition: 0.2s all linear;
@@ -2633,8 +2632,6 @@ body.wp-admin .page-title-action.cpac-edit {
 }
 .wp-core-ui input[type=radio],
 .wp-core-ui input[type=checkbox] {
-  background: none;
-  box-shadow: none;
   transition: 0.2s all linear;
   -webkit-transition: 0.2s all linear;
   -moz-transition: 0.2s all linear;
@@ -3028,6 +3025,14 @@ body.wp-admin .update-nag {
   border: none;
   box-shadow: none;
 }
+body.wp-admin .wp-core-ui .attachment .thumbnail,
+body.wp-admin .edit-attachment-frame .attachment-media-view .details-image,
+body.wp-admin .imgedit-crop-wrap img {
+  background-color: #434343;
+  background-image: linear-gradient(45deg, #9e9e9e 25%, transparent 25%, transparent 75%, #9e9e9e 75%, #9e9e9e), linear-gradient(45deg, #9e9e9e 25%, transparent 25%, transparent 75%, #9e9e9e 75%, #9e9e9e);
+  background-position: 0 0,10px 10px;
+  background-size: 20px 20px;
+}
 #wpfooter #footer-upgrade {
   display: none;
 }
diff --git a/css/aquila.less b/css/aquila.less
index 7633355..9c9054d 100644
--- a/css/aquila.less
+++ b/css/aquila.less
@@ -120,16 +120,17 @@ html.wp-toolbar {
 
 .wp-core-ui, body.wp-admin {
 	.button, .button-primary, .button-secondary, .add-new-h2, .add-new-h2:active, .page-title-action, .page-title-action:active {
-    -webkit-border-radius: 0px;
-    border-radius: 0;
+    -webkit-border-radius: 4px;
+    border-radius: 4px;
     outline: 0;
     text-transform: uppercase;
-    letter-spacing: 1px;
-    font-weight: 700;
-    line-height: 2.3;
+    letter-spacing: 0px;
+    font-weight: 500;
+    line-height: 2.1;
     border: none!important;
     box-shadow: none!important;
     text-shadow: none!important;
+    font-size: 14px;
     .trans;
     &.wpo_primary_big {
     	line-height: initial;
@@ -147,18 +148,19 @@ html.wp-toolbar {
 }
 .wp-core-ui {
   input[type=text], input[type=search], input[type=tel], input[type=time], input[type=url], input[type=week], input[type=password], input[type=color], input[type=date], input[type=datetime], input[type=datetime-local], input[type=email], input[type=month], input[type=number], select, textarea {
-    background: none;
+    //background: none;
     box-shadow: none;
-    border: none;
-    border-bottom: 2px solid transparent;
+    //border: none;
+    border-bottom: 2px solid #616161;
+    //padding: 8px;
     .trans;
 		&:hover, &:active, &:target, &:focus {
 			.mdShadow;
 		}
 	}
   input[type=radio], input[type=checkbox] {
-    background: none;
-    box-shadow: none;
+    //background: none;
+    //box-shadow: none;
     .trans;
 		&:hover, &:active, &:target, &:focus {
 			.mdShadow;
@@ -510,6 +512,14 @@ body.wp-admin {
     border: none;
     box-shadow: none;
 	}
+	.wp-core-ui .attachment .thumbnail,
+	.edit-attachment-frame .attachment-media-view .details-image,
+	.imgedit-crop-wrap img {
+    background-color: #434343;
+		background-image: linear-gradient(45deg,#9e9e9e 25%,transparent 25%,transparent 75%,#9e9e9e 75%,#9e9e9e),linear-gradient(45deg,#9e9e9e 25%,transparent 25%,transparent 75%,#9e9e9e 75%,#9e9e9e);
+	    background-position: 0 0,10px 10px;
+	    background-size: 20px 20px;
+	}
 }
 
 /// Footer
diff --git a/css/login.css b/css/login.css
index 2a334fd..5a9b36f 100644
--- a/css/login.css
+++ b/css/login.css
@@ -282,6 +282,52 @@ body.login #login form label {
   letter-spacing: 1px;
   line-height: 2;
 }
+body.login #login form#resetpassform {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+body.login #login form#resetpassform .user-pass1-wrap {
+  width: 100%;
+  max-width: 350px;
+  display: inline-block;
+}
+body.login #login form#resetpassform .user-pass1-wrap .wp-pwd {
+  opacity: 1;
+}
+body.login #login form#resetpassform .user-pass1-wrap .wp-pwd .password-input-wrapper {
+  width: 100%;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 20px;
+}
+body.login #login form#resetpassform .user-pass1-wrap .wp-pwd .password-input-wrapper input {
+  display: inherit;
+  margin: 0;
+}
+body.login #login form#resetpassform .user-pass1-wrap .wp-pwd .password-input-wrapper input[type=text] {
+  display: none;
+}
+body.login #login form#resetpassform .user-pass1-wrap .wp-pwd .password-input-wrapper .button.button-secondary {
+  margin-left: 20px;
+  padding: 20px 10px;
+  border-radius: 4px;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+  outline: none;
+  border: none;
+  box-shadow: none;
+}
+body.login #login form#resetpassform .user-pass1-wrap .wp-pwd .password-input-wrapper.show-password input {
+  display: none;
+}
+body.login #login form#resetpassform .user-pass1-wrap .wp-pwd .password-input-wrapper.show-password input[type=text] {
+  display: block;
+}
 body.login #backtoblog,
 body.login #nav {
   font-size: 13px;
diff --git a/css/login.less b/css/login.less
index ce0f351..38c0cae 100644
--- a/css/login.less
+++ b/css/login.less
@@ -113,6 +113,54 @@ body.login {
 		    letter-spacing: 1px;
 		    line-height: 2;
 			}
+			&#resetpassform {
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				.user-pass1-wrap {
+					width: 100%;
+					max-width: 350px;
+					display: inline-block;
+					.wp-pwd {
+						opacity: 1;
+						.password-input-wrapper {
+							width: 100%;
+							display: flex;
+							flex-direction: row;
+							justify-content: space-between;
+							align-items: center;
+					    margin-bottom: 20px;
+							input {
+								display: inherit;
+								margin: 0;
+								&[type=text] {
+									display:none;
+								}
+							}
+							.button.button-secondary {
+								margin-left: 20px;
+						    padding: 20px 10px;
+						    border-radius: 4px;
+						    display: flex;
+						    flex-direction: row;
+						    align-items: center;
+						    justify-content: center;
+						    outline: none;
+						    border: none;
+						    box-shadow: none;
+							}
+							&.show-password {
+								input {
+									display: none;
+									&[type=text] {
+										display: block;
+									}
+								}
+							}
+						}
+					}
+				}
+			}
 		}
 	}
 	#backtoblog, #nav {
diff --git a/login/aquila-login-screen.php b/login/aquila-login-screen.php
index 30247ad..a7c7cec 100644
--- a/login/aquila-login-screen.php
+++ b/login/aquila-login-screen.php
@@ -1,14 +1,42 @@
 <?php if ( __FILE__ == $_SERVER['SCRIPT_FILENAME'] ) { exit; }
 
+if (!$aquilaLoginDisable) {
+	add_filter( 'login_headerurl', 'aquila_admin_login_logo_url' );
+	add_filter( 'login_headertitle', 'aquila_admin_login_logo_title' );
+	add_action( 'login_head', 'aquila_new_logo_login', 90 ); 
+	add_action('login_head', 'colourSchemeCSS');
+	add_action( 'login_enqueue_scripts', 'aquila_global_load_style' );
+}
+
 function aquila_admin_login_logo_url() {
     return home_url();
 }
-add_filter( 'login_headerurl', 'aquila_admin_login_logo_url' );
 
 function aquila_admin_login_logo_title() {
 		$site_title = get_bloginfo( 'name' );
     return $site_title;
 }
-add_filter( 'login_headertitle', 'aquila_admin_login_logo_title' ); 
+
+//if ($aquilaCustomLogo) {
+//}
+function aquila_new_logo_login() {
+	echo "<style type='text/css'>
+		body.login #login:before {
+			display: none!important;
+		}
+		body.login #login h1 a {
+			display: block!important;
+		}
+		body.login #login h1 a {
+			background-image: url('" . $GLOBALS['aquilaNewLogo'] . "')!important;
+			background-size: contain;
+	    background-repeat: no-repeat;
+	    background-position: center center;
+	    width: auto;
+	    height: 80px;
+	    max-width: 350px;
+		}
+	</style>";
+}
 
 ?>
\ No newline at end of file
diff --git a/readme.txt b/readme.txt
index 778a1fd..3d2f42b 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,10 +1,10 @@
 === Aquila Admin Theme ===
 Contributors: GuyPrimavera
 Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=YVPWSJB4SPN5N
-Tags: material design wordpress, material design admin theme, material design wordpress admin, material wordpress, admin theme, 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
+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.1
+Stable tag: 2.4.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -83,6 +83,17 @@ No. It only changes the admin area, the login page and the admin bar for logged-
 
 == Changelog ==
 
+= 2.4.2 - 31/01/2019 =
+* Fixed error with lessc_formatter_compressed class.
+* Added option to disable login page styling.
+* Fixed styling of password reset page.
+* Fixed styling of registration page.
+* Fixed undefined variable "visibleText".
+* Fixed styling of input boxes.
+* Updated part of welcome widget.
+* Added darker background to clear PNG images in Media Library.
+* Added option to change the admin area link colors.
+
 = 2.4.1 - 07/12/2018 =
 * Fixed issue with body classes.
 
@@ -195,6 +206,9 @@ No. It only changes the admin area, the login page and the admin bar for logged-
 
 == Upgrade Notice ==
 
+= 2.4.2 =
+* Bug fixes.
+
 = 2.4.1 =
 * Bug fixes.
 
diff --git a/scripts.php b/scripts.php
index 98b3a2a..ef2725e 100644
--- a/scripts.php
+++ b/scripts.php
@@ -1,30 +1,34 @@
-<?php 
-if ( __FILE__ == $_SERVER['SCRIPT_FILENAME'] ) { exit; }
+<?php if ( __FILE__ == $_SERVER['SCRIPT_FILENAME'] ) { exit; }
+
+$aquilaOptions = get_option( 'aquila_settings' );
 
 // Global scripts
 function aquila_global_load_style() {
 	if ( is_admin_bar_showing() ) {
-		global $aquilaVer;
 		wp_enqueue_script("jquery");
-		wp_register_style( 'aquila-admin-icons', plugins_url( 'aquila-admin-theme/icons/style.css' ), array(), $aquilaVer );
+		wp_register_style( 'aquila-admin-icons', plugins_url( 'aquila-admin-theme/icons/style.css' ), array(), $GLOBALS['aquilaVer'] );
+		wp_register_style( 'aquila-adminBar-style', plugins_url( 'aquila-admin-theme/css/adminBar.css' ), array(), $GLOBALS['aquilaVer'] );
 		wp_enqueue_style( 'aquila-admin-icons' );
-		wp_register_style( 'aquila-adminBar-style', plugins_url( 'aquila-admin-theme/css/adminBar.css' ), array(), $aquilaVer );
 		wp_enqueue_style( 'aquila-adminBar-style' );
-		wp_register_script( 'aquilaCalls', plugins_url( '/js/calls.js', __FILE__ ), array('jquery'), $aquilaVer, true );
+		wp_register_script( 'aquilaCalls', plugins_url( '/js/calls.js', __FILE__ ), array('jquery'), $GLOBALS['aquilaVer'], true );
 		wp_enqueue_script( 'aquilaCalls');
 	}
 }
 add_action( 'admin_enqueue_scripts', 'aquila_global_load_style' );
 add_action( 'wp_head', 'aquila_global_load_style', 99 );
-add_action( 'login_enqueue_scripts', 'aquila_global_load_style' );
+if (!$GLOBALS['aquilaLoginDisable']) {
+	add_action( 'login_enqueue_scripts', 'aquila_global_load_style' );
+}
 
 // Admin scripts
 function aquila_admin_load_style() {
-	global $aquilaVer;
-	wp_register_style( 'aquila-admin-style', plugins_url( 'aquila-admin-theme/css/aquila.css' ), array(), $aquilaVer );
+	wp_register_style( 'mdl-icons', 'https://fonts.googleapis.com/icon?family=Material+Icons', array(), $GLOBALS['aquilaVer'] );
+	wp_register_style( 'aquila-admin-style', plugins_url( 'aquila-admin-theme/css/aquila.css' ), array(), $GLOBALS['aquilaVer'] );
+	wp_enqueue_style( 'mdl-icons' );
 	wp_enqueue_style( 'aquila-admin-style' );
 	wp_enqueue_style( 'wp-color-picker');
 	wp_enqueue_script( 'wp-color-picker');
+
 	if(function_exists( 'wp_enqueue_media' )){
     wp_enqueue_media();
 	} else {
@@ -37,19 +41,21 @@ function aquila_admin_load_style() {
 
 // Login scripts
 function aquila_login_load_style() {
-	global $aquilaVer;
-	wp_register_style( 'aquila-admin-icons', plugins_url( 'aquila-admin-theme/icons/style.css' ), array(), $aquilaVer );
+	wp_register_style( 'aquila-admin-icons', plugins_url( 'aquila-admin-theme/icons/style.css' ), array(), $GLOBALS['aquilaVer'] );
 	wp_enqueue_style( 'aquila-admin-icons' );
-	wp_register_style( 'aquila-login-style', plugins_url( 'aquila-admin-theme/css/login.css' ), array(), $aquilaVer );
+	wp_register_style( 'aquila-login-style', plugins_url( 'aquila-admin-theme/css/login.css' ), array(), $GLOBALS['aquilaVer'] );
 	wp_enqueue_style( 'aquila-login-style' );
 }
-add_action( 'login_enqueue_scripts', 'aquila_login_load_style' );
+
+if (!$GLOBALS['aquilaLoginDisable']) {
+	add_action( 'login_enqueue_scripts', 'aquila_login_load_style' );
+}
 
 // i18n
 function aquila_i18n_setup() {
   $locale = apply_filters( 'plugin_locale', get_locale(), 'aquila-admin-theme' );
   load_textdomain( 'aquila-admin-theme', WP_LANG_DIR . "/aquila-admin-theme-$locale.mo" );
-	load_plugin_textdomain( 'aquila-admin-theme', false, dirname( plugin_basename( __FILE__ ) ) . '/lang/' );
+	load_plugin_textdomain( 'aquila-admin-theme', false, dirname( plugin_basename( __FILE__ ) ) . '\/lang\/' );
 }
 add_action( 'plugins_loaded', 'aquila_i18n_setup' );