Skip to content
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

Jump to bottom

fix(color): fix v10 color page bugs #2471

Merged
merged 17 commits into from
Aug 2, 2021
Merged

fix(color): fix v10 color page bugs #2471

Changes from 14 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
14e72b4
testing
andreancardona May 11, 2021
c602049
Merge branch 'main' of github.com:carbon-design-system/carbon-website
andreancardona May 14, 2021
f6a56b7
Merge branch 'main' of github.com:carbon-design-system/carbon-website
andreancardona May 20, 2021
ec844fa
Merge branch 'main' of github.com:carbon-design-system/carbon-website
andreancardona Jun 11, 2021
1003fa1
Merge branch 'main' of github.com:carbon-design-system/carbon-website
andreancardona Jun 25, 2021
76479ca
Merge branch 'main' of github.com:carbon-design-system/carbon-website
andreancardona Jul 6, 2021
70d0594
Merge branch 'main' of github.com:carbon-design-system/carbon-website
andreancardona Jul 8, 2021
97253bc
Merge branch 'main' of github.com:carbon-design-system/carbon-website
andreancardona Jul 20, 2021
ba7b291
Merge branch 'main' of github.com:carbon-design-system/carbon-website
andreancardona Jul 22, 2021
296f97a
Merge branch 'main' of github.com:carbon-design-system/carbon-website
andreancardona Jul 27, 2021
ae05a2a
Merge branch 'main' of github.com:carbon-design-system/carbon-website
andreancardona Jul 29, 2021
762c9a5
Merge branch 'main' of github.com:carbon-design-system/carbon-website
andreancardona Jul 29, 2021
948fc18
fix(color): fix v10 color page bugs
andreancardona Jul 29, 2021
76fc9bc
Merge branch 'main' into 2451-various-website-bugs
andreancardona Jul 29, 2021
a46cec8
fix(color): fix v10 color page bugs v2
andreancardona Jul 30, 2021
ab924d8
Merge branch '2451-various-website-bugs' of github.com:andreancardona…
andreancardona Jul 30, 2021
4a38957
Merge branch 'main' into 2451-various-website-bugs
andreancardona Jul 30, 2021
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
21 changes: 18 additions & 3 deletions src/components/ColorBlock/color-block.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
height: rem(14px);
width: rem(14px);
border-radius: rem(14px);
border: 1px solid $ui-03;
border: 1px solid $gray-30;
left: -1px;
top: -1px;
}
Expand All @@ -33,28 +33,43 @@
// Color blocks

.color-blocks .bx--caption {
font-size: 14px;
margin-left: $spacing-05;
}

.color-blocks .bx--col-lg-2:nth-child(1) {
min-width: 50%;

@include carbon--breakpoint('md') {
margin-right: 0px;
}
}

.color-blocks .bx--col-lg-2 {
padding-right: 0;
padding-left: 0;
}

.color-blocks .bx--col-lg-2:nth-child(2) {
margin-right: 40%;
min-width: 50%;

@include carbon--breakpoint('md') {
margin-right: 0;
margin-right: 0px;
}
}

.color-blocks .bx--col-lg-2:nth-child(3) {
min-width: 50%;

@include carbon--breakpoint('md') {
margin-left: $spacing-07;
}
}

.color-blocks .bx--col-lg-2:nth-child(4) {
min-width: 50%;
}

.color-square {
@include carbon--type-style('body-short-01');
padding: $spacing-05;
Expand Down