Skip to content

Commit

Permalink
Merge pull request #939 from WestpacGEL/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
jaortiz authored Dec 2, 2024
2 parents e033fab + eaa6cff commit d4d62b0
Show file tree
Hide file tree
Showing 8 changed files with 43 additions and 3 deletions.
7 changes: 7 additions & 0 deletions apps/protoform/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# protoform

## 0.2.5

### Patch Changes

- Updated dependencies [62db13b]
- @westpac/ui@0.29.0

## 0.2.4

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion apps/protoform/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "protoform",
"version": "0.2.4",
"version": "0.2.5",
"private": true,
"scripts": {
"dev": "next dev",
Expand Down
7 changes: 7 additions & 0 deletions apps/site/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# site

## 0.3.5

### Patch Changes

- Updated dependencies [62db13b]
- @westpac/ui@0.29.0

## 0.3.4

### Patch Changes
Expand Down
6 changes: 6 additions & 0 deletions apps/site/next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ module.exports = {
port: '',
pathname: '/westpac-gel/**',
},
{
protocol: 'https',
hostname: 'westpac.com.au',
port: '',
pathname: '/content/dam/public/gel/**',
},
],
unoptimized: true,
},
Expand Down
2 changes: 1 addition & 1 deletion apps/site/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "site",
"version": "0.3.4",
"version": "0.3.5",
"private": true,
"scripts": {
"build": "next build",
Expand Down
6 changes: 6 additions & 0 deletions packages/ui/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @westpac/ui

## 0.29.0

### Minor Changes

- 62db13b: Export brand tokens

## 0.28.0

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@westpac/ui",
"version": "0.28.0",
"version": "0.29.0",
"license": "MIT",
"sideEffects": false,
"type": "module",
Expand Down
14 changes: 14 additions & 0 deletions packages/ui/src/tailwind/themes/index.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
import { DEFAULT_BODY_TYPOGRAPHY } from '../constants/index.js';
import { BrandConfig, BrandKey } from '../types/brand.types.js';

import { theme as BOMTheme } from './bom.js';
import { theme as BSATheme } from './bsa.js';
import { theme as BTFGTheme } from './btfg.js';
import { theme as BTPLTheme } from './btpl.js';
import { theme as RAMSTheme } from './rams.js';
import { theme as STGTheme } from './stg.js';
import { theme as WBCTheme } from './wbc.js';
import { theme as WBGTheme } from './wbg.js';

// ALL_THEMES, THEMES are used for documentation and as per GEL Team request we dont display BTPL Theme in any public documentation i.e. storybook, site etc
export const ALL_THEMES = [BOMTheme, BSATheme, BTFGTheme, RAMSTheme, STGTheme, WBCTheme, WBGTheme];

export const THEMES = ALL_THEMES.map(theme => {
Expand All @@ -22,3 +25,14 @@ export const THEMES = ALL_THEMES.map(theme => {
},
};
});

export const THEME: Record<Uppercase<BrandKey | 'BTPL'>, BrandConfig> = {
BOM: BOMTheme,
BSA: BSATheme,
BTFG: BTFGTheme,
BTPL: BTPLTheme,
RAMS: RAMSTheme,
STG: STGTheme,
WBC: WBCTheme,
WBG: WBGTheme,
};

0 comments on commit d4d62b0

Please sign in to comment.