Version 0.6.1 – new green version and bugfixes

noelboss · Sep 12, 2019 · 4826993 · 4826993
1 parent 72a3ff2
commit 4826993
Show file tree

Hide file tree

Showing 25 changed files with 18,082 additions and 720 deletions.
diff --git a/AdminThemeBoss.info.json b/AdminThemeBoss.info.json
@@ -2,7 +2,7 @@
 	"title": "Admin Theme Boss",
 	"summary": "A light and clear theme based on Uikit 3, extending AdminThemeUikit",
 	"href": "https://github.com/noelboss/AdminThemeBoss",
-	"version": "0.6.0",
+	"version": "0.6.1",
 	"author": "Noël Bossart",
 	"autoload": "template=admin",
 	"icon": "diamond",

diff --git a/AdminThemeBoss.module.php b/AdminThemeBoss.module.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * © ICF Church – <[email protected]>
+ * © ICF Church – <[email protected]>.
  *
  * This source file is subject to the license file that is bundled
  * with this source code in the file LICENSE.
@@ -69,7 +69,9 @@ public function ready()
 		}
 
 		// remove uikit css…
-		$this->config->styles->remove($this->modules->getConfig('AdminThemeUikit', 'cssURL'));
+		if ($this->modules->getConfig('AdminThemeUikit', 'cssURL')) {
+			$this->config->styles->remove($this->modules->getConfig('AdminThemeUikit', 'cssURL'));
+		}
 
 		// add this css…
 		$this->config->styles->append($this->getVariant());
@@ -81,6 +83,8 @@ protected function updateSettings(HookEvent $event)
 
 		// update logo…
 		if ($class == $this->className()) {
+			$this->cache->deleteFor($this, 'cssurl');
+
 			$newSettings = $event->arguments(1);
 			$oldSettings = $this->modules->getConfig($this);
 
@@ -184,19 +188,24 @@ protected function renderBreadcrumbs(HookEvent $event)
 
 	private function getVariant()
 	{
-		$variant = $this->get('variant');
-
-		$version = $this->config->debug ? time() : $this->modules->getModuleInfoProperty($this, 'version');
-		$url     = $this->config->urls->AdminThemeBoss;
-
-		// default
-		$file = $url . 'uikit/dist/css/uikit.pw.min.css?' . $version;
+		$expires = $this->config->debug ? time() - 10 : WireCache::expireNever;
+		$url     = $this->cache->getFor($this, 'cssurl', $expires, function () {
+			$variant = $this->get('variant');
+			$version = $this->config->debug ? time() : $this->modules->getModuleInfoProperty($this, 'version');
+			$url     = $this->config->urls->AdminThemeBoss;
+
+			// default
+			$file = $url . 'uikit/dist/css/uikit.blue.min.css?' . $version;
+
+			$exists = is_file($this->config->paths->AdminThemeBoss . 'uikit/dist/css/uikit.' . $variant . '.min.css');
+			if ($exists) {
+				//bd($this->modules->getModuleInfoProperty($this, 'version'));
+				$file = $url . 'uikit/dist/css/uikit.' . $variant . '.min.css?' . $version;
+			}
 
-		$exists = is_file($this->config->paths->AdminThemeBoss . 'uikit/dist/css/uikit.' . $variant . '.min.css');
-		if ($exists) {
-			$file = $url . 'uikit/dist/css/uikit.' . $variant . '.min.css?' . $version;
-		}
+			return $file;
+		});
 
-		return $file;
+		return $url;
 	}
 }
diff --git a/AdminThemeBossConfig.php b/AdminThemeBossConfig.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * © ICF Church – <[email protected]>
+ * © ICF Church – <[email protected]>.
  *
  * This source file is subject to the license file that is bundled
  * with this source code in the file LICENSE.
@@ -48,13 +48,14 @@ public function __construct()
 						'name'    => 'variant',
 						'type'    => 'radios',
 						'icon'    => 'adjust',
