From e77a6fc4c40451fa7266143e4cf11ab8efc808b9 Mon Sep 17 00:00:00 2001 From: Ekta Ghag Date: Thu, 7 Apr 2022 17:34:43 +0530 Subject: [PATCH 1/8] fix user menu avatar line height --- .../src/core/user-menu/user-menu.component.scss | 11 +++++------ scripts/linkComponents.sh | 1 + 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/src/core/user-menu/user-menu.component.scss b/components/src/core/user-menu/user-menu.component.scss index c9cf23a3e..40dd0712d 100644 --- a/components/src/core/user-menu/user-menu.component.scss +++ b/components/src/core/user-menu/user-menu.component.scss @@ -26,18 +26,17 @@ $size: 2.5rem; align-self: center; @include scale-icon-content(); } + .blui-user-menu-text-avatar { + margin-bottom: 0; + font-weight: 400; + line-height: $size; + } } mat-card.blui-user-menu-overlay { padding: 0; } -.blui-user-menu-text-avatar { - margin-bottom: 0; - font-weight: 400; - line-height: $size; -} - .blui-user-menu-header mat-toolbar { border-top-left-radius: 4px; border-top-right-radius: 4px; diff --git a/scripts/linkComponents.sh b/scripts/linkComponents.sh index 7801e619a..de79afba1 100644 --- a/scripts/linkComponents.sh +++ b/scripts/linkComponents.sh @@ -13,6 +13,7 @@ echo -e "${BLUE}Building components...${NC}" yarn build echo -en "${BLUE}Creating new folder in node_modules...${NC}" +rm -rf ./demos/showcase/node_modules/.cache rm -rf "./demos/showcase/node_modules/@brightlayer-ui/angular-components" # rm -rf "./demos/storybook/node_modules/@brightlayer-ui/angular-components" mkdir -p "./demos/showcase/node_modules/@brightlayer-ui/angular-components" From 462f3800c5a8c073a5a7166518ea2989692409e5 Mon Sep 17 00:00:00 2001 From: Ekta Ghag Date: Fri, 8 Apr 2022 10:53:26 +0530 Subject: [PATCH 2/8] update package version --- CHANGELOG.md | 5 +++++ components/package.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 63b4f02ec..a4e819035 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Change Log +## v7.0.1 (Not yet published) + +### Fixed + +- Fixed User Menu Avatar's Line-Height Alignment in `` component ([#419](https://github.com/brightlayer-ui/angular-component-library/issues/419)). ## 7.0.0 (March 14, 2022) ### Added diff --git a/components/package.json b/components/package.json index 5fbb590e9..4f35d0513 100644 --- a/components/package.json +++ b/components/package.json @@ -1,6 +1,6 @@ { "name": "@brightlayer-ui/angular-components", - "version": "7.0.0", + "version": "7.0.1-beta.0", "description": "Angular components for Brightlayer UI applications", "scripts": { "ng": "ng", From 4ed3e5dca94fe288c593c05ae1901e125d0db124 Mon Sep 17 00:00:00 2001 From: Evan Date: Fri, 8 Apr 2022 11:40:05 -0400 Subject: [PATCH 3/8] Update docs --- .../storybook/src/welcome/welcome.component.ts | 2 +- .../stories/toolbar-menu/_module.stories.ts | 18 ++++++++++++++++++ docs/DropdownToolbar.md | 3 +++ 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 demos/storybook/stories/toolbar-menu/_module.stories.ts diff --git a/demos/storybook/src/welcome/welcome.component.ts b/demos/storybook/src/welcome/welcome.component.ts index 82663bf4e..a1aeb704d 100644 --- a/demos/storybook/src/welcome/welcome.component.ts +++ b/demos/storybook/src/welcome/welcome.component.ts @@ -37,7 +37,7 @@ const packageJSON = require('@brightlayer-ui/angular-components/package.json');
Brightlayer UI
Angular Component Library
-
v{{ package.version }}
+
v7.0.0
Learn about and interact with our Brightlayer UI components using Storybook.
diff --git a/demos/storybook/stories/toolbar-menu/_module.stories.ts b/demos/storybook/stories/toolbar-menu/_module.stories.ts new file mode 100644 index 000000000..813586376 --- /dev/null +++ b/demos/storybook/stories/toolbar-menu/_module.stories.ts @@ -0,0 +1,18 @@ +import {withKnobs} from '@storybook/addon-knobs'; +import {moduleMetadata, storiesOf} from '@storybook/angular'; +import {COMPONENT_SECTION_NAME, README_STORY_NAME, STORY_PARAMS,} from '../../src/constants'; +import {getReadMe, getReadMeStory, storyWrapper, UtilModule} from '../../src/utils'; +import {withA11y} from '@storybook/addon-a11y'; + +storiesOf(`${COMPONENT_SECTION_NAME}/Toolbar Menu`, module) + .addDecorator( + moduleMetadata({ + imports: [UtilModule], + }) + ) + .addDecorator(withKnobs) + // @accessibility + .addDecorator(withA11y) + .addDecorator(storyWrapper()) + .addParameters({ ...STORY_PARAMS, notes: { markdown: getReadMe('ToolbarMenu.md') } }) + .add(README_STORY_NAME, getReadMeStory); diff --git a/docs/DropdownToolbar.md b/docs/DropdownToolbar.md index a0b2e7a6b..e156d25ce 100644 --- a/docs/DropdownToolbar.md +++ b/docs/DropdownToolbar.md @@ -1,3 +1,6 @@ + +> The DropdownToolbar component is deprecated in version >=7.0.0 of `@brightlayer-ui/angular-components`. Please refer to the [`ToolbarMenu`](./ToolbarMenu.md) documentation for an alternative component. + # Dropdown Toolbar The `` component is used to display a toolbar with a dropdown. From 5be39c6bd9937f62b26ee8bbe81d21e28aebaa9e Mon Sep 17 00:00:00 2001 From: Ekta Ghag Date: Mon, 11 Apr 2022 15:25:14 +0530 Subject: [PATCH 4/8] fix verbiage --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a4e819035..fc4d018dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ### Fixed -- Fixed User Menu Avatar's Line-Height Alignment in `` component ([#419](https://github.com/brightlayer-ui/angular-component-library/issues/419)). +- Fixed avatar line-height in `` component ([#419](https://github.com/brightlayer-ui/angular-component-library/issues/419)). ## 7.0.0 (March 14, 2022) ### Added From 4622bead5331e18ff835b8ea92bdbbc2530cd4c6 Mon Sep 17 00:00:00 2001 From: Evan McLaughlin Date: Tue, 12 Apr 2022 12:00:31 -0400 Subject: [PATCH 5/8] Update CHANGELOG.md Fix auto-tagging --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fc4d018dd..64dfb0f8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ ### Fixed - Fixed avatar line-height in `` component ([#419](https://github.com/brightlayer-ui/angular-component-library/issues/419)). -## 7.0.0 (March 14, 2022) +## v7.0.0 (March 14, 2022) ### Added From e33ec7ab4496fcc9f8ed44490afdb462431df76f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Apr 2022 18:01:18 +0000 Subject: [PATCH 6/8] Bump minimist from 1.2.5 to 1.2.6 in /components Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6. - [Release notes](https://github.com/substack/minimist/releases) - [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] --- components/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/yarn.lock b/components/yarn.lock index 11f64a22a..5eff26808 100644 --- a/components/yarn.lock +++ b/components/yarn.lock @@ -5682,9 +5682,9 @@ minimatch@3.0.4, minimatch@^3.0.4, minimatch@~3.0.4: brace-expansion "^1.1.7" minimist@^1.2.0, minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + version "1.2.6" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" + integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== minipass-collect@^1.0.2: version "1.0.2" From 9120098ce3d896d48491be64f6abac9fc7a4c4e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Apr 2022 18:01:24 +0000 Subject: [PATCH 7/8] Bump minimist from 1.2.5 to 1.2.6 in /demos/storybook Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6. - [Release notes](https://github.com/substack/minimist/releases) - [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] --- demos/storybook/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/demos/storybook/yarn.lock b/demos/storybook/yarn.lock index 216682916..184dcf6c8 100644 --- a/demos/storybook/yarn.lock +++ b/demos/storybook/yarn.lock @@ -10593,9 +10593,9 @@ minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.2: brace-expansion "^1.1.7" minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + version "1.2.6" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" + integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== minipass-collect@^1.0.2: version "1.0.2" From ca0017650515cb6937ed823f286771886ab7e70e Mon Sep 17 00:00:00 2001 From: emclaug2 Date: Thu, 14 Apr 2022 20:11:36 -0400 Subject: [PATCH 8/8] Prepare to deploy 7.0.1 --- CHANGELOG.md | 3 ++- components/package.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64dfb0f8d..8edd53256 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,11 @@ # Change Log -## v7.0.1 (Not yet published) +## v7.0.1 (April 15, 2022) ### Fixed - Fixed avatar line-height in `` component ([#419](https://github.com/brightlayer-ui/angular-component-library/issues/419)). + ## v7.0.0 (March 14, 2022) ### Added diff --git a/components/package.json b/components/package.json index 4f35d0513..49f6cce81 100644 --- a/components/package.json +++ b/components/package.json @@ -1,6 +1,6 @@ { "name": "@brightlayer-ui/angular-components", - "version": "7.0.1-beta.0", + "version": "7.0.1", "description": "Angular components for Brightlayer UI applications", "scripts": { "ng": "ng",