Skip to content

Commit

Permalink
Merge branch 'main' into notification-react-18
Browse files Browse the repository at this point in the history
  • Loading branch information
sentience committed Sep 14, 2023
2 parents 8854b30 + 8057911 commit 36b97e8
Show file tree
Hide file tree
Showing 82 changed files with 676 additions and 303 deletions.
2 changes: 1 addition & 1 deletion .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
"changelog": [
"@cultureamp/changelog-github",
{ "repo": "cultureamp/kaizen-design-system" }
{ "repo": "cultureamp/kaizen-legacy" }
],
"access": "public",
"baseBranch": "main",
Expand Down
2 changes: 0 additions & 2 deletions .changeset/flat-moles-think.md

This file was deleted.

10 changes: 9 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
/packages/**/dist
/packages/**/dist
/draft-packages/**/*.js
/draft-packages/**/*.js.map
/draft-packages/**/*.d.ts
/packages/**/*.js
!/packages/**/*.config.js
!/packages/**/svgMock.js
/packages/**/*.js.map
/packages/**/*.d.ts
42 changes: 16 additions & 26 deletions .github/workflows/changeset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,47 +9,37 @@ jobs:
version:
runs-on: ubuntu-latest
outputs:
published: ${{ steps.changesets.outputs.published }}
hasChangesets: ${{ steps.changesets.outputs.hasChangesets }}
hasPublished: ${{ steps.changesets.outputs.published }}
env:
GITHUB_TOKEN: ${{ github.token }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/setup
- name: Create Release Pull Request or Publish to npm
id: changesets
run: |
npm config set "//registry.npmjs.org/:_authToken" "$NPM_TOKEN"
- uses: changesets/action@v1
id: changesets
with:
title: "Changeset: Version packages"
commit: "version packages"
version: yarn ci:version
publish: yarn ci:publish
- name: Push git tags
if: steps.changesets.outputs.published == 'true'
run: git push --follow-tags
slack-notify:
notify-slack:
runs-on: ubuntu-latest
needs: version
needs:
version
# We only trigger this flow if the publish is happening, inferred by not having a changeset.
if: needs.version.outputs.hasChangesets == 'false'
env:
PUBLISHED: ${{ needs.version.outputs.hasPublished }}
steps:
- name: Notify Slack (success)
if: needs.version.outputs.published == 'true'
# https://github.com/marketplace/actions/post-to-slack
uses: pcolby/post-to-slack@v1
with:
url: ${{ secrets.SLACK_WEBHOOK_URL }}
channel: "#wol_kaizen"
username: "Release"
text: Complete
iconEmoji: ":squid:"
- name: Notify Slack (failure)
if: needs.version.outputs.published == 'false'
# https://github.com/marketplace/actions/post-to-slack
uses: pcolby/post-to-slack@v1
- name: Send
uses: slackapi/[email protected]
with:
url: ${{ secrets.SLACK_WEBHOOK_URL }}
channel: "#wol_kaizen"
username: "Release"
text: Something went wrong
iconEmoji: ":squid:"
channel-id: "C02NUQ27G56"
slack-message: ${{ env.PUBLISHED == 'true' && 'Legacy packages have been published' || 'Legacy Publishing failed' }}
env:
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
4 changes: 2 additions & 2 deletions docs/package-structure.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,11 @@ The base package.json will look like this, where:
},
"repository": {
"type": "git",
"url": "git+https://github.com/cultureamp/kaizen-design-system.git",
"url": "git+https://github.com/cultureamp/kaizen-legacy.git",
"directory": "packages/{{ PACKAGE_NAME }}"
},
"bugs": {
"url": "https://github.com/cultureamp/kaizen-design-system/issues"
"url": "https://github.com/cultureamp/kaizen-legacy/issues"
},
"files": [
"**/*",
Expand Down
4 changes: 2 additions & 2 deletions draft-packages/avatar/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/cultureamp/kaizen-design-system.git",
"url": "git+https://github.com/cultureamp/kaizen-legacy.git",
"directory": "draft-packages/avatar"
},
"bugs": {
"url": "https://github.com/cultureamp/kaizen-design-system/issues"
"url": "https://github.com/cultureamp/kaizen-legacy/issues"
},
"files": [
"**/*.js",
Expand Down
4 changes: 2 additions & 2 deletions draft-packages/badge/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/cultureamp/kaizen-design-system.git",
"url": "git+https://github.com/cultureamp/kaizen-legacy.git",
"directory": "draft-packages/badge"
},
"bugs": {
"url": "https://github.com/cultureamp/kaizen-design-system/issues"
"url": "https://github.com/cultureamp/kaizen-legacy/issues"
},
"files": [
"**/*.js",
Expand Down
4 changes: 2 additions & 2 deletions draft-packages/card/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/cultureamp/kaizen-design-system.git",
"url": "git+https://github.com/cultureamp/kaizen-legacy.git",
"directory": "draft-packages/card"
},
"bugs": {
"url": "https://github.com/cultureamp/kaizen-design-system/issues"
"url": "https://github.com/cultureamp/kaizen-legacy/issues"
},
"files": [
"**/*.js",
Expand Down
4 changes: 2 additions & 2 deletions draft-packages/collapsible/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/cultureamp/kaizen-design-system.git",
"url": "git+https://github.com/cultureamp/kaizen-legacy.git",
"directory": "draft-packages/collapsible"
},
"bugs": {
"url": "https://github.com/cultureamp/kaizen-design-system/issues"
"url": "https://github.com/cultureamp/kaizen-legacy/issues"
},
"files": [
"**/*.js",
Expand Down
4 changes: 2 additions & 2 deletions draft-packages/divider/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/cultureamp/kaizen-design-system.git",
"url": "git+https://github.com/cultureamp/kaizen-legacy.git",
"directory": "draft-packages/divider"
},
"bugs": {
"url": "https://github.com/cultureamp/kaizen-design-system/issues"
"url": "https://github.com/cultureamp/kaizen-legacy/issues"
},
"files": [
"**/*.js",
Expand Down
4 changes: 2 additions & 2 deletions draft-packages/empty-state/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/cultureamp/kaizen-design-system.git",
"url": "git+https://github.com/cultureamp/kaizen-legacy.git",
"directory": "draft-packages/empty-state"
},
"bugs": {
"url": "https://github.com/cultureamp/kaizen-design-system/issues"
"url": "https://github.com/cultureamp/kaizen-legacy/issues"
},
"files": [
"**/*.js",
Expand Down
4 changes: 2 additions & 2 deletions draft-packages/filter-menu-button/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/cultureamp/kaizen-design-system.git",
"url": "git+https://github.com/cultureamp/kaizen-legacy.git",
"directory": "draft-packages/filter-menu-button"
},
"bugs": {
"url": "https://github.com/cultureamp/kaizen-design-system/issues"
"url": "https://github.com/cultureamp/kaizen-legacy/issues"
},
"files": [
"**/*.js",
Expand Down
6 changes: 6 additions & 0 deletions draft-packages/form/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Change Log

## 10.5.0

### Minor Changes

- [#16](https://github.com/cultureamp/kaizen-legacy/pull/16) [`a8c5121`](https://github.com/cultureamp/kaizen-legacy/commit/a8c5121f200cfba7281e1b2e1298647771cd8e71) - add margin top to input and button to match labels from other components

## 10.4.9

### Patch Changes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
}
}

.input {
margin-top: $spacing-6;
}

$input-disabled-opacity: 0.3;

///////////////////////////////////////////////////
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ export const TextField = ({
id={`${id}-field-input`}
automationId={`${id}-field-input`}
ariaDescribedBy={ariaDescribedBy}
classNameOverride={styles.input}
disabled={disabled}
reversed={reversed}
status={status}
Expand Down
6 changes: 3 additions & 3 deletions draft-packages/form/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@kaizen/draft-form",
"version": "10.4.9",
"version": "10.5.0",
"description": "The draft Form component",
"scripts": {
"prepublishOnly": "tsc --project tsconfig.dist.json",
Expand All @@ -9,11 +9,11 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/cultureamp/kaizen-design-system.git",
"url": "git+https://github.com/cultureamp/kaizen-legacy.git",
"directory": "draft-packages/form"
},
"bugs": {
"url": "https://github.com/cultureamp/kaizen-design-system/issues"
"url": "https://github.com/cultureamp/kaizen-legacy/issues"
},
"files": [
"**/*.js",
Expand Down
4 changes: 2 additions & 2 deletions draft-packages/guidance-block/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/cultureamp/kaizen-design-system.git",
"url": "git+https://github.com/cultureamp/kaizen-legacy.git",
"directory": "draft-packages/guidance-block"
},
"bugs": {
"url": "https://github.com/cultureamp/kaizen-design-system/issues"
"url": "https://github.com/cultureamp/kaizen-legacy/issues"
},
"files": [
"**/*.js",
Expand Down
4 changes: 2 additions & 2 deletions draft-packages/hero-card/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/cultureamp/kaizen-design-system.git",
"url": "git+https://github.com/cultureamp/kaizen-legacy.git",
"directory": "draft-packages/hero-card"
},
"bugs": {
"url": "https://github.com/cultureamp/kaizen-design-system/issues"
"url": "https://github.com/cultureamp/kaizen-legacy/issues"
},
"files": [
"**/*.js",
Expand Down
4 changes: 2 additions & 2 deletions draft-packages/illustration/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/cultureamp/kaizen-design-system.git",
"url": "git+https://github.com/cultureamp/kaizen-legacy.git",
"directory": "draft-packages/illustration"
},
"bugs": {
"url": "https://github.com/cultureamp/kaizen-design-system/issues"
"url": "https://github.com/cultureamp/kaizen-legacy/issues"
},
"files": [
"**/*.js",
Expand Down
6 changes: 6 additions & 0 deletions draft-packages/likert-scale-legacy/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Change Log

## 1.11.0

### Minor Changes

- [#12](https://github.com/cultureamp/kaizen-legacy/pull/12) [`86b4ad0`](https://github.com/cultureamp/kaizen-legacy/commit/86b4ad0df023d830c2d0636e003afd23fcef4b58) - Fix RTL styles like Likert Scale

## 1.10.58

### Patch Changes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,39 +33,53 @@ $fifth: $color-red-500;
-webkit-animation: pop cubic-bezier(0, 0.94, 0.32, 1) 0.7s 1;
}

@mixin right-likert-item($height) {
border-top-right-radius: $height;
border-bottom-right-radius: $height;
}

@mixin left-likert-item($height) {
border-top-left-radius: $height;
border-bottom-left-radius: $height;
}

@mixin fill($height) {
&:first-child .likertItemFill {
border-top-left-radius: $height;
border-bottom-left-radius: $height;
@include left-likert-item($height);

[dir="rtl"] & {
border-radius: $height 0;
border-radius: 0;

@include right-likert-item($height);
}

&::after {
border-top-left-radius: $height;
border-bottom-left-radius: $height;
@include left-likert-item($height);

[dir="rtl"] & {
border-radius: $height 0;
border-radius: 0;

@include right-likert-item($height);
}
}
}

&:last-child .likertItemFill {
border-top-right-radius: $height;
border-bottom-right-radius: $height;
@include right-likert-item($height);

[dir="rtl"] & {
border-radius: 0 $height;
border-radius: 0;

@include left-likert-item($height);
}

&::after {
border-top-right-radius: $height;
border-bottom-right-radius: $height;
@include right-likert-item($height);

[dir="rtl"] & {
border-radius: 0 $height;
border-radius: 0;

@include left-likert-item($height);
}
}
}
Expand Down Expand Up @@ -145,8 +159,13 @@ $fifth: $color-red-500;

&[dir="rtl"],
[dir="rtl"] & {
margin-right: 2px;
margin-left: 2px;
&:first-child {
margin-left: 2px;
}

&:last-child {
margin-right: 2px;
}
}

@include fill($block-height);
Expand Down
Loading

0 comments on commit 36b97e8

Please sign in to comment.