-						'label'   => $this->_('Color'),
+						'label'   => $this->_('Color Sheme'),
 						'value'   => $this->get('variant'),
 						'options' => [
-							'pw'      => $this->_('ProcessWire Blue'),
-							'vibrant' => $this->_('Vibrant Blue'),
-							'black'   => $this->_('Dark Black'),
-							'pink'    => $this->_('Happy Pink'),
+							'blue'       => $this->_('ProcessWire Blue'),
+							'vibrant'    => $this->_('Vibrant Blue'),
+							'black'      => $this->_('Dark Black'),
+							'pink'       => $this->_('Happy Pink'),
+							'green'      => $this->_('Smooth Green'),
 						],
 					],
 				],
@@ -104,7 +105,7 @@ public function getDefaults()
 	{
 		return [
 			'enablemodule'           => true,
-			'variant'                => 'pw',
+			'variant'                => 'blue',
 			'extendedbreadcrumb'     => true,
 			'allusers'               => true,
 			'usedarklogo'            => false,

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Admin Theme Boss – Release Notes
 
-© 2018 noelboss.com
+© 2019 noelboss.com
+
+## Version 0.6.1
+
+Everyone is going green, only AdminThemeBoss was somehow missing the trend… So this new version fixes this glaring oversight 😇
+
+* New «Smooth Green» Color Scheme 💚
+* Fixed: Small issues with asmSelect entries
 
 ## Version 0.6.0
 

diff --git a/uikit/custom/black.less b/uikit/custom/black.less
@@ -15,5 +15,6 @@
 @import "theme/black-login.less";
 
 /* Overrides… */
+@theme-muted-background: lighten(@theme-primary-color, 90%);
 @theme-dropdown-background: lighten(@theme-primary-color, 15%);
 @theme-primary-color-verylight: lighten(@theme-primary-color, 90%);
diff --git a/uikit/custom/pw.less → uikit/custom/blue.less b/uikit/custom/pw.less → uikit/custom/blue.less
@@ -10,4 +10,6 @@
 
 // AdminThemeBoss Custom Styles
 @import "fonts/fonts.less";
-@import "theme/main.less";
+@import "theme/main.less";
+
+@theme-muted-background: lighten(@theme-primary-color, 43%);
diff --git a/uikit/custom/green.less b/uikit/custom/green.less
@@ -0,0 +1,15 @@
+// uikit source
+@import "../src/less/uikit.theme.less";
+
+// main accent color:
+// vibrant blue
+@theme-primary-color: #0aad77;
+
+// Original Theme
+@import "../../AdminThemeUikit/pw/_import.less";
+
+// AdminThemeBoss Custom Styles
+@import "fonts/fonts.less";
+@import "theme/main.less";
+
+@theme-muted-background: lighten(@theme-primary-color, 62%);
diff --git a/uikit/custom/pink.less b/uikit/custom/pink.less
@@ -10,4 +10,6 @@
 
 // AdminThemeBoss Custom Styles
 @import "fonts/fonts.less";
-@import "theme/main.less";
+@import "theme/main.less";
+
+@theme-muted-background: lighten(@theme-primary-color, 50%);
diff --git a/uikit/custom/theme/components/aos.less b/uikit/custom/theme/components/aos.less
@@ -58,6 +58,7 @@
 
 // Admin On Steroids –––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––
 // aos notice and description
+
 html.tooltipNotes #main #content p.notes,
 html.tooltipDesc #main #content p.description {
 
@@ -67,50 +68,79 @@ html.tooltipDesc #main #content p.description {
     }
 }
 
