Skip to content

Commit

Permalink
Merge branch 'prerelease/major' into tabs-refactor-25-01
Browse files Browse the repository at this point in the history
  • Loading branch information
josh-bagwell authored Jan 31, 2025
2 parents 087ef54 + f8b029f commit 80eea64
Show file tree
Hide file tree
Showing 26 changed files with 244 additions and 191 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,18 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [v12.3.5](https://github.com/Workday/canvas-kit/releases/tag/v12.3.5) (2025-01-28)

### Documentation

- chore: Update banner image on welcome page ([#3113](https://github.com/Workday/canvas-kit/pull/3113)) ([@mannycarrera4](https://github.com/mannycarrera4), manuel.carrera)


## [v12.3.4](https://github.com/Workday/canvas-kit/releases/tag/v12.3.4) (2025-01-28)




## [v12.3.3](https://github.com/Workday/canvas-kit/releases/tag/v12.3.3) (2025-01-13)

### Documentation
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"packages": [
"modules/**"
],
"version": "12.3.3",
"version": "12.3.5",
"npmClient": "yarn",
"useWorkspaces": true,
"command": {
Expand Down
2 changes: 1 addition & 1 deletion modules/codemod/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@workday/canvas-kit-codemod",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
"version": "12.3.3",
"version": "12.3.5",
"description": "A collection of codemods for use on Workday Canvas Kit packages.",
"main": "dist/es6/index.js",
"sideEffects": false,
Expand Down
2 changes: 1 addition & 1 deletion modules/css/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-css",
"version": "12.3.3",
"version": "12.3.5",
"description": "The parent module that contains all Workday Canvas Kit CSS components",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand Down
3 changes: 2 additions & 1 deletion modules/docs/mdx/13.0-UPGRADE-GUIDE.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ yarn remove @workday/canvas-kit-codemod

### Styling API and CSS Tokens

**PRs:** [#3101](https://github.com/Workday/canvas-kit/pull/3101), [#3088](https://github.com/Workday/canvas-kit/pull/3088)
**PRs:** [#3101](https://github.com/Workday/canvas-kit/pull/3101), [#3088](https://github.com/Workday/canvas-kit/pull/3088), [#3114](https://github.com/Workday/canvas-kit/pull/3114)

Several components have been refactored to use our
[Canvas Tokens](https://workday.github.io/canvas-tokens/?path=/docs/docs-getting-started--docs) and
Expand All @@ -106,6 +106,7 @@ The React interface **has not changed**, but CSS variables are now used for dyna
The following components are affected:

- `ExternalHyperlink`
- `Menu`
- `Skeleton`

## External Hyperlink
Expand Down
Binary file added modules/docs/mdx/CK-banner-temp.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed modules/docs/mdx/storybook-welcome-header.png
Binary file not shown.
285 changes: 148 additions & 137 deletions modules/docs/mdx/welcomePage.tsx
Original file line number Diff line number Diff line change
@@ -1,158 +1,169 @@
import React from 'react';
// @ts-ignore: Cannot find module error
import headerImage from './storybook-welcome-header.png';
import headerImage from './CK-banner-temp.jpg';
import {Flex, Grid, Box} from '@workday/canvas-kit-react/layout';
import {InstallBlock} from './installBlock';
import {Text, Heading} from '@workday/canvas-kit-react/text';
import {Card} from '@workday/canvas-kit-react/card';
import {ExternalHyperlink, Hyperlink} from '@workday/canvas-kit-react/button';
import {colors} from '@workday/canvas-kit-react/tokens';
import {rocketIcon, tokensIcon, shapesIcon} from '@workday/canvas-system-icons-web';
import {SystemIcon} from '@workday/canvas-kit-react/icon';
import {system} from '@workday/canvas-tokens-web';
import {cssVar} from '@workday/canvas-kit-styling';
import {system, base} from '@workday/canvas-tokens-web';
import {createStyles} from '@workday/canvas-kit-styling';
// @ts-ignore: Cannot find module error
import {version} from '../../../lerna.json';

const parentFlexStyles = createStyles({
display: 'flex',
flexDirection: 'column',
gap: system.space.x4,
marginBottom: system.space.x6,
});

const textStyles = createStyles({
color: system.color.text.inverse,
fontSize: '5vmin',
lineHeight: '5vmin',
});

const versionStyles = createStyles({
fontWeight: base.fontFamily100,
marginInlineStart: system.space.x4,
});

const imageStyles = createStyles({
width: '100%',
height: 'auto',
});

const borderStyles = createStyles({
borderBottom: `1px solid ${base.blueberry200}`,
marginBottom: system.space.x2,
});

const gridStyles = createStyles({
maxHeight: 320,
gridTemplateRows: '1fr 1fr 2fr 1fr',
display: 'grid',
});

const linkStyles = createStyles({
alignSelf: 'end',
marginTop: system.space.x3,
});

export const WelcomePage = () => {
return (
<Flex flexDirection="column" gap="s" marginBottom="m">
<Box borderRadius="m" overflow="hidden" position="relative">
<Flex position="absolute" flexDirection="column" top="30%" left="10%">
<Text
typeLevel="title.medium"
color={colors.frenchVanilla100}
style={{lineHeight: '3vmin', fontSize: '6vmin', marginBottom: cssVar(system.space.x4)}}
>
Canvas Kit
</Text>
<Text
typeLevel="body.large"
style={{lineHeight: '2vw', fontSize: '3vmin'}}
color={colors.frenchVanilla100}
>
v{version}
</Text>
</Flex>
<img src={headerImage} alt="test" style={{width: '100%', height: 'auto'}} />
</Box>
<Text typeLevel="body.medium">
{' '}
This project provides a set of components for the Workday Canvas Design System that can be
used to implement user experiences consistent with{' '}
<ExternalHyperlink
href="https://canvas.workdaydesign.com/"
iconLabel="Open docs in new window"
>
Workday Design Principles.
</ExternalHyperlink>
</Text>
<Heading size="medium" borderBottom={`1px solid ${colors.blueberry200}`} paddingBottom="xxs">
Quick Links
</Heading>
<Grid
gridAutoColumns="auto"
gridTemplateColumns="repeat(auto-fill, minmax(250px, 1fr))"
gridGap="s"
>
<Grid
as={Card}
gridTemplateRows="1fr 1fr 2fr 1fr"
depth="none"
display="grid"
maxHeight={320}
>
<SystemIcon
color={colors.cantaloupe400}
colorHover={colors.cantaloupe400}
icon={rocketIcon}
size={60}
></SystemIcon>
<Card.Heading>Getting Started</Card.Heading>
<Card.Body>
<Text>For all things getting started including helpful guides and docs.</Text>
</Card.Body>
<Grid.Item
as={Hyperlink}
alignSelf="end"
marginTop="xs"
href="https://workday.github.io/canvas-kit/?path=/docs/guides-getting-started--docs"
>
{' '}
Getting Started Guide
</Grid.Item>
</Grid>
<Grid
as={Card}
gridTemplateRows="1fr 1fr 2fr 1fr"
depth="none"
display="grid"
maxHeight={320}
>
<SystemIcon
color={colors.blueberry400}
icon={tokensIcon}
colorHover={colors.blueberry400}
size={60}
></SystemIcon>
<Card.Heading>Tokens</Card.Heading>
<Card.Body>
<Text>
Tokens are the smallest pieces of our Design System with the primary function of
storing UI information.
<div className="sb-unstyled">
<div className={parentFlexStyles}>
<Box cs={{overflow: 'hidden', position: 'relative'}}>
<Flex cs={{flexDirection: 'row', position: 'absolute', top: '45%', left: '10%'}}>
<Text typeLevel="title.medium" cs={textStyles}>
Canvas Kit
</Text>
<Text typeLevel="title.medium" cs={[textStyles, versionStyles]}>
v{version}
</Text>
</Card.Body>
<Grid.Item
alignSelf="end"
as={Hyperlink}
marginTop="xs"
href="https://workday.github.io/canvas-kit/?path=/docs/tokens--overview"
</Flex>
<img
src={headerImage}
alt="banner with canvas kit logo and version"
className={imageStyles}
/>
</Box>
<Text typeLevel="body.medium">
This project provides a set of components for the Workday Canvas Design System that can be
used to implement user experiences consistent with
<ExternalHyperlink
href="https://canvas.workdaydesign.com/"
iconLabel="Open docs in new window"
>
{' '}
View Our Tokens
</Grid.Item>
</Grid>
Workday Design Principles.
</ExternalHyperlink>
</Text>
<Heading size="medium" className={borderStyles}>
Quick Links
</Heading>
<Grid
as={Card}
gridTemplateRows="1fr 1fr 2fr 1fr"
depth="none"
display="grid"
maxHeight={320}
gridAutoColumns="auto"
gridTemplateColumns="repeat(auto-fill, minmax(250px, 1fr))"
gridGap="s"
>
<SystemIcon
color={colors.greenApple400}
icon={shapesIcon}
size={60}
colorHover={colors.greenApple400}
></SystemIcon>
<Card.Heading>Assets</Card.Heading>
<Card.Body>
<Text>
Assets are graphics which help communicate meaning or highlight areas of interaction
to our users.
</Text>
</Card.Body>
<Grid.Item
as={Hyperlink}
alignSelf="end"
marginTop="xs"
href="https://workday.github.io/canvas-kit/?path=/docs/assets-icons--overview"
>
{' '}
View Assets
</Grid.Item>
<Grid as={Card} className={gridStyles}>
<SystemIcon
color={base.cantaloupe400}
colorHover={base.cantaloupe400}
icon={rocketIcon}
size={60}
></SystemIcon>
<Card.Heading>Getting Started</Card.Heading>
<Card.Body>
<Text>For all things getting started including helpful guides and docs.</Text>
</Card.Body>
<Grid.Item
as={Hyperlink}
className={linkStyles}
href="https://workday.github.io/canvas-kit/?path=/docs/guides-getting-started--docs"
>
Getting Started Guide
</Grid.Item>
</Grid>
<Grid as={Card} className={gridStyles}>
<SystemIcon
color={base.blueberry400}
icon={tokensIcon}
colorHover={base.blueberry400}
size={60}
></SystemIcon>
<Card.Heading>Tokens</Card.Heading>
<Card.Body>
<Text>
Tokens are the smallest pieces of our Design System with the primary function of
storing UI information.
</Text>
</Card.Body>
<Grid.Item
as={Hyperlink}
className={linkStyles}
href="https://workday.github.io/canvas-kit/?path=/docs/tokens--overview"
>
View Our Tokens
</Grid.Item>
</Grid>
<Grid as={Card} className={gridStyles}>
<SystemIcon
color={base.greenApple400}
icon={shapesIcon}
size={60}
colorHover={base.greenApple400}
></SystemIcon>
<Card.Heading>Assets</Card.Heading>
<Card.Body>
<Text>
Assets are graphics which help communicate meaning or highlight areas of interaction
to our users.
</Text>
</Card.Body>
<Grid.Item
as={Hyperlink}
className={linkStyles}
href="https://workday.github.io/canvas-kit/?path=/docs/assets-icons--overview"
>
View Assets
</Grid.Item>
</Grid>
</Grid>
</Grid>
<Heading size="medium" borderBottom={`1px solid ${colors.blueberry200}`} paddingBottom="xxs">
Installation
</Heading>
<Text>
To get started using Canvas kit React first add or install the module to your existing React
project
</Text>
<InstallBlock command="yarn add" packageName="@workday/canvas-kit-react" />
or
<InstallBlock command="npm install" packageName="@workday/canvas-kit-react" />
</Flex>
<Heading size="medium" className={borderStyles}>
Installation
</Heading>
<Text>
To get started using Canvas Kit React first add or install the module to your existing
React project
</Text>
<InstallBlock command="yarn add" packageName="@workday/canvas-kit-react" />
or
<InstallBlock command="npm install" packageName="@workday/canvas-kit-react" />
</div>
</div>
);
};
10 changes: 5 additions & 5 deletions modules/docs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-docs",
"version": "12.3.3",
"version": "12.3.5",
"description": "Documentation components of Canvas Kit components",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand Down Expand Up @@ -44,10 +44,10 @@
"dependencies": {
"@emotion/styled": "^11.6.0",
"@storybook/csf": "0.0.1",
"@workday/canvas-kit-labs-react": "^12.3.3",
"@workday/canvas-kit-preview-react": "^12.3.3",
"@workday/canvas-kit-react": "^12.3.3",
"@workday/canvas-kit-styling": "^12.3.3",
"@workday/canvas-kit-labs-react": "^12.3.5",
"@workday/canvas-kit-preview-react": "^12.3.5",
"@workday/canvas-kit-react": "^12.3.5",
"@workday/canvas-kit-styling": "^12.3.5",
"@workday/canvas-system-icons-web": "^3.0.0",
"@workday/canvas-tokens-web": "^2.1.0",
"markdown-to-jsx": "^7.2.0",
Expand Down
2 changes: 1 addition & 1 deletion modules/labs-css/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@workday/canvas-kit-labs-css",
"version": "12.3.3",
"version": "12.3.5",
"description": "The parent module that contains all Workday Canvas Kit Labs CSS components",
"author": "Workday, Inc. (https://www.workday.com)",
"license": "Apache-2.0",
Expand Down
Loading

0 comments on commit 80eea64

Please sign in to comment.