diff --git a/.changeset/moody-lamps-cough.md b/.changeset/moody-lamps-cough.md new file mode 100644 index 00000000000..b20a1e1db9c --- /dev/null +++ b/.changeset/moody-lamps-cough.md @@ -0,0 +1,15 @@ +--- +'@talend/scripts-config-storybook-lib': minor +'@talend/react-faceted-search': minor +'@talend/storybook-docs': minor +'@talend/design-system': minor +'@talend/design-tokens': minor +'@talend/ui-storybook-one': minor +'@talend/design-docs': minor +'@talend/react-components': minor +'@talend/react-containers': minor +'@talend/react-stepper': minor +'@talend/react-forms': minor +--- + +feat: add @qlik-light theme diff --git a/fork/dynamic-cdn-webpack-plugin/test/fixtures/app/node_modules/.DS_Store b/fork/dynamic-cdn-webpack-plugin/test/fixtures/app/node_modules/.DS_Store deleted file mode 100644 index 5f0e6a4f3ff..00000000000 Binary files a/fork/dynamic-cdn-webpack-plugin/test/fixtures/app/node_modules/.DS_Store and /dev/null differ diff --git a/packages/components/package.json b/packages/components/package.json index 875e49bdc65..a74a483bf26 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -71,7 +71,7 @@ "warning": "^3.0.0" }, "devDependencies": { - "@storybook/addon-actions": "^7.6.2", + "@storybook/addon-actions": "^7.6.4", "@talend/bootstrap-theme": "^8.3.1", "@talend/design-system": "^8.7.0", "@talend/eslint-config": "^13.0.2", diff --git a/packages/components/src/ActionList/ActionList.component.js b/packages/components/src/ActionList/ActionList.component.js index 273339c775d..30c909cb7a3 100644 --- a/packages/components/src/ActionList/ActionList.component.js +++ b/packages/components/src/ActionList/ActionList.component.js @@ -1,13 +1,15 @@ -import PropTypes from 'prop-types'; import { useTranslation } from 'react-i18next'; + import classNames from 'classnames'; +import PropTypes from 'prop-types'; import { TagBeta } from '@talend/design-system'; import { Action } from '../Actions'; +import I18N_DOMAIN_COMPONENTS from '../constants'; import Inject from '../Inject'; + import theme from './ActionList.module.scss'; -import I18N_DOMAIN_COMPONENTS from '../constants'; /** * return the formatted action id diff --git a/packages/components/src/ActionList/ActionList.module.scss b/packages/components/src/ActionList/ActionList.module.scss index 076ae9f06f3..630db5200bf 100644 --- a/packages/components/src/ActionList/ActionList.module.scss +++ b/packages/components/src/ActionList/ActionList.module.scss @@ -11,9 +11,12 @@ $tc-action-list-item-width: 20rem !default; $tc-action-list-item-icons-size: tokens.$coral-sizing-xxxs !default; $tc-action-list-item-border-size: 0.2rem !default; +$action-list-background-color: tokens.$coral-color-branding-background; + .tc-action-list { display: inline-block; min-width: $tc-action-list-item-width; + background-color: $action-list-background-color; .tc-action-list-item { :global { @@ -28,7 +31,7 @@ $tc-action-list-item-border-size: 0.2rem !default; text-overflow: inherit; text-transform: none; - >span { + > span { margin-left: $padding-normal; vertical-align: middle; transition: 0.1s opacity ease-out; diff --git a/packages/components/src/HeaderBar/HeaderBar.component.js b/packages/components/src/HeaderBar/HeaderBar.component.js index f36abcdc3ad..823ad076d0f 100644 --- a/packages/components/src/HeaderBar/HeaderBar.component.js +++ b/packages/components/src/HeaderBar/HeaderBar.component.js @@ -1,22 +1,22 @@ -import PropTypes from 'prop-types'; -import omit from 'lodash/omit'; import { useTranslation } from 'react-i18next'; -import Inject from '../Inject'; +import omit from 'lodash/omit'; +import PropTypes from 'prop-types'; + +import AppSwitcher from '../AppSwitcher'; import I18N_DOMAIN_COMPONENTS from '../constants'; +import Inject from '../Inject'; import { getTheme } from '../theme'; -import AppSwitcher from '../AppSwitcher'; - -import { Logo } from './primitives/Logo.component'; -import { Environment } from './primitives/Environment.component'; +import { AppNotification } from './primitives/AppNotification.component'; import { CallToAction } from './primitives/CallToAction.component'; +import { Environment } from './primitives/Environment.component'; import { GenericAction } from './primitives/GenericAction.component'; -import { Search } from './primitives/Search.component'; -import { User } from './primitives/User.component'; -import { Information } from './primitives/Information.component'; import { Help } from './primitives/Help.component'; -import { AppNotification } from './primitives/AppNotification.component'; +import { Information } from './primitives/Information.component'; import { Intercom } from './primitives/Intercom.component'; +import { Logo } from './primitives/Logo.component'; +import { Search } from './primitives/Search.component'; +import { User } from './primitives/User.component'; import headerBarCssModule from './HeaderBar.module.scss'; diff --git a/packages/components/src/HeaderBar/HeaderBar.module.scss b/packages/components/src/HeaderBar/HeaderBar.module.scss index 914045f80c5..3ec95978982 100644 --- a/packages/components/src/HeaderBar/HeaderBar.module.scss +++ b/packages/components/src/HeaderBar/HeaderBar.module.scss @@ -15,7 +15,8 @@ $tc-headerbar-logo-full-width: 8.5rem !default; } .tc-header-bar { - background: tokens.$coral-color-branding-navigation; + background: tokens.$coral-color-brand-background; + color: tokens.$coral-color-brand-text; display: flex; position: fixed; top: 0; @@ -34,6 +35,18 @@ $tc-headerbar-logo-full-width: 8.5rem !default; list-style: none; } + :global { + .tc-dropdown-button, + .btn-link { + color: tokens.$coral-color-brand-text; + &:hover, + &:focus { + color: tokens.$coral-color-brand-text; + background: tokens.$coral-color-brand-background-weak-hover; + } + } + } + .tc-header-bar-actions { align-items: center; display: flex; @@ -56,7 +69,7 @@ $tc-headerbar-logo-full-width: 8.5rem !default; display: block; width: 1px; height: $font-size-large; - background-color: tokens.$coral-color-neutral-background; + background-color: tokens.$coral-color-brand-text; } :global { @@ -70,6 +83,11 @@ $tc-headerbar-logo-full-width: 8.5rem !default; .tc-header-bar-logo { padding: 0; width: $tc-headerbar-logo-width; + background-image: tokens.$coral-branding-logo; + background-size: 2.8rem; + background-repeat: no-repeat; + background-position-x: center; + background-position-y: center; :global(.tc-svg-icon) { padding: 0; @@ -79,6 +97,7 @@ $tc-headerbar-logo-full-width: 8.5rem !default; &.full { width: auto; + background-image: none; :global(.tc-svg-icon) { padding: 0 $padding-normal; @@ -162,7 +181,7 @@ $tc-headerbar-logo-full-width: 8.5rem !default; .tc-header-bar-intercom-default-component { border-radius: 50%; - background: tokens.$coral-color-accent-text; + color: tokens.$coral-color-brand-text; min-height: auto; height: 3.2rem; width: 3.2rem; diff --git a/packages/components/src/HeaderBar/HeaderBar.stories.js b/packages/components/src/HeaderBar/HeaderBar.stories.js index b7e2e8b1011..457155da357 100644 --- a/packages/components/src/HeaderBar/HeaderBar.stories.js +++ b/packages/components/src/HeaderBar/HeaderBar.stories.js @@ -1,12 +1,13 @@ import { action } from '@storybook/addon-actions'; -import { makeDecorator } from '@storybook/addons'; +import Immutable from 'immutable'; -import Immutable from 'immutable'; // eslint-disable-line import/no-extraneous-dependencies +import assetsApi from '@talend/assets-api'; +import tokens from '@talend/design-tokens'; +import AppSwitcher from '../AppSwitcher'; +// eslint-disable-line import/no-extraneous-dependencies import Icon from '../Icon'; import HeaderBar from './HeaderBar.component'; -import AppSwitcher from '../AppSwitcher'; -import assetsApi from '@talend/assets-api'; const props = { brand: { @@ -40,17 +41,17 @@ const props = { products: { items: [ { - icon: 'talend-tdp-colored', + icon: 'talend-tdp-negative', key: 'tdp', label: 'Data Preparation', }, { - icon: 'talend-tic-colored', + icon: 'talend-tic-negative', key: 'tic', label: 'Integration Cloud', }, { - icon: 'talend-tmc-colored', + icon: 'talend-tmc-negative', key: 'tmc', label: 'Management Console', }, @@ -96,6 +97,11 @@ function IntercomComponent() { export default { title: 'Components/Navigation/HeaderBar', + decorators: Story => ( +
+ +
+ ), }; export const Default = () => { @@ -138,7 +144,7 @@ export const WithBrandIcon = () => { ...props, brand: { ...props.brand, - icon: 'talend-tmc-positive', + icon: 'talend-tmc-negative', }, }).toJS(); return ; diff --git a/packages/components/src/HeaderBar/primitives/Intercom.component.js b/packages/components/src/HeaderBar/primitives/Intercom.component.js index be8bd1fa1d6..e87ed3cdff9 100644 --- a/packages/components/src/HeaderBar/primitives/Intercom.component.js +++ b/packages/components/src/HeaderBar/primitives/Intercom.component.js @@ -1,6 +1,7 @@ -import PropTypes from 'prop-types'; import { useMemo } from 'react'; +import PropTypes from 'prop-types'; + import ActionIntercom from '../../ActionIntercom'; import { getTheme } from '../../theme'; diff --git a/packages/components/src/HeaderBar/primitives/Logo.component.js b/packages/components/src/HeaderBar/primitives/Logo.component.js index ef2e9961c5a..f2f6ea279fe 100644 --- a/packages/components/src/HeaderBar/primitives/Logo.component.js +++ b/packages/components/src/HeaderBar/primitives/Logo.component.js @@ -1,7 +1,7 @@ import PropTypes from 'prop-types'; -import Inject from '../../Inject'; import Action from '../../Actions/Action'; +import Inject from '../../Inject'; import { getTheme } from '../../theme'; import headerBarCssModule from '../HeaderBar.module.scss'; @@ -9,7 +9,7 @@ import headerBarCssModule from '../HeaderBar.module.scss'; const theme = getTheme(headerBarCssModule); export function Logo({ isFull, getComponent, t, ...props }) { - const icon = isFull ? 'talend-logo' : 'talend-logo-square'; + const icon = isFull ? 'talend-logo' : undefined; const itemClassName = theme('tc-header-bar-action', 'separated'); const actionClassName = theme('tc-header-bar-logo', { full: isFull, diff --git a/packages/components/src/SidePanel/SidePanel.component.js b/packages/components/src/SidePanel/SidePanel.component.js index d6cf6b12704..94b91acaf4c 100644 --- a/packages/components/src/SidePanel/SidePanel.component.js +++ b/packages/components/src/SidePanel/SidePanel.component.js @@ -1,16 +1,19 @@ -import PropTypes from 'prop-types'; -import { createRef, useState, useLayoutEffect, useEffect } from 'react'; -import classNames from 'classnames'; +import { createRef, useEffect, useLayoutEffect, useState } from 'react'; import { withTranslation } from 'react-i18next'; +import classNames from 'classnames'; +import PropTypes from 'prop-types'; import 'simplebar'; import 'simplebar/dist/simplebar.css'; -import I18N_DOMAIN_COMPONENTS from '../constants'; -import '../translate'; -import Action from '../Actions/Action'; +import tokens from '@talend/design-tokens'; + import ActionList from '../ActionList'; +import Action from '../Actions/Action'; +import I18N_DOMAIN_COMPONENTS from '../constants'; import Inject from '../Inject'; +import '../translate'; + import theme from './SidePanel.module.scss'; const DOCKED_MIN_WIDTH = '6rem'; @@ -108,14 +111,7 @@ function SidePanel({ const toggleButtonTitle = docked ? expandLabel : collapseTitle; const Components = Inject.getAll(getComponent, { Action, ActionList }); return ( -