fixes as per PR comment

bcgov · Dec 7, 2024 · 9a7eea8 · 9a7eea8
1 parent e7a7b1e
commit 9a7eea8
Show file tree

Hide file tree

Showing 13 changed files with 69 additions and 85 deletions.
diff --git a/blocks/core/style-overrides/heading.php → blocks/core/style-variations/heading.php b/blocks/core/style-overrides/heading.php → blocks/core/style-variations/heading.php
diff --git a/blocks/core/style-overrides/navigation.php → blocks/core/style-variations/navigation.php b/blocks/core/style-overrides/navigation.php → blocks/core/style-variations/navigation.php
diff --git a/dist/index-rtl.css b/dist/index-rtl.css
@@ -276,7 +276,12 @@
   --dswp-typography-color-link: var(--bcds-typography-color-link);
   --dswp-typography-color-primary: var(--bcds-typography-color-primary);
   --dswp-surface-color-primary-button-default: var(--bcds-surface-color-primary-button-default);
+  --dswp-surface-color-primary-button-hover: var(--bcds-surface-color-primary-button-hover);
+  --dswp-surface-color-secondary-button-default:var(--bcds-surface-color-secondary-button-default);
+  --dswp-surface-color-secondary-button-hover: var(--bcds-surface-color-secondary-button-hover);
   --dswp-banner-background-dark: #292929;
+  --dswp-surface-color-border-dark:var(--bcds-surface-color-border-dark);
+  --dswp-font-dark: #201f1e;
   --dswp-theme-primary-gold: var(--bcds-theme-primary-gold);
   --dswp-icons-color-info: var(--bcds-icons-color-info);
   --dswp-icons-color-danger: var(--bcds-icons-color-danger);

diff --git a/dist/index.asset.php b/dist/index.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => 'e81cc111a7eb25b07ef8');
+<?php return array('dependencies' => array(), 'version' => '54a72f307dce81e3a752');
diff --git a/dist/index.css b/dist/index.css
diff --git a/dist/index.css.map b/dist/index.css.map
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/functions.php b/functions.php
@@ -50,5 +50,5 @@ function design_system_include_block_style_variations( $dir_path ) {
 }
 
 // Set the directory path and include block style variations.
-$dir_path = get_template_directory() . '/blocks/core/style-overrides';
+$dir_path = get_template_directory() . '/blocks/core/style-variations';
 design_system_include_block_style_variations( $dir_path );
diff --git a/patterns/card-with-hyperlink-list.php b/patterns/card-with-hyperlink-list.php
diff --git a/src/styles/block-overrides.scss b/src/styles/block-overrides.scss
@@ -24,6 +24,7 @@
 	}
 }
 
+
 .is-style-heading-callout {
 	position: relative;
 	margin-top: 3rem;

diff --git a/src/styles/variables.scss b/src/styles/variables.scss
@@ -20,7 +20,12 @@
 	--dswp-typography-color-link: var(--bcds-typography-color-link);
 	--dswp-typography-color-primary: var(--bcds-typography-color-primary);
 	--dswp-surface-color-primary-button-default: var(--bcds-surface-color-primary-button-default);
+	--dswp-surface-color-primary-button-hover: var(--bcds-surface-color-primary-button-hover);
+	--dswp-surface-color-secondary-button-default: var(--bcds-surface-color-secondary-button-default);
+	--dswp-surface-color-secondary-button-hover: var(--bcds-surface-color-secondary-button-hover);
 	--dswp-banner-background-dark: #292929;
+	--dswp-surface-color-border-dark: var(--bcds-surface-color-border-dark);
+	--dswp-font-dark: #201f1e;
 	--dswp-theme-primary-gold: var(--bcds-theme-primary-gold);
 	--dswp-icons-color-info: var(--bcds-icons-color-info);
 	--dswp-icons-color-danger: var(--bcds-icons-color-danger);

diff --git a/theme.json b/theme.json
@@ -15,6 +15,18 @@
         }
     ],
     "styles": {
+        "blocks":{
+           "core/button": {
+				"variations": {
+					"outline": {
+						"css":"&:hover{background-color:var(--dswp-surface-color-secondary-button-hover)}",
+                        "border": {"color": "var(--dswp-surface-color-border-dark)",
+                        "radius": "4px",
+                        "width": "1px"}
+					}
+				}
+			}
+        },
         "color": {
             "text": "var(--dswp-typography-color-primary)",
             "background": "var(--dswp-surface-color-background-white)"
@@ -39,10 +51,20 @@
                 }
             },
             "button": {
+                ":hover": {
+					"color": {
+						"background": "var(--dswp-surface-color-primary-button-hover)"
+					}
+				},
                 "color": {
                     "text": "var(--dswp-theme-gray-white)",
                     "background": "var(--dswp-surface-color-primary-button-default)"
                 },
+                "border": {
+						"color": "var(--dswp-surface-color-border-dark)",
+                        "radius": "4px",
+                        "width": "1px"
+			    },
                 "typography": {
                     "fontSize": "var(--dswp-typography-font-size-body)"
                 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<?php return array('dependencies' => array(), 'version' => 'e81cc111a7eb25b07ef8');
		<?php return array('dependencies' => array(), 'version' => '54a72f307dce81e3a752');
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,6 +24,7 @@ @@
     	}
     }
     .is-style-heading-callout {
     	position: relative;
     	margin-top: 3rem;
@@ Expand Down @@