Skip to content

Commit

Permalink
Merge branch 'main' of github.com:Skyscanner/backpack into KOA-3646
Browse files Browse the repository at this point in the history
  • Loading branch information
Ana Belciug committed Dec 2, 2021
2 parents b04ccc5 + 527bd72 commit 340dccf
Show file tree
Hide file tree
Showing 91 changed files with 602 additions and 391 deletions.
5 changes: 0 additions & 5 deletions .spelling
Original file line number Diff line number Diff line change
Expand Up @@ -379,11 +379,6 @@ RATING_TYPES.default
RATING_TYPES.pill
renderFlag
renderTarget
rowType
ROW_TYPES.start
ROW_TYPES.middle
ROW_TYPES.end
ROW_TYPES.both
selectionConfiguration
selectedDates
selectedId
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
# 2021-12-01

**Patch:**

- bpk-component-chip: 5.1.11 => 5.1.12
- Updated Chip to new spacing styles. Height has been reduced and text size has been reduced to `14px`.

- bpk-component-accordion: 3.0.18 => 3.0.19
- Updated `BpkAccordion` to the new spacing grid.


# 2021-11-29

**Breaking:**
Expand Down
9 changes: 8 additions & 1 deletion UNRELEASED.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,11 @@
- bpk-component-calendar:
- bpk-component-scrollable-calendar:
- bpk-component-datepicker:
- Updated calendar component to use the new spacing grid. This component will now appear larger in height.
- Updated calendar component to use the new spacing grid. This component will now appear larger in height.

**Fixed:**

- bpk-component-calendar:
- bpk-component-scrollable-calendar:
- Fixed white spaces selection in calendar component.

4 changes: 2 additions & 2 deletions packages/bpk-animate-height/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bpk-animate-height",
"version": "4.0.16",
"version": "4.0.17",
"description": "Animate height using CSS transitions.",
"license": "Apache-2.0",
"repository": {
Expand All @@ -21,6 +21,6 @@
},
"devDependencies": {
"@skyscanner/bpk-foundations-web": "^4.2.0",
"bpk-component-button": "^5.0.15"
"bpk-component-button": "^5.0.16"
}
}
3 changes: 1 addition & 2 deletions packages/bpk-component-accordion/examples.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import {
colorPanjin,
iconSizeSm,
lineHeightBase,
spacingSm,
} from '@skyscanner/bpk-foundations-web/tokens/base.es6';

import {
Expand All @@ -46,7 +45,7 @@ const AlignedStopsIcon = withAlignment(StopsIcon, lineHeightBase, iconSizeSm);
const AlignedTimeIcon = withAlignment(TimeIcon, lineHeightBase, iconSizeSm);

const CheckboxWrapper = props => (
<div style={{ padding: `${spacingSm} 0` }} {...props} />
<div style={{ padding: `1rem 0` }} {...props} />
);

const StopsContent = () => (
Expand Down
12 changes: 6 additions & 6 deletions packages/bpk-component-accordion/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bpk-component-accordion",
"version": "3.0.18",
"version": "3.0.19",
"description": "Backpack accordion component.",
"license": "Apache-2.0",
"repository": {
Expand All @@ -14,10 +14,10 @@
},
"gitHead": "f9f94f86d7cfc75e43bc6ad5eb01b23e62a89cc8",
"dependencies": {
"bpk-animate-height": "^4.0.16",
"bpk-component-icon": "^9.1.2",
"bpk-component-text": "^4.0.18",
"bpk-mixins": "^24.0.4",
"bpk-animate-height": "^4.0.17",
"bpk-component-icon": "^9.1.3",
"bpk-component-text": "^4.0.19",
"bpk-mixins": "^24.0.5",
"bpk-react-utils": "^4.0.1",
"prop-types": "^15.7.2"
},
Expand All @@ -26,6 +26,6 @@
},
"devDependencies": {
"@skyscanner/bpk-foundations-web": "^4.2.0",
"bpk-component-checkbox": "^3.0.18"
"bpk-component-checkbox": "^3.0.19"
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,18 @@

@import '~bpk-mixins';

$bpk-spacing-v2: true;

.bpk-accordion {
&__title {
height: auto;

@include bpk-border-bottom-sm($bpk-color-sky-gray-tint-06);
}

&__toggle-button {
width: 100%;
padding: $bpk-spacing-xs 0;
padding: 0;
border: 0;
background-color: transparent;
text-align: left;
Expand Down Expand Up @@ -62,6 +66,7 @@
&__flex-container {
display: inline-flex;
width: 100%;
margin: (bpk-spacing-md()) 0;
flex-direction: row;
}

Expand All @@ -75,7 +80,7 @@
}

&__leading-icon {
@include bpk-margin-trailing($bpk-spacing-xs, true);
@include bpk-margin-trailing(bpk-spacing-md(), true);
}

&__item-expand-icon {
Expand Down Expand Up @@ -108,6 +113,5 @@

&__content-container {
margin: 0;
padding: $bpk-spacing-xs 0;
}
}
16 changes: 8 additions & 8 deletions packages/bpk-component-aria-live/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bpk-component-aria-live",
"version": "2.0.29",
"version": "2.0.30",
"description": "Backpack aria-live component.",
"license": "Apache-2.0",
"repository": {
Expand All @@ -13,17 +13,17 @@
"registry": "https://registry.npmjs.org/"
},
"dependencies": {
"bpk-mixins": "^24.0.4",
"bpk-mixins": "^24.0.5",
"bpk-react-utils": "^4.0.1",
"prop-types": "^15.5.8"
},
"devDependencies": {
"bpk-component-chip": "^5.1.11",
"bpk-component-code": "^3.0.16",
"bpk-component-fieldset": "^4.0.5",
"bpk-component-paragraph": "^3.0.16",
"bpk-component-select": "^5.0.12",
"bpk-component-switch": "^2.0.17"
"bpk-component-chip": "^5.1.12",
"bpk-component-code": "^3.0.17",
"bpk-component-fieldset": "^4.0.6",
"bpk-component-paragraph": "^3.0.17",
"bpk-component-select": "^5.0.13",
"bpk-component-switch": "^2.0.18"
},
"peerDependencies": {
"react": "^16.3.0"
Expand Down
8 changes: 4 additions & 4 deletions packages/bpk-component-autosuggest/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bpk-component-autosuggest",
"version": "6.0.26",
"version": "6.0.27",
"description": "Backpack autosuggest component.",
"license": "Apache-2.0",
"repository": {
Expand All @@ -14,8 +14,8 @@
},
"gitHead": "4e4ec9add28e1db54d6a38a10c331bbd163f2926",
"dependencies": {
"bpk-component-input": "^6.0.28",
"bpk-mixins": "^24.0.4",
"bpk-component-input": "^6.0.29",
"bpk-mixins": "^24.0.5",
"bpk-react-utils": "^4.0.1",
"prop-types": "^15.7.2",
"react-autosuggest": "^9.4.3"
Expand All @@ -24,6 +24,6 @@
"react": "^16.3.0"
},
"devDependencies": {
"bpk-component-icon": "^9.1.2"
"bpk-component-icon": "^9.1.3"
}
}
8 changes: 4 additions & 4 deletions packages/bpk-component-badge/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bpk-component-badge",
"version": "4.0.0",
"version": "4.0.1",
"description": "Backpack badge component.",
"license": "Apache-2.0",
"repository": {
Expand All @@ -14,7 +14,7 @@
},
"gitHead": "f9f94f86d7cfc75e43bc6ad5eb01b23e62a89cc8",
"dependencies": {
"bpk-mixins": "^24.0.4",
"bpk-mixins": "^24.0.5",
"bpk-react-utils": "^4.0.1",
"prop-types": "^15.7.2"
},
Expand All @@ -23,7 +23,7 @@
},
"devDependencies": {
"@skyscanner/bpk-foundations-web": "^4.2.0",
"bpk-component-icon": "^9.1.2",
"bpk-storybook-utils": "^1.0.16"
"bpk-component-icon": "^9.1.3",
"bpk-storybook-utils": "^1.0.17"
}
}
16 changes: 8 additions & 8 deletions packages/bpk-component-banner-alert/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bpk-component-banner-alert",
"version": "6.0.1",
"version": "6.0.2",
"description": "Backpack banner alert component.",
"license": "Apache-2.0",
"repository": {
Expand All @@ -15,18 +15,18 @@
"gitHead": "4e4ec9add28e1db54d6a38a10c331bbd163f2926",
"dependencies": {
"@skyscanner/bpk-foundations-web": "^4.2.0",
"bpk-animate-height": "^4.0.16",
"bpk-component-close-button": "^3.0.18",
"bpk-component-icon": "^9.1.2",
"bpk-mixins": "^24.0.4",
"bpk-animate-height": "^4.0.17",
"bpk-component-close-button": "^3.0.19",
"bpk-component-icon": "^9.1.3",
"bpk-mixins": "^24.0.5",
"bpk-react-utils": "^4.0.1",
"prop-types": "^15.7.2",
"react-transition-group": "^2.5.3"
},
"devDependencies": {
"bpk-component-aria-live": "^2.0.29",
"bpk-component-button": "^5.0.15",
"bpk-storybook-utils": "^1.0.16"
"bpk-component-aria-live": "^2.0.30",
"bpk-component-button": "^5.0.16",
"bpk-storybook-utils": "^1.0.17"
},
"peerDependencies": {
"react": "^16.3.0"
Expand Down
14 changes: 7 additions & 7 deletions packages/bpk-component-barchart/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bpk-component-barchart",
"version": "4.1.3",
"version": "4.1.4",
"description": "Backpack bar chart component.",
"license": "Apache-2.0",
"repository": {
Expand All @@ -15,8 +15,8 @@
"gitHead": "f9f94f86d7cfc75e43bc6ad5eb01b23e62a89cc8",
"dependencies": {
"@skyscanner/bpk-foundations-web": "^4.2.0",
"bpk-component-mobile-scroll-container": "^3.0.17",
"bpk-mixins": "^24.0.4",
"bpk-component-mobile-scroll-container": "^3.0.18",
"bpk-mixins": "^24.0.5",
"bpk-react-utils": "^4.0.1",
"d3-path": "^2.0.0",
"d3-scale": "^4.0.2",
Expand All @@ -27,9 +27,9 @@
"react": "^16.3.0"
},
"devDependencies": {
"bpk-component-breakpoint": "^3.0.17",
"bpk-component-content-container": "^3.0.16",
"bpk-component-rtl-toggle": "^3.0.16",
"bpk-component-text": "^4.0.18"
"bpk-component-breakpoint": "^3.0.18",
"bpk-component-content-container": "^3.0.17",
"bpk-component-rtl-toggle": "^3.0.17",
"bpk-component-text": "^4.0.19"
}
}
4 changes: 2 additions & 2 deletions packages/bpk-component-blockquote/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bpk-component-blockquote",
"version": "3.0.16",
"version": "3.0.17",
"description": "Backpack blockquote component.",
"license": "Apache-2.0",
"repository": {
Expand All @@ -14,7 +14,7 @@
},
"gitHead": "5c156b97cb0ba5e75851d3c763334578714c895e",
"dependencies": {
"bpk-mixins": "^24.0.4",
"bpk-mixins": "^24.0.5",
"bpk-react-utils": "^4.0.1",
"prop-types": "^15.7.2"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/bpk-component-boilerplate/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bpk-component-boilerplate",
"version": "1.0.16",
"version": "1.0.17",
"description": "Backpack boilerplate component.",
"license": "Apache-2.0",
"private": true,
Expand All @@ -14,7 +14,7 @@
"registry": "https://registry.npmjs.org/"
},
"dependencies": {
"bpk-mixins": "^24.0.4",
"bpk-mixins": "^24.0.5",
"bpk-react-utils": "^4.0.1",
"prop-types": "^15.5.8"
},
Expand Down
10 changes: 5 additions & 5 deletions packages/bpk-component-breadcrumb/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bpk-component-breadcrumb",
"version": "3.0.20",
"version": "3.0.21",
"description": "Backpack breadcrumb component.",
"license": "Apache-2.0",
"repository": {
Expand All @@ -14,10 +14,10 @@
},
"gitHead": "f9f94f86d7cfc75e43bc6ad5eb01b23e62a89cc8",
"dependencies": {
"bpk-component-icon": "^9.1.2",
"bpk-component-link": "^3.0.16",
"bpk-component-text": "^4.0.18",
"bpk-mixins": "^24.0.4",
"bpk-component-icon": "^9.1.3",
"bpk-component-link": "^3.0.17",
"bpk-component-text": "^4.0.19",
"bpk-mixins": "^24.0.5",
"bpk-react-utils": "^4.0.1",
"prop-types": "^15.7.2"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/bpk-component-breakpoint/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bpk-component-breakpoint",
"version": "3.0.17",
"version": "3.0.18",
"description": "Backpack breakpoint component.",
"license": "Apache-2.0",
"repository": {
Expand All @@ -14,7 +14,7 @@
},
"gitHead": "5c156b97cb0ba5e75851d3c763334578714c895e",
"dependencies": {
"bpk-mixins": "^24.0.4",
"bpk-mixins": "^24.0.5",
"bpk-react-utils": "^4.0.1",
"prop-types": "^15.7.2",
"react-responsive": "^6.1.2"
Expand Down
Loading

0 comments on commit 340dccf

Please sign in to comment.