diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 6435b3086..ecba91bb2 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -2,24 +2,12 @@ Closes # {{short description}} -## Changelog - -**New** - -- {{new thing}} - -**Changed** - -- {{change thing}} - -**Removed** - -- {{removed thing}} - ## Acceptance Criteria - [ ] Design Review by @Gagne87, @clastzoo - [ ] Technical Review by @hirsch88, @mladenplaninicic, @nobilo +- [ ] Visual test done by @hirsch88, @nobilo, @mladenplaninicic, @Gagne87, @clastzoo +- [ ] Functional test done by @hirsch88, @nobilo, @mladenplaninicic - Browser Testing by @hirsch88, @nobilo, @mladenplaninicic, @Gagne87, @clastzoo - Desktop - [ ] Chrome diff --git a/package-lock.json b/package-lock.json index aeecc498a..53eacbbbc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,10 +7,6 @@ "name": "root", "hasInstallScript": true, "license": "Apache-2.0", - "dependencies": { - "@types/body-scroll-lock": "^3.1.0", - "body-scroll-lock": "^4.0.0-beta.0" - }, "devDependencies": { "@angular/common": "~12.2.16", "@angular/compiler": "~12.2.16", @@ -12495,11 +12491,6 @@ "integrity": "sha512-UiWyJ6TLWoHeHZ8VUyngzCOwJDVxTsPnqfAMR/85X93rkRk5A4T2U42BCx0wCmZdtMHGHN/utJ8ft5xWu0V1bA==", "dev": true }, - "node_modules/@types/body-scroll-lock": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@types/body-scroll-lock/-/body-scroll-lock-3.1.0.tgz", - "integrity": "sha512-3owAC4iJub5WPqRhxd8INarF2bWeQq1yQHBgYhN0XLBJMpd5ED10RrJ3aKiAwlTyL5wK7RkBD4SZUQz2AAAMdA==" - }, "node_modules/@types/chai": { "version": "4.3.3", "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.3.tgz", @@ -15104,11 +15095,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/body-scroll-lock": { - "version": "4.0.0-beta.0", - "resolved": "https://registry.npmjs.org/body-scroll-lock/-/body-scroll-lock-4.0.0-beta.0.tgz", - "integrity": "sha512-a7tP5+0Mw3YlUJcGAKUqIBkYYGlYxk2fnCasq/FUph1hadxlTRjF+gAcZksxANnaMnALjxEddmSi/H3OR8ugcQ==" - }, "node_modules/boolbase": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", @@ -50033,11 +50019,6 @@ "integrity": "sha512-UiWyJ6TLWoHeHZ8VUyngzCOwJDVxTsPnqfAMR/85X93rkRk5A4T2U42BCx0wCmZdtMHGHN/utJ8ft5xWu0V1bA==", "dev": true }, - "@types/body-scroll-lock": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@types/body-scroll-lock/-/body-scroll-lock-3.1.0.tgz", - "integrity": "sha512-3owAC4iJub5WPqRhxd8INarF2bWeQq1yQHBgYhN0XLBJMpd5ED10RrJ3aKiAwlTyL5wK7RkBD4SZUQz2AAAMdA==" - }, "@types/chai": { "version": "4.3.3", "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.3.tgz", @@ -52185,11 +52166,6 @@ } } }, - "body-scroll-lock": { - "version": "4.0.0-beta.0", - "resolved": "https://registry.npmjs.org/body-scroll-lock/-/body-scroll-lock-4.0.0-beta.0.tgz", - "integrity": "sha512-a7tP5+0Mw3YlUJcGAKUqIBkYYGlYxk2fnCasq/FUph1hadxlTRjF+gAcZksxANnaMnALjxEddmSi/H3OR8ugcQ==" - }, "boolbase": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", diff --git a/packages/components/src/components.d.ts b/packages/components/src/components.d.ts index 63bfd98b4..f626568dc 100644 --- a/packages/components/src/components.d.ts +++ b/packages/components/src/components.d.ts @@ -2191,7 +2191,7 @@ export namespace Components { */ "expanded": boolean; /** - * Defines the layout of the tabs. + * Defines the layout of the tabs. Right only works from the breakpoint high-definition and beyond. */ "float": Props.BalTabsFloat; /** @@ -5688,7 +5688,7 @@ declare namespace LocalJSX { */ "expanded"?: boolean; /** - * Defines the layout of the tabs. + * Defines the layout of the tabs. Right only works from the breakpoint high-definition and beyond. */ "float"?: Props.BalTabsFloat; /** diff --git a/packages/components/src/components/bal-list/bal-list-item-accordion-head/bal-list-item-accordion-head.tsx b/packages/components/src/components/bal-list/bal-list-item-accordion-head/bal-list-item-accordion-head.tsx index d7ac1f98b..93166c958 100644 --- a/packages/components/src/components/bal-list/bal-list-item-accordion-head/bal-list-item-accordion-head.tsx +++ b/packages/components/src/components/bal-list/bal-list-item-accordion-head/bal-list-item-accordion-head.tsx @@ -12,6 +12,7 @@ export class ListItemAccordionHead { * If `true` the list accordion is open */ @Prop() accordionOpen = false + /** * Icon name string with value 'plus' on default */ @@ -34,7 +35,7 @@ export class ListItemAccordionHead { return this.el.closest('bal-list-item') } - clickHandler() { + private onClick = () => { const listItem = this.getClosestListItem() if (listItem) { this.accordionOpen = !this.accordionOpen @@ -49,7 +50,7 @@ export class ListItemAccordionHead { 'bal-list-item-accordion-head bal-list-item': true, 'is-open': this.accordionOpen, }} - onClick={() => this.clickHandler()} + onClick={this.onClick} > diff --git a/packages/components/src/components/bal-list/bal-list-item/bal-list-item.tsx b/packages/components/src/components/bal-list/bal-list-item/bal-list-item.tsx index 155ead418..ab74410cd 100644 --- a/packages/components/src/components/bal-list/bal-list-item/bal-list-item.tsx +++ b/packages/components/src/components/bal-list/bal-list-item/bal-list-item.tsx @@ -1,4 +1,5 @@ import { Component, Host, h, Prop, Event, EventEmitter, Element } from '@stencil/core' +import { stopEventBubbling } from '../../../helpers/form-input.helpers' import { Props } from '../../../types' @Component({ @@ -139,6 +140,10 @@ export class ListItem { 'is-disabled': this.disabled, 'is-sub-accordion-item': this.subAccordionItem, }} + onClick={(event: MouseEvent) => { + stopEventBubbling(event) + this.balNavigate.emit(event) + }} >
diff --git a/packages/components/src/components/bal-logo/bal-logo.sass b/packages/components/src/components/bal-logo/bal-logo.sass index 2db06865a..ffb3b0986 100644 --- a/packages/components/src/components/bal-logo/bal-logo.sass +++ b/packages/components/src/components/bal-logo/bal-logo.sass @@ -8,7 +8,8 @@ & > div height: 1.25rem +modifier('animated') - margin-left: -7px + +desktop + margin-left: -7px +modifier('white') +fillSvg($white) +desktop diff --git a/packages/components/src/components/bal-navbar/bal-navbar.sass b/packages/components/src/components/bal-navbar/bal-navbar.sass index b55226591..b888249b4 100644 --- a/packages/components/src/components/bal-navbar/bal-navbar.sass +++ b/packages/components/src/components/bal-navbar/bal-navbar.sass @@ -124,6 +124,7 @@ // Styling for light (white) background +modifiers(is-light) background-color: var(--bal-color-white) + box-shadow: 0 5px 15px rgba(0, 0, 0, 0.1) .bal-navbar__brand__title color: var(--bal-color-primary) bal-logo diff --git a/packages/components/src/components/bal-navbar/stories/bal-navbar.stories.ts b/packages/components/src/components/bal-navbar/stories/bal-navbar.stories.ts index 2469c2174..b5d08e522 100644 --- a/packages/components/src/components/bal-navbar/stories/bal-navbar.stories.ts +++ b/packages/components/src/components/bal-navbar/stories/bal-navbar.stories.ts @@ -28,7 +28,7 @@ const component = BalComponentStory({ docs, args: { expanded: false, - light: true, + light: false, }, }) @@ -255,7 +255,7 @@ export const Light = args => ({ - + DE diff --git a/packages/components/src/components/bal-navigation/bal-navigation-meta/bal-navigation-meta.tsx b/packages/components/src/components/bal-navigation/bal-navigation-meta/bal-navigation-meta.tsx index ab213b01c..60bc11cc9 100644 --- a/packages/components/src/components/bal-navigation/bal-navigation-meta/bal-navigation-meta.tsx +++ b/packages/components/src/components/bal-navigation/bal-navigation-meta/bal-navigation-meta.tsx @@ -19,7 +19,7 @@ export class NavigationMeta implements ComponentInterface { ...metaEl.class(), }} > -