Skip to content

Correct size for progress component #261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
steffanhalv wants to merge 12 commits into
base: main
Choose a base branch
from
Open

Correct size for progress component #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
34d3213
Implemented BccProgress component
steffanhalv Sep 16, 2023
bbfee56
Fix linting
steffanhalv Sep 18, 2023
a54f2d5
Merge branch 'main' into feature/BccProgress
steffanhalv Sep 18, 2023
0753d5a
Fix typecheck
steffanhalv Sep 18, 2023
5fc3202
Add full customization
steffanhalv Sep 19, 2023
bd134b5
Simplify progress bar
steffanhalv Sep 19, 2023
61de062
Simplified css
steffanhalv Sep 19, 2023
98e3c63
Removed whitespace
steffanhalv Sep 19, 2023
7a175ba
Removed comment header
steffanhalv Sep 19, 2023
87152d1
Merge branch 'main' into feature/BccProgress
steffanhalv Sep 19, 2023
08a6ec7
Correct sizes
steffanhalv Oct 9, 2023
cba0215
Merge branch 'main' into feature/BccProgress
steffanhalv Oct 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions design-library/src/components/BccProgress/BccProgress.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,21 @@

/* Size */
.bcc-progress-container .bcc-form-label-lg .bcc-form-label-optional {
@apply text-label;
@apply text-label-base;
Copy link
Contributor

@laurensgroeneveld laurensgroeneveld Oct 10, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This class no longer exists. The typography styles were updated, which is the main reason we'll be tagging a 2.0 release soon. See this page in the docs for the new classes: https://design-library-dev.developer.bcc.no/?path=/docs/tokens-typography--docs

You need to rebase your branch on the latest main. It might be easier to start a new branch because otherwise it will also try to rebase all your older commits that were already merged into main. Or maybe drop all the old commits when rebasing (let me know if you don't know how to proceed here, happy to help as rebasing in Git can get fairly complicated).

Copy link
Contributor

@laurensgroeneveld laurensgroeneveld Oct 10, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Additional comment here: In the Figma file it's possible to see the actual typography styles, see below.

image

Here you can see that the actual text styles are heading xs and body sm. I think we should keep our implementation as close as possible to the design, so I suggest changing those, perhaps by no longer using the form label component but implementing it directly.

}

.bcc-progress-sm .bcc-progress {
.bcc-progress-xs .bcc-progress {
@apply h-0.5;
}

.bcc-progress-md .bcc-progress {
.bcc-progress-sm .bcc-progress {
@apply h-1;
}

.bcc-progress-base .bcc-progress {
@apply h-1.5;
}

.bcc-progress-lg .bcc-progress {
@apply h-2;
}
Expand Down
5 changes: 3 additions & 2 deletions design-library/src/components/BccProgress/BccProgress.stories.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,10 @@ export const Size: StoryFn<typeof BccProgress> = () => ({
components: { BccProgress },
template: `
<div class="flex flex-col space-y-4">
<BccProgress class="w-1/4 bcc-progress-sm" :value="30"/>
<BccProgress class="w-1/4 bcc-progress-md" :value="22"/>
<BccProgress class="w-1/4 bcc-progress-xs" :value="30"/>
<BccProgress class="w-1/4 bcc-progress-sm" :value="22"/>
<BccProgress class="w-1/4" :value="75"/>
<BccProgress class="w-1/4" bcc-progress-base :value="75"/>
Comment on lines -82 to +85
Copy link
Contributor

@laurensgroeneveld laurensgroeneveld Oct 10, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the Vue library, these should be handled with the size prop instead of adding classes directly (then under the hood the Vue component adds the class, so people using just the CSS can also use that).

<BccProgress class="w-1/4 bcc-progress-lg" size="lg" :value="22"/>
<BccProgress class="w-1/4 bcc-progress-xl" size="lg" :value="22"/>
<BccProgress class="w-1/4 bcc-progress-2xl" size="lg" :value="22"/>
Expand Down