Merge pull request #427 from brightlayer-ui/dev

Publish v7.0.1
etn-ccis · Apr 15, 2022 · 994d804 · 994d804
2 parents e6d6809 + 0763142
commit 994d804
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Change Log
 
-## 7.0.0 (March 14, 2022)
+## v7.0.1 (April 15, 2022)
+
+### Fixed
+
+-   Fixed avatar line-height in `<blui-user-menu>` 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
@@ -1,6 +1,6 @@
 {
   "name": "@brightlayer-ui/angular-components",
-  "version": "7.0.0",
+  "version": "7.0.1",
   "description": "Angular components for Brightlayer UI applications",
   "scripts": {
     "ng": "ng",

diff --git 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/components/yarn.lock b/components/yarn.lock
@@ -5682,9 +5682,9 @@ [email protected], 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"

diff --git 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');
                 <section class="mat-typography">
                     <div class="mat-display-3">Brightlayer <strong>UI</strong></div>
                     <div class="mat-display-1">Angular Component Library</div>
-                    <div class="mat-h3" *ngIf="package.version">v{{ package.version }}</div>
+                    <div class="mat-h3" *ngIf="package.version">v7.0.0</div>
                     <div class="mat-h3 description">
                         Learn about and interact with our Brightlayer UI components using Storybook.
                     </div>

diff --git a/demos/storybook/stories/toolbar-menu/_module.stories.ts 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/demos/storybook/yarn.lock b/demos/storybook/yarn.lock
@@ -10593,9 +10593,9 @@ [email protected], 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"

diff --git 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 `<blui-dropdown-toolbar>` component is used to display a toolbar with a dropdown.

diff --git 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"