Skip to content

Commit a4702bb

Browse files
authored
Merge pull request #414 from patternfly/pfe-accordion-border-fixes
PFE-accordion border fixes
2 parents ee6fde4 + acb06c5 commit a4702bb

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

elements/pfe-sass/mixins/_mixins.scss

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -261,12 +261,12 @@ $pfe-expand_chevron--placement: #{$pfe-expand_button--LineHeight / 2 - $pfe
261261
}
262262

263263
@mixin pfe-trigger-button-last($theme: light) {
264-
border-bottom: #{pfe-var(surface--border-width)} #{pfe-var(surface--border-style)} #{pfe-color(surface--border--lightest)};
264+
border-bottom: #{pfe-var(surface--border-width)} #{pfe-var(surface--border-style)} #{pfe-color(surface--border)};
265265
// @TODO Support differences based on theme
266266
}
267267

268268
@mixin pfe-trigger-button-first($theme: light) {
269-
border-top: #{pfe-var(surface--border-width)} #{pfe-var(surface--border-style)} #{pfe-color(surface--border--lightest)};
269+
border-top: #{pfe-var(surface--border-width)} #{pfe-var(surface--border-style)} #{pfe-color(surface--border)};
270270
// @TODO Support differences based on theme
271271
}
272272

@@ -286,9 +286,9 @@ $pfe-expand_chevron--placement: #{$pfe-expand_button--LineHeight / 2 - $pfe
286286
--pfe-#{$component-name}--main: transparent;
287287
--pfe-#{$component-name}--aux: #{pfe-color(surface--lightest--text)};
288288

289-
--pfe-#{$component-name}--BorderLeft: #{pfe-var(surface--border-width-heavy)} #{pfe-var(surface--border-style)} transparent;
289+
--pfe-#{$component-name}--BorderLeft: #{pfe-var(surface--border-width--heavy)} #{pfe-var(surface--border-style)} transparent;
290290
--pfe-#{$component-name}--BorderRight: #{pfe-var(surface--border-width)} #{pfe-var(surface--border-style)} transparent;
291-
--pfe-#{$component-name}--BorderBottom: #{pfe-var(surface--border-width)} #{pfe-var(surface--border-style)} #{pfe-color(surface--border--lightest)};
291+
--pfe-#{$component-name}--BorderBottom: #{pfe-var(surface--border-width)} #{pfe-var(surface--border-style)} #{pfe-color(surface--border)};
292292

293293
--pfe-#{$component-name}--BorderLeftColor--focus: #{pfe-color(surface--lightest--link)};
294294
}
@@ -298,7 +298,7 @@ $pfe-expand_chevron--placement: #{$pfe-expand_button--LineHeight / 2 - $pfe
298298
@if $theme == dark {
299299
--pfe-#{$component-name}--main: #{pfe-color(surface--darker)};
300300
--pfe-#{$component-name}--aux: #{pfe-color(surface--darkest--text)};
301-
--pfe-#{$component-name}--BorderLeft: #{pfe-var(surface--border-width-heavy)} #{pfe-var(surface--border-style)} #{pfe-color(surface--border-darkest)};
301+
--pfe-#{$component-name}--BorderLeft: #{pfe-var(surface--border-width--heavy)} #{pfe-var(surface--border-style)} #{pfe-color(surface--border-darkest)};
302302
--pfe-#{$component-name}--BorderRight: #{pfe-var(surface--border-width)} #{pfe-var(surface--border-style)} #{pfe-color(surface--border-darkest)};
303303

304304
--pfe-#{$component-name}--BorderLeftColor--focus: #{pfe-color(surface--lightest)};
@@ -307,8 +307,8 @@ $pfe-expand_chevron--placement: #{$pfe-expand_button--LineHeight / 2 - $pfe
307307
--pfe-#{$component-name}--main: #{pfe-color(surface--lightest)};
308308
--pfe-#{$component-name}--aux: #{pfe-color(surface--lightest--text)};
309309
--pfe-#{$component-name}--focus: #{pfe-color(surface--lightest--link)};
310-
--pfe-#{$component-name}--BorderLeft: #{pfe-var(surface--border-width-heavy)} #{pfe-var(surface--border-style)} #{pfe-color(surface--lightest--link)};
311-
--pfe-#{$component-name}--BorderRight: #{pfe-var(surface--border-width)} #{pfe-var(surface--border-style)} #{pfe-color(surface--border--lightest)};
310+
--pfe-#{$component-name}--BorderLeft: #{pfe-var(surface--border-width--heavy)} #{pfe-var(surface--border-style)} #{pfe-color(surface--lightest--link)};
311+
--pfe-#{$component-name}--BorderRight: #{pfe-var(surface--border-width)} #{pfe-var(surface--border-style)} #{pfe-color(surface--border)};
312312
}
313313
}
314314

@@ -390,8 +390,8 @@ $pfe-expand_chevron--placement: #{$pfe-expand_button--LineHeight / 2 - $pfe
390390
box-shadow: 0 5px #{pfe-var(surface--border-width--heavy)} rgba(140, 140, 140, 0.35);
391391
border-left-color: #{pfe-color(surface--lightest--link)};
392392
background-color: #{pfe-color(surface--lightest)};
393-
border-right-color: #{pfe-color(surface--border--lightest)};
394-
border-bottom: #{pfe-var(surface--border-width)} #{pfe-var(surface--border-style)} #{pfe-color(surface--border--lightest)};
393+
border-right-color: #{pfe-color(surface--border)};
394+
border-bottom: #{pfe-var(surface--border-width)} #{pfe-var(surface--border-style)} #{pfe-color(surface--border)};
395395
}
396396
}
397397

elements/pfe-sass/variables/_colors.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ $pfe-color--surface--accent--link--focus: $pfe-color--ui-link--on-dark--fo
127127

128128

129129
/* Palette of Border Colors */
130-
$pfe-color--surface--border: $pfe-color--gray-200 !default; // Was #ccc
130+
$pfe-color--surface--border: $pfelements--gray-light !default; // Was #dfdfdf
131131
$pfe-color--surface--border--lightest: $pfe-color--gray-100 !default; // Was #e7e7e7
132132
$pfe-color--surface--border--lighter: $pfe-color--gray-100 !default;
133133
$pfe-color--surface--border--darkest: $pfe-color--gray-800 !default;

0 commit comments

Comments
 (0)