From 14e72b4a5d718447d6359a9cec7e2878b93a84bd Mon Sep 17 00:00:00 2001 From: "Andrea N. Cardona" Date: Tue, 11 May 2021 12:49:13 -0600 Subject: [PATCH 1/3] testing --- src/pages/components/accordion/usage.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/components/accordion/usage.mdx b/src/pages/components/accordion/usage.mdx index f6cb46d6d6a..3adc43a8a9b 100755 --- a/src/pages/components/accordion/usage.mdx +++ b/src/pages/components/accordion/usage.mdx @@ -8,7 +8,7 @@ tabs: ['Usage', 'Style', 'Code', 'Accessibility'] -An accordion is a vertically stacked list of headers that reveal or hide +THE accordion is a vertically stacked list of headers that reveal or hide associated sections of content. From 948fc18baa6fa55527bae53cd0050ba41a0e61d0 Mon Sep 17 00:00:00 2001 From: "Andrea N. Cardona" Date: Thu, 29 Jul 2021 15:09:02 -0500 Subject: [PATCH 2/3] fix(color): fix v10 color page bugs --- src/components/ColorBlock/color-block.scss | 21 ++++++++++++++++++--- src/pages/components/accordion/usage.mdx | 2 +- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/components/ColorBlock/color-block.scss b/src/components/ColorBlock/color-block.scss index d7a81823c4c..5e75d8fb97f 100644 --- a/src/components/ColorBlock/color-block.scss +++ b/src/components/ColorBlock/color-block.scss @@ -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; } @@ -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; diff --git a/src/pages/components/accordion/usage.mdx b/src/pages/components/accordion/usage.mdx index 3adc43a8a9b..f6cb46d6d6a 100755 --- a/src/pages/components/accordion/usage.mdx +++ b/src/pages/components/accordion/usage.mdx @@ -8,7 +8,7 @@ tabs: ['Usage', 'Style', 'Code', 'Accessibility'] -THE accordion is a vertically stacked list of headers that reveal or hide +An accordion is a vertically stacked list of headers that reveal or hide associated sections of content. From a46cec80ca3d3ccd8995f8878e042fef07bfcb3c Mon Sep 17 00:00:00 2001 From: "Andrea N. Cardona" Date: Fri, 30 Jul 2021 15:10:58 -0500 Subject: [PATCH 3/3] fix(color): fix v10 color page bugs v2 --- src/components/ColorBlock/color-block.scss | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/components/ColorBlock/color-block.scss b/src/components/ColorBlock/color-block.scss index 5e75d8fb97f..cfbebd3a774 100644 --- a/src/components/ColorBlock/color-block.scss +++ b/src/components/ColorBlock/color-block.scss @@ -37,24 +37,25 @@ margin-left: $spacing-05; } +.color-blocks .bx--col-lg-2 { + padding-right: 0; + padding-left: 0; +} + .color-blocks .bx--col-lg-2:nth-child(1) { min-width: 50%; @include carbon--breakpoint('md') { - margin-right: 0px; + min-width: 16%; } } -.color-blocks .bx--col-lg-2 { - padding-right: 0; - padding-left: 0; -} - .color-blocks .bx--col-lg-2:nth-child(2) { min-width: 50%; @include carbon--breakpoint('md') { margin-right: 0px; + min-width: 16%; } } @@ -63,11 +64,17 @@ @include carbon--breakpoint('md') { margin-left: $spacing-07; + min-width: 16%; } } .color-blocks .bx--col-lg-2:nth-child(4) { min-width: 50%; + + @include carbon--breakpoint('md') { + margin-right: 0px; + min-width: 16%; + } } .color-square {