-html.tooltipNotes,
-html.tooltipDesc {
-
-    // disable effect on live preview
-    :not(.ProDraftsLivePreview) {
-        #main #content {
-
-            p.notes,
-            p.description {
-                // text
-                -webkit-backdrop-filter: blur(20px);
-                backdrop-filter: blur(20px);
-                box-shadow: @pw-dropdown-box-shadow  !important;
-                background: @theme-primary-color  !important;
-                font-size: 0.01vw;
-                letter-spacing: 0px;
-                pointer-events: all;
-                color: @theme-button-text-color  !important;
-                border-radius: 3px;
-
-                // triangle
-                &:after {
-                    border-top-color: @theme-primary-color;
-                }
+html.aos .aos_hasTooltip .aos_EditField {
+    -webkit-backdrop-filter: blur(20px);
+    backdrop-filter: blur(20px);
+    box-shadow: @pw-dropdown-box-shadow  !important;
+    background: @theme-primary-color  !important;
+    color: @theme-button-text-color  !important;
+    border-radius: 3px;
+
+    // triangle
+    &:before {
+        border-top-color: @theme-primary-color  !important;
+    }
 
-                &:focus,
-                &:hover {
-                    font-size: 1rem; //font-weight: bold;
-                }
+    &:hover {
+        text-decoration: none;
+        background: darken(@theme-primary-color, 5%) !important;
+
+        // triangle
+        &:before {
+            border-top-color: darken(@theme-primary-color, 5%) !important;
+        }
+    }
 
-                // icon:
-                &:before {
+}
+
+@media (min-width: @breakpoint-small) {
+
+    html.tooltipNotes,
+    html.tooltipDesc {
+
+        // disable effect on live preview
+        :not(.ProDraftsLivePreview) {
+            #main #content {
+
+                p.notes,
+                p.description {
+                    // text
+                    -webkit-backdrop-filter: blur(20px);
+                    backdrop-filter: blur(20px);
+                    box-shadow: @pw-dropdown-box-shadow  !important;
+                    background: @theme-primary-color  !important;
+                    font-size: 0.01vw;
+                    letter-spacing: 0px;
                     pointer-events: all;
-                    color: darken(@theme-text-color, 7%);
-                    margin-top: -3px;
-                    width: 22px;
-                    padding: 0;
-                    line-height: 22px !important; //border-left: @theme-inputfield-border;
-                    box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.15);
-                }
+                    color: @theme-button-text-color  !important;
+                    border-radius: 3px;
+
+                    // triangle
+                    &:after {
+                        border-top-color: @theme-primary-color;
+                    }
+
+                    &:focus,
+                    &:hover {
+                        font-size: 1rem; //font-weight: bold;
+                    }
+
+                    // icon:
+                    &:before {
+                        pointer-events: all;
+                        color: darken(@theme-text-color, 7%);
+                        margin-top: -3px;
+                        width: 22px;
+                        padding: 0;
+                        line-height: 22px !important; //border-left: @theme-inputfield-border;
+                        box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.15);
+                    }
 
+                }
             }
         }
     }
+
 }
 
 // reset in certain situations

diff --git a/uikit/custom/theme/components/forms.less b/uikit/custom/theme/components/forms.less
@@ -238,6 +238,15 @@
 
     .asmListItem {
         margin-top: 10px;
+
+        // center stuff…
+        >i:not(.asmListItemHandle),
+        >a:not(.asmListItemRemove),
+        >span:not(.asmListItemLabel) {
+            top: 50% !important;
+            transform: translateY(-50%);
+            padding-top: 0;
+        }
     }
 
     .asmListItem {
@@ -261,7 +270,6 @@
         }
 
         .asmListItemRemove i {
-            top: 5px;
             right: 7px;
         }
     }
@@ -275,8 +283,6 @@
         opacity: 0.7;
     }
 
-
-
     /* labels */
     .InputfieldHeader {
         font-weight: normal;

diff --git a/uikit/custom/theme/components/modules.less b/uikit/custom/theme/components/modules.less
@@ -10,7 +10,7 @@
 
 // ProDrafts –––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––
 .pw .ProDraftsNotice {
-    background-color: fade(@theme-primary-color, 80%);
+    background-color: fade(@theme-primary-color, 90%);
     background-image: repeating-linear-gradient(45deg, transparent, transparent 35px, fade(@theme-primary-color, 95%) 35px, fade(@theme-primary-color, 95%) 70px);
     color: @theme-text-color-inverse;
 
@@ -23,6 +23,10 @@
     }
 }
 
+.pw .tfw-item {
+    background-color: fade(@theme-dark-background, 2%);
+}
+
 // Admin Help Module –––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––
 .ProcessAdminHelp {
     #pw-content-head h1 {