Skip to content

Commit

Permalink
Merge branch 'master' into jmfrancois/chore/storybook-beta
Browse files Browse the repository at this point in the history
  • Loading branch information
jmfrancois committed Jul 27, 2023
2 parents 1761148 + a38d7b2 commit 0789a88
Show file tree
Hide file tree
Showing 251 changed files with 2,749 additions and 2,039 deletions.
6 changes: 6 additions & 0 deletions .changeset/ninety-badgers-rescue.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@talend/react-components': patch
---

fix: change icon color to neutral in subheader as it's not an interactive component
fix: change the border color of the grid layout to be weaker
6 changes: 1 addition & 5 deletions .github/workflows/pr-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,8 @@ jobs:
id: eslint
run: yarn lint

- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@2a968ff601949c81b47d9c1fdb789b0d25ddeea2 #v37.1.2

- name: Merge lint
run: node merge-report.js ${{ steps.changed-files.outputs.all_changed_files }}
run: yarn lint-merge-report master ${GITHUB_HEAD_REF}

- name: Annotate Code Linting Results
uses: ataylorme/eslint-annotate-action@2c426a387ed738e9522e93abfcb4cfc57b46458a #v2.2.0
Expand Down
64 changes: 32 additions & 32 deletions fork/bootstrap-sass/assets/stylesheets/bootstrap/_labels.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,64 +3,64 @@
// --------------------------------------------------

.label {
display: inline;
padding: .2em .6em .3em;
font-size: 75%;
font-weight: 700;
line-height: 1;
color: $label-color;
text-align: center;
white-space: nowrap;
vertical-align: baseline;
border-radius: .25em;
display: inline;
padding: 0.2em 0.6em 0.3em;
font-size: 75%;
font-weight: 700;
line-height: 1;
color: $label-color;
text-align: center;
white-space: nowrap;
vertical-align: baseline;
border-radius: 0.25em;

// [converter] extracted a& to a.label
// [converter] extracted a& to a.label

// Empty labels collapse automatically (not available in IE8)
&:empty {
display: none;
}
// Empty labels collapse automatically (not available in IE8)
&:empty {
display: none;
}

// Quick fix for labels in buttons
.btn & {
position: relative;
top: -1px;
}
// Quick fix for labels in buttons
.btn & {
position: relative;
top: -1px;
}
}

// Add hover effects, but only for links
a.label {
&:hover,
&:focus {
color: $label-link-hover-color;
text-decoration: none;
cursor: pointer;
}
&:hover,
&:focus {
color: $label-link-hover-color;
text-decoration: none;
cursor: pointer;
}
}

// Colors
// Contextual variations (linked labels get darker on :hover)

.label-default {
@include label-variant($label-default-bg);
@include label-variant($label-default-bg);
}

.label-primary {
@include label-variant($label-primary-bg);
@include label-variant($label-primary-bg);
}

.label-success {
@include label-variant($label-success-bg);
@include label-variant($label-success-bg);
}

.label-info {
@include label-variant($label-info-bg);
@include label-variant($label-info-bg);
}

.label-warning {
@include label-variant($label-warning-bg);
@include label-variant($label-warning-bg);
}

.label-danger {
@include label-variant($label-danger-bg);
@include label-variant($label-danger-bg);
}
6 changes: 6 additions & 0 deletions fork/module-to-cdn/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @talend/module-to-cdn

## 9.9.0

### Minor Changes

- f65073eb9: feat: add ace-builds

## 9.8.5

### Patch Changes
Expand Down
8 changes: 8 additions & 0 deletions fork/module-to-cdn/modules.json
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,14 @@
}
}
},
"ace-builds": {
"versions": {
">= 1.10.1": {
"development": "/",
"production": "/"
}
}
},
"aframe": {
"var": "AFRAME",
"versions": {
Expand Down
2 changes: 1 addition & 1 deletion fork/module-to-cdn/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@talend/module-to-cdn",
"version": "9.8.5",
"version": "9.9.0",
"description": "Get cdn config from npm module name",
"license": "MIT",
"repository": "https://github.com/Talend/ui",
Expand Down
4 changes: 2 additions & 2 deletions fork/react-bootstrap/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
"react-dom": ">=16.3.0"
},
"devDependencies": {
"@talend/scripts-core": "^13.3.0",
"@talend/scripts-config-react-webpack": "^15.4.0",
"@talend/scripts-core": "^14.0.0",
"@talend/scripts-config-react-webpack": "^15.4.1",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^12.1.5",
"@testing-library/user-event": "^13.5.0",
Expand Down
62 changes: 0 additions & 62 deletions merge-report.js

This file was deleted.

7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"release": "yarn pre-release && yarn changeset publish",
"lint-staged": "lint-staged",
"lint": "cross-env WORKSPACE_RUN_FAIL=no-bail talend-yarn-workspace run lint",
"lint-merge-report": "talend-yarn-workspace lint-merge-report",
"test": "cross-env TZ=Europe/Paris talend-yarn-workspace run test --silent",
"test:update": "cross-env TZ=Europe/Paris yarn workspaces run test --silent -u",
"test:cov": "cross-env TZ=Europe/Paris talend-yarn-workspace run test:cov",
Expand All @@ -33,8 +34,8 @@
"resolutions": {
"**/@types/react": "^17.0.2",
"**/@types/react-dom": "^17.0.2",
"**/typescript": ">=4.6.3",
"**/i18next-scanner-typescript/typescript": "^4.9.5",
"**/i18next-scanner-typescript/typescript": "^5.0.4",
"**/browser-sync-client/typescript": "^5.0.4",
"**/vinyl-fs/glob-parent": "^5.1.2",
"**/fast-glob/glob-parent": "^5.1.2",
"**/trim": "^1.0.1",
Expand All @@ -60,7 +61,7 @@
"@types/react": "^17.0.62",
"@types/react-dom": "^17.0.20",
"terser-webpack-plugin": "^5.3.9",
"typescript": "^4.9.5",
"typescript": "^5.0.4",
"webpack": "^5.87.0"
}
}
2 changes: 1 addition & 1 deletion packages/a11y/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"lodash": "^4.17.21"
},
"devDependencies": {
"@talend/scripts-core": "^13.3.0",
"@talend/scripts-core": "^14.0.0",
"@testing-library/react": "^12.1.5",
"react": "^17.0.2",
"react-dom": "^17.0.2"
Expand Down
4 changes: 2 additions & 2 deletions packages/assets-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
},
"dependencies": {},
"devDependencies": {
"@talend/scripts-core": "^13.3.0",
"@talend/scripts-config-react-webpack": "^15.4.0",
"@talend/scripts-core": "^14.0.0",
"@talend/scripts-config-react-webpack": "^15.4.1",
"read-pkg-up": "^7.0.1"
},
"publishConfig": {
Expand Down
4 changes: 2 additions & 2 deletions packages/cmf-cqrs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
"redux-saga": "^1.2.3"
},
"devDependencies": {
"@talend/scripts-core": "^13.3.0",
"@talend/scripts-config-react-webpack": "^15.4.0",
"@talend/scripts-core": "^14.0.0",
"@talend/scripts-config-react-webpack": "^15.4.1",
"@testing-library/react-hooks": "^8.0.1",
"mock-socket": "^9.2.1",
"prop-types": "^15.8.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/cmf-router/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
},
"devDependencies": {
"@redux-saga/testing-utils": "^1.1.5",
"@talend/scripts-core": "^13.3.0",
"@talend/scripts-config-react-webpack": "^15.4.0",
"@talend/scripts-core": "^14.0.0",
"@talend/scripts-config-react-webpack": "^15.4.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"redux-saga-tester": "^1.0.874"
Expand Down
4 changes: 2 additions & 2 deletions packages/cmf/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
},
"devDependencies": {
"@redux-saga/testing-utils": "^1.1.5",
"@talend/scripts-core": "^13.3.0",
"@talend/scripts-config-react-webpack": "^15.4.0",
"@talend/scripts-core": "^14.0.0",
"@talend/scripts-config-react-webpack": "^15.4.1",
"@testing-library/react": "^12.1.5",
"jest-in-case": "^1.0.2",
"jsdoc": "^3.6.11",
Expand Down
56 changes: 56 additions & 0 deletions packages/components/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,61 @@
# @talend/react-components

## 11.1.0

### Minor Changes

- c15088d3b: TDOPS-4856 - Fix List colors taken from DS tokens

## 11.0.0

### Major Changes

- bfc02c4fb: Style now use design tokens instead of bootstrap sass variables

We have updated the following components:

- ActionBar
- ActionIconToggle
- AppLoader
- Badge
- CollapsiblePanel
- Datalist
- DataViewer
- DateTimePickers + Legacy
- Drawer
- EditableText
- Enumeration (bug on buttons)
- FilterBar
- FormatValue
- GuidedTour
- GridLayout aka Dashboard
- HeaderBar
- List (Virtualized and Composition)
- ListView
- MultiSelect
- Notification
- ObjectViewer
- PieChart
- Progress
- RadarChart
- ResourceList
- ResourcePicker
- RichLayout
- Skeleton
- Slider
- Status
- SubHeaderBar
- Toggle
- Tooltip
- TreeView
- Typeahead

### Patch Changes

- 40e70c055: chore: remove devDependencies to typescript
- Updated dependencies [bfc02c4fb]
- @talend/bootstrap-theme@8.0.0

## 10.3.5

### Patch Changes
Expand Down
Loading

0 comments on commit 0789a88

Please sign in to comment.