Skip to content

Commit 95f67ae

Browse files
authored
Merge branch 'main' into feature/762-inputs
2 parents 24aed36 + 3a4c3b8 commit 95f67ae

File tree

4 files changed

+28
-4
lines changed

4 files changed

+28
-4
lines changed

.github/workflows/run-checks.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ jobs:
66
steps:
77
- name: Checkout 🛎️
88
uses: actions/checkout@v3
9+
- uses: actions/setup-node@v3
10+
with:
11+
node-version: '18.16.1'
912

1013
- name: Lint 👀
1114
run: |

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
### Changed
1515

1616
- Updated visual appearance of inputs. If you weren’t overriding the default configuration, you don’t need to do anything to update. If you were overriding the configuration, be aware that there are now extra states for radio & checkboxes, that you should override the colors for: active, checked-hover, checked-active, invalid, invalid-checked. You can now also set the box-shadow for each state.
17+
- Badge with Label, added an example showing a text label rendered next to a badge component, to the badge docs.
1718

1819
## [[6.0.0]](https://github.com/bitcrowd/bitstyles/releases/tag/v6.0.0) - 2023-06-08
1920

scss/bitstyles/atoms/badge/Badge.stories.js

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,3 +269,23 @@ PositiveButtonSmall.args = {
269269
onClick: dummyOnClick,
270270
sizeVariant: ['small'],
271271
};
272+
273+
const TemplateBadgeWithLabel = (args) => {
274+
const wrapper = document.createElement('div');
275+
const trailingLabel = document.createElement('span');
276+
trailingLabel.classList.add('u-margin-m-left');
277+
trailingLabel.innerHTML = 'Trailing label';
278+
wrapper.append(Badge(args));
279+
wrapper.append(trailingLabel);
280+
return wrapper;
281+
};
282+
283+
export const BadgeWithLabel = TemplateBadgeWithLabel.bind({});
284+
BadgeWithLabel.args = {
285+
theme: 'default',
286+
sizeVariant: ['small'],
287+
};
288+
BadgeWithLabel.parameters = {
289+
zeplinLink:
290+
'https://app.zeplin.io/styleguide/63079b90d0bf4a646c46c227/components?coid=640ef6a6805d9020e491d493',
291+
};

scss/bitstyles/atoms/skip-link/skip-link.stories.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ export default {
66
};
77

88
const Template = (args) => {
9-
const fragment = new DocumentFragment();
9+
const wrapper = document.createElement('div');
1010
const mainContent = document.createElement('div');
1111
mainContent.setAttribute('id', 'main');
1212
mainContent.innerHTML =
1313
'Your main content here, after some other content that gets repeated on every page (navigation etc.)';
14-
fragment.append(Link(args));
15-
fragment.append(mainContent);
16-
return fragment;
14+
wrapper.append(Link(args));
15+
wrapper.append(mainContent);
16+
return wrapper;
1717
};
1818

1919
// ***** Default size, each shape & color ****************** //

0 commit comments

Comments
 (0)