Merge pull request #779 from kazmyriad/master

Added palette-text-color for palettes 0 & 1

Author: btopro

elements/clean-one/clean-one.js

@@ -159,6 +159,16 @@ class CleanOne extends LTIResizingMixin(
           --simple-icon-fill-color: var(
             --haxcms-user-styles-color-theme-color-1
           );
+          --simple-icon-button-background-color: var(
+            --ddd-palette-color-1
+          );
+
+        }
+
+        button:focus, button:hover{
+          --simple-icon-button-background-color: var(
+            --ddd-palette-color-1
+          );
         }
         .pdf-page-btn,
         .print-branch-btn {

elements/clean-portfolio-theme/clean-portfolio-theme.js

@@ -1285,8 +1285,7 @@ export class CleanPortfolioTheme extends DDDSuper(HAXCMSLitElementTheme) {
     if (this.dataPalette > 6) this.dataPalette = 0;
 
   }
-
-
+  
   // Lit render the HTML
   render() {
     return html`

elements/d-d-d/lib/DDDStyles.js

@@ -4481,6 +4481,15 @@ html, :root {
   --ddd-palette-color-5: var(--simple-colors-default-theme-grey-3);
   --ddd-palette-color-6: var(--simple-colors-default-theme-grey-11);
   --ddd-palette-color-7: var(--simple-colors-default-theme-amber-6);
+
+  --ddd-palette-text-color-1: var(--ddd-theme-default-white);
+  --ddd-palette-text-color-2: var(--simple-colors-default-theme-grey-4);
+  --ddd-palette-text-color-3: var(--simple-colors-default-theme-grey-2);
+  --ddd-palette-text-color-4: var(--simple-colors-default-theme-grey-10);
+  --ddd-palette-text-color-5: var(--simple-colors-default-theme-grey-9);
+  --ddd-palette-text-color-6: var(--simple-colors-default-theme-grey-4);
+  --ddd-palette-text-color-7: var(--simple-colors-default-theme-grey-10);
+
   --ddd-palette-video-player-color: var(--ddd-theme-default-black);
 
 }
@@ -4496,9 +4505,14 @@ html, :root {
   --ddd-palette-color-6: var(--ddd-theme-default-inventOrange);
   --ddd-palette-color-7: var(--simple-colors-default-theme-orange-3);
 
-  --ddd-palette-text-color-1: var(--ddd-theme-default-potential0);
-  --ddd-palette-text-color-2: var(--ddd-theme-default-coalyGray);
-  // Later on add specific text colors to be used with specific palette colors
+  --ddd-palette-text-color-1: var(--simple-colors-fixed-theme-green-3);
+  --ddd-palette-text-color-2: var(--simple-colors-fixed-theme-green-4);
+  --ddd-palette-text-color-3: var(--simple-colors-fixed-theme-green-1); 
+  /* This does NOT pass accessibility standards */
+  --ddd-palette-text-color-4: var(--simple-colors-fixed-theme-teal-12);
+  --ddd-palette-text-color-5: var(--simple-colors-default-theme-lime-10);
+  --ddd-palette-text-color-6: var(--ddd-theme-default-white);
+  --ddd-palette-text-color-7: var(--simple-colors-default-theme-deep-orange-10);
 
   --ddd-palette-video-player-color: var(--ddd-theme-default-black);
 }
@@ -4674,8 +4688,8 @@ html, :root {
   --ddd-palette-color-2: var(--ddd-theme-default-beaver80);
   --ddd-palette-color-3: var(--ddd-theme-default-beaverBlue);
   --ddd-palette-color-4: var(--ddd-theme-default-nittanyNavy);
-  --ddd-palette-color-5: var(--ddd-theme-default-coalyGray);
-  --ddd-palette-color-6: var(--ddd-theme-default-limestoneLight);
+  --ddd-palette-color-5: var(--ddd-theme-default-limestoneLight);
+  --ddd-palette-color-6: var(--ddd-theme-default-coalyGray);
   --ddd-palette-color-7: var(--ddd-theme-default-inventOrange);
 
   --ddd-palette-video-player-color: var(--ddd-theme-default-white);
@@ -4688,7 +4702,6 @@ html, :root {
   --ddd-palette-text-color-5: var(--simple-colors-default-theme-blue-grey-2);
   --ddd-palette-text-color-6: var(--simple-colors-default-theme-blue-grey-10);
   --ddd-palette-text-color-7: var(--ddd-theme-default-white);
-
 }
 `;
 

elements/polaris-theme/lib/polaris-invent-theme.js

@@ -66,7 +66,7 @@ class PolarisInventTheme extends LTIResizingMixin(
           );
 
           --polaris-header-bg-color: var(--ddd-palette-color-2);
-          --polaris-nav-color: var(--ddd-palette-color-6);
+          --polaris-nav-color: var(--ddd-palette-color-5);
           --polaris-nav-bg-color: light-dark(
             var(--ddd-theme-default-limestoneLight),
             var(--ddd-theme-default-coalyGray)
@@ -102,6 +102,10 @@ class PolarisInventTheme extends LTIResizingMixin(
           --polaris-nav-bg-color: var(--ddd-theme-default-skyBlue);
         }
 
+        :host([data-palette="8"]) site-menu {
+          --site-menu-container-background-color: var(--ddd-palette-color-7);
+        }
+
         scroll-button {
           position: fixed;
           right: 0px;
@@ -165,12 +169,13 @@ class PolarisInventTheme extends LTIResizingMixin(
           --map-menu-item-a-active-background-color: var(
             --polaris-header-bg-color
           );
+
           --map-menu-item-button-active-color: white;
           --map-menu-item-button-active-background-color: var(--ddd-palette-color-7, var(--ddd-theme-default-inventOrange));
           --map-menu-overflow: visible;
           --site-menu-container-background-color: var(--ddd-palette-color-6);
-          --map-menu-item-a-active-color: var(--ddd-palette-color-6);
-          --map-menu-item-icon-active-color: black;
+          --map-menu-item-a-active-color: var(--ddd-palette-text-text-color-1);
+          --map-menu-item-icon-active-color: white;
         }
 
         site-modal {
@@ -211,7 +216,7 @@ class PolarisInventTheme extends LTIResizingMixin(
         }
         site-menu-button {
           --site-menu-button-link-decoration: none;
-          --site-menu-button-button-hover-color: var(--ddd-palette-color-4);
+          --site-menu-button-button-hover-color: var(--ddd-palette-color-1);
           --site-menu-button-icon-fill-color: white;
           color: white;
           background-color: var(--ddd-palette-color-7, var(--ddd-theme-default-inventOrange));
@@ -405,7 +410,7 @@ class PolarisInventTheme extends LTIResizingMixin(
           border-bottom: 1px solid #fff;
         }
         a {
-          color: var(--ddd-palette-color-6, #2c76c7);
+          color: var(--ddd-palette-text-color-6, #2c76c7);
           text-decoration: none;
         }
         #haxcmsmobilemenubutton {
@@ -694,8 +699,11 @@ class PolarisInventTheme extends LTIResizingMixin(
    */
   constructor() {
     super();
-    this.dataPalette = 8;
+    this.dataPalette = 2;
     // MAKE SURE IT'S SET TO 8^
+    // To Exclude: 6 (Salmon Season), 
+    // 1 (Violent Red),
+    // 2 (Beetles Yellow),
     // forcibly set things about the RPG toast for this design
     HAXCMSToastInstance.style.setProperty(
       "--rpg-character-toast-display",