Merge branch 'main' of https://github.com/qld-gov-au/qgds-tokens into…

… develop
qld-gov-au · Dec 9, 2024 · 0bc7d5b · 0bc7d5b
2 parents 28e6a5b + 08dc8dc
commit 0bc7d5b
Show file tree

Hide file tree

Showing 23 changed files with 520 additions and 300 deletions.
diff --git a/dist/android/styles/qgds-qld-maroon-palette.xml b/dist/android/styles/qgds-qld-maroon-palette.xml
@@ -87,8 +87,8 @@
   <color name="paletteBrightLine">#e5e5e5</color>
   <color name="paletteBrightMuted">#f5f5f5</color>
   <color name="paletteBrightSubtle">#eaeaea</color>
-  <color name="paletteBrightAccentDefault">#9a0037</color>
-  <color name="paletteBrightAccentOnAccent">#7d0021</color>
+  <color name="paletteBrightAccentDefault">#006b18</color>
+  <color name="paletteBrightAccentOnAccent">#005000</color>
   <color name="paletteBrightTypographySiteTitleDefault">#430001</color>
   <color name="paletteBrightTypographySiteTitleVariant">#141414</color>
   <color name="paletteBrightTypographyHeadingDefault">#430001</color>
@@ -98,11 +98,11 @@
   <color name="paletteBrightActionMainNavDefaultBackground">#f5f5f5</color>
   <color name="paletteBrightActionMainNavDefaultText">#444444</color>
   <string name="paletteBrightActionMainNavDefaultTextDecoration">none</string>
-  <string name="paletteBrightActionMainNavDefaultAccent">#9a0037</string>
+  <string name="paletteBrightActionMainNavDefaultAccent">#006b18</string>
   <color name="paletteBrightActionMainNavHoverBackground">#eaeaea</color>
   <color name="paletteBrightActionMainNavHoverText">#09549f</color>
   <string name="paletteBrightActionMainNavHoverTextDecoration">underline</string>
-  <string name="paletteBrightActionMainNavHoverAccent">#7d0021</string>
+  <string name="paletteBrightActionMainNavHoverAccent">#005000</string>
   <color name="paletteBrightActionButtonPrimaryDefaultBackground">#b80b4d</color>
   <color name="paletteBrightActionButtonPrimaryDefaultText">#ffffff</color>
   <string name="paletteBrightActionButtonPrimaryDefaultTextDecoration">none</string>

diff --git a/dist/css/styles/qgds-qld-maroon-palette.css b/dist/css/styles/qgds-qld-maroon-palette.css
@@ -86,8 +86,8 @@
   --palette-bright-line: #e5e5e5;
   --palette-bright-muted: #f5f5f5;
   --palette-bright-subtle: #eaeaea;
-  --palette-bright-accent-default: #9a0037;
-  --palette-bright-accent-on-accent: #7d0021;
+  --palette-bright-accent-default: #006b18;
+  --palette-bright-accent-on-accent: #005000;
   --palette-bright-typography-site-title-default: #430001;
   --palette-bright-typography-site-title-variant: #141414;
   --palette-bright-typography-heading-default: #430001;
@@ -97,11 +97,11 @@
   --palette-bright-action-main-nav-default-background: #f5f5f5;
   --palette-bright-action-main-nav-default-text: #444444;
   --palette-bright-action-main-nav-default-text-decoration: none;
-  --palette-bright-action-main-nav-default-accent: #9a0037;
+  --palette-bright-action-main-nav-default-accent: #006b18;
   --palette-bright-action-main-nav-hover-background: #eaeaea;
   --palette-bright-action-main-nav-hover-text: #09549f;
   --palette-bright-action-main-nav-hover-text-decoration: underline;
-  --palette-bright-action-main-nav-hover-accent: #7d0021;
+  --palette-bright-action-main-nav-hover-accent: #005000;
   --palette-bright-action-button-primary-default-background: #b80b4d;
   --palette-bright-action-button-primary-default-text: #ffffff;
   --palette-bright-action-button-primary-default-text-decoration: none;

diff --git a/dist/js/styles/qgds-qld-maroon-palette.js b/dist/js/styles/qgds-qld-maroon-palette.js
@@ -85,8 +85,8 @@ export const paletteBrightFence = "#b80b4d";
 export const paletteBrightLine = "#e5e5e5";
 export const paletteBrightMuted = "#f5f5f5";
 export const paletteBrightSubtle = "#eaeaea";
-export const paletteBrightAccentDefault = "#9a0037";
-export const paletteBrightAccentOnAccent = "#7d0021";
+export const paletteBrightAccentDefault = "#006b18";
+export const paletteBrightAccentOnAccent = "#005000";
 export const paletteBrightTypographySiteTitleDefault = "#430001";
 export const paletteBrightTypographySiteTitleVariant = "#141414";
 export const paletteBrightTypographyHeadingDefault = "#430001";
@@ -96,11 +96,11 @@ export const paletteBrightTypographyBodyVariant = "#444444";
 export const paletteBrightActionMainNavDefaultBackground = "#f5f5f5";
 export const paletteBrightActionMainNavDefaultText = "#444444";
 export const paletteBrightActionMainNavDefaultTextDecoration = "none";
-export const paletteBrightActionMainNavDefaultAccent = "#9a0037";
+export const paletteBrightActionMainNavDefaultAccent = "#006b18";
 export const paletteBrightActionMainNavHoverBackground = "#eaeaea";
 export const paletteBrightActionMainNavHoverText = "#09549f";
 export const paletteBrightActionMainNavHoverTextDecoration = "underline";
-export const paletteBrightActionMainNavHoverAccent = "#7d0021";
+export const paletteBrightActionMainNavHoverAccent = "#005000";
 export const paletteBrightActionButtonPrimaryDefaultBackground = "#b80b4d";
 export const paletteBrightActionButtonPrimaryDefaultText = "#ffffff";
 export const paletteBrightActionButtonPrimaryDefaultTextDecoration = "none";

diff --git a/dist/scss/styles/qgds-qld-maroon-palette.scss b/dist/scss/styles/qgds-qld-maroon-palette.scss
@@ -84,8 +84,8 @@ $paletteBrightFence: #b80b4d;
 $paletteBrightLine: #e5e5e5;
 $paletteBrightMuted: #f5f5f5;
 $paletteBrightSubtle: #eaeaea;
-$paletteBrightAccentDefault: #9a0037;
-$paletteBrightAccentOnAccent: #7d0021;
+$paletteBrightAccentDefault: #006b18;
+$paletteBrightAccentOnAccent: #005000;
 $paletteBrightTypographySiteTitleDefault: #430001;
 $paletteBrightTypographySiteTitleVariant: #141414;
 $paletteBrightTypographyHeadingDefault: #430001;
@@ -95,11 +95,11 @@ $paletteBrightTypographyBodyVariant: #444444;
 $paletteBrightActionMainNavDefaultBackground: #f5f5f5;
 $paletteBrightActionMainNavDefaultText: #444444;
 $paletteBrightActionMainNavDefaultTextDecoration: none;
-$paletteBrightActionMainNavDefaultAccent: #9a0037;
+$paletteBrightActionMainNavDefaultAccent: #006b18;
 $paletteBrightActionMainNavHoverBackground: #eaeaea;
 $paletteBrightActionMainNavHoverText: #09549f;
 $paletteBrightActionMainNavHoverTextDecoration: underline;
-$paletteBrightActionMainNavHoverAccent: #7d0021;
+$paletteBrightActionMainNavHoverAccent: #005000;
 $paletteBrightActionButtonPrimaryDefaultBackground: #b80b4d;
 $paletteBrightActionButtonPrimaryDefaultText: #ffffff;
 $paletteBrightActionButtonPrimaryDefaultTextDecoration: none;

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@qld-gov-au/qgds-tokens",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "This repository is configured to sync tokens via Figma.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/src/android/styles/primitive.xml b/src/android/styles/primitive.xml
@@ -427,7 +427,7 @@
   <string name="paragraphSpacingMobileBody">16</string>
   <string name="paragraphSpacingMobileListItem">8</string>
   <string name="fontWeightRegular">400</string>
-  <string name="fontWeightItalic">Italic</string>
+  <string name="fontWeightItalic">italic</string>
   <string name="fontWeightSemibold">600</string>
   <string name="fontWeightBold">700</string>
   <dimen name="fontSizeDesktopXxxxl">47.7757px</dimen>

diff --git a/src/android/styles/qgds-qld-maroon-palette.xml b/src/android/styles/qgds-qld-maroon-palette.xml
@@ -87,8 +87,8 @@
   <color name="paletteBrightLine">#e5e5e5</color>
   <color name="paletteBrightMuted">#f5f5f5</color>
   <color name="paletteBrightSubtle">#eaeaea</color>
-  <color name="paletteBrightAccentDefault">#9a0037</color>
-  <color name="paletteBrightAccentOnAccent">#7d0021</color>
+  <color name="paletteBrightAccentDefault">#006b18</color>
+  <color name="paletteBrightAccentOnAccent">#005000</color>
   <color name="paletteBrightTypographySiteTitleDefault">#430001</color>
   <color name="paletteBrightTypographySiteTitleVariant">#141414</color>
   <color name="paletteBrightTypographyHeadingDefault">#430001</color>
@@ -98,11 +98,11 @@
   <color name="paletteBrightActionMainNavDefaultBackground">#f5f5f5</color>
   <color name="paletteBrightActionMainNavDefaultText">#444444</color>
   <string name="paletteBrightActionMainNavDefaultTextDecoration">none</string>
-  <string name="paletteBrightActionMainNavDefaultAccent">#9a0037</string>
+  <string name="paletteBrightActionMainNavDefaultAccent">#006b18</string>
   <color name="paletteBrightActionMainNavHoverBackground">#eaeaea</color>
   <color name="paletteBrightActionMainNavHoverText">#09549f</color>
   <string name="paletteBrightActionMainNavHoverTextDecoration">underline</string>
-  <string name="paletteBrightActionMainNavHoverAccent">#7d0021</string>
+  <string name="paletteBrightActionMainNavHoverAccent">#005000</string>
   <color name="paletteBrightActionButtonPrimaryDefaultBackground">#b80b4d</color>
   <color name="paletteBrightActionButtonPrimaryDefaultText">#ffffff</color>
   <string name="paletteBrightActionButtonPrimaryDefaultTextDecoration">none</string>

diff --git a/src/android/styles/qgds.xml b/src/android/styles/qgds.xml
@@ -87,7 +87,7 @@
   <dimen name="typographyMobileCodeFontSize">12.8px</dimen>
   <string name="typographyMobileCodeParagraphSpacing">16</string>
   <string name="typographyMobileCreditFontFamily">'Noto Sans'</string>
-  <string name="typographyMobileCreditFontWeight">Italic</string>
+  <string name="typographyMobileCreditFontWeight">italic</string>
   <integer name="typographyMobileCreditLineHeight">1.5</integer>
   <dimen name="typographyMobileCreditFontSize">12.8px</dimen>
   <string name="typographyMobileCreditParagraphSpacing">16</string>
@@ -168,7 +168,7 @@
   <dimen name="typographyDesktopCodeFontSize">12.8px</dimen>
   <string name="typographyDesktopCodeParagraphSpacing">16</string>
   <string name="typographyDesktopCreditFontFamily">'Noto Sans'</string>
-  <string name="typographyDesktopCreditFontWeight">Italic</string>
+  <string name="typographyDesktopCreditFontWeight">italic</string>
   <integer name="typographyDesktopCreditLineHeight">1.5</integer>
   <dimen name="typographyDesktopCreditFontSize">12.8px</dimen>
   <string name="typographyDesktopCreditParagraphSpacing">16</string>

diff --git a/src/css/styles/primitive.css b/src/css/styles/primitive.css
@@ -426,7 +426,7 @@
   --paragraph-spacing-mobile-body: 16;
   --paragraph-spacing-mobile-list-item: 8;
   --font-weight-regular: 400;
-  --font-weight-italic: Italic;
+  --font-weight-italic: italic;
   --font-weight-semibold: 600;
   --font-weight-bold: 700;
   --font-size-desktop-xxxxl: 47.7757px;

diff --git a/src/css/styles/qgds-qld-maroon-palette.css b/src/css/styles/qgds-qld-maroon-palette.css
@@ -86,8 +86,8 @@
   --palette-bright-line: #e5e5e5;
   --palette-bright-muted: #f5f5f5;
   --palette-bright-subtle: #eaeaea;
-  --palette-bright-accent-default: #9a0037;
-  --palette-bright-accent-on-accent: #7d0021;
+  --palette-bright-accent-default: #006b18;
+  --palette-bright-accent-on-accent: #005000;
   --palette-bright-typography-site-title-default: #430001;
   --palette-bright-typography-site-title-variant: #141414;
   --palette-bright-typography-heading-default: #430001;
@@ -97,11 +97,11 @@
   --palette-bright-action-main-nav-default-background: #f5f5f5;
   --palette-bright-action-main-nav-default-text: #444444;
   --palette-bright-action-main-nav-default-text-decoration: none;
-  --palette-bright-action-main-nav-default-accent: #9a0037;
+  --palette-bright-action-main-nav-default-accent: #006b18;
   --palette-bright-action-main-nav-hover-background: #eaeaea;
   --palette-bright-action-main-nav-hover-text: #09549f;
   --palette-bright-action-main-nav-hover-text-decoration: underline;
-  --palette-bright-action-main-nav-hover-accent: #7d0021;
+  --palette-bright-action-main-nav-hover-accent: #005000;
   --palette-bright-action-button-primary-default-background: #b80b4d;
   --palette-bright-action-button-primary-default-text: #ffffff;
   --palette-bright-action-button-primary-default-text-decoration: none;

diff --git a/src/css/styles/qgds.css b/src/css/styles/qgds.css
@@ -86,7 +86,7 @@
   --typography-mobile-code-font-size: 12.8px;
   --typography-mobile-code-paragraph-spacing: 16;
   --typography-mobile-credit-font-family: 'Noto Sans';
-  --typography-mobile-credit-font-weight: Italic;
+  --typography-mobile-credit-font-weight: italic;
   --typography-mobile-credit-line-height: 1.5;
   --typography-mobile-credit-font-size: 12.8px;
   --typography-mobile-credit-paragraph-spacing: 16;
@@ -167,7 +167,7 @@
   --typography-desktop-code-font-size: 12.8px;
   --typography-desktop-code-paragraph-spacing: 16;
   --typography-desktop-credit-font-family: 'Noto Sans';
-  --typography-desktop-credit-font-weight: Italic;
+  --typography-desktop-credit-font-weight: italic;
   --typography-desktop-credit-line-height: 1.5;
   --typography-desktop-credit-font-size: 12.8px;
   --typography-desktop-credit-paragraph-spacing: 16;

diff --git a/src/js/styles/primitive.js b/src/js/styles/primitive.js
@@ -424,10 +424,10 @@ export const paragraphSpacingNoSpace = "0";
 export const paragraphSpacingMobileHeading = "24";
 export const paragraphSpacingMobileBody = "16";
 export const paragraphSpacingMobileListItem = "8";
-export const fontWeightRegular = 400;
-export const fontWeightItalic = "Italic";
-export const fontWeightSemibold = 600;
-export const fontWeightBold = 700;
+export const fontWeightRegular = "400";
+export const fontWeightItalic = "italic";
+export const fontWeightSemibold = "600";
+export const fontWeightBold = "700";
 export const fontSizeDesktopXxxxl = "47.7757px";
 export const fontSizeDesktopXxxl = "39.8131px";
 export const fontSizeDesktopXxl = "33.1776px";