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

fix: css: scope normalize css reset to octuple components #283

Merged
merged 3 commits into from
Aug 2, 2022
Merged

fix: css: scope normalize css reset to octuple components #283

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db9cc2e
fix: css: scope normalize css reset to octuple components
dkilgore-eightfold Aug 2, 2022
6a24336
chore: address pr feedback and dedupe button class name
dkilgore-eightfold Aug 2, 2022
7443f7a
chore: revert unnecessary change to split button
dkilgore-eightfold Aug 2, 2022
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
1 change: 1 addition & 0 deletions src/components/Button/BaseButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ export const BaseButton: FC<InternalButtonProps> = React.forwardRef(

const buttonBaseSharedClassNames: string = mergeClasses([
classNames,
styles.button,
{
[styles.buttonSmall]:
size === ButtonSize.Flex && largeScreenActive,
Expand Down
2 changes: 2 additions & 0 deletions src/components/Button/button.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
.button {
@include button-reset();

--button-counter-default-background-color: var(--grey-color-20);
--button-counter-hover-background-color: var(--primary-color-20);
--button-counter-checked-background-color: var(--primary-color-10);
Expand Down
2 changes: 2 additions & 0 deletions src/components/CheckBox/checkbox.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
.selector {
@include selector-reset();

display: flex;
position: relative;
width: fit-content;
Expand Down
2 changes: 2 additions & 0 deletions src/components/DateTimePicker/DatePicker/datepicker.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

.picker {
@include reset-component();
@include input-reset();

@include picker-padding(
$picker-input-height-m,
$picker-font-size-m,
Expand Down
36 changes: 18 additions & 18 deletions src/components/DateTimePicker/Internal/Tests/__snapshots__/partial.rtl.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ LoadedCheerio {
Node {
"attribs": Object {
"aria-disabled": "false",
"class": "picker-header-super-prev-btn button button-neutral button-small pill-shape icon-left",
"class": "picker-header-super-prev-btn button button-neutral button button-small pill-shape icon-left",
},
"children": Array [
Node {
Expand Down Expand Up @@ -106,7 +106,7 @@ LoadedCheerio {
Node {
"attribs": Object {
"aria-disabled": "false",
"class": "picker-year-btn button button-neutral button-small pill-shape",
"class": "picker-year-btn button button-neutral button button-small pill-shape",
},
"children": Array [
Node {
Expand Down Expand Up @@ -157,7 +157,7 @@ LoadedCheerio {
"next": Node {
"attribs": Object {
"aria-disabled": "false",
"class": "picker-header-super-next-btn button button-neutral button-small pill-shape icon-left",
"class": "picker-header-super-next-btn button button-neutral button button-small pill-shape icon-left",
},
"children": Array [
Node {
Expand Down Expand Up @@ -277,7 +277,7 @@ LoadedCheerio {
Node {
"attribs": Object {
"aria-disabled": "false",
"class": "picker-year-btn button button-neutral button-small pill-shape",
"class": "picker-year-btn button button-neutral button button-small pill-shape",
},
"children": Array [
Node {
Expand Down Expand Up @@ -328,7 +328,7 @@ LoadedCheerio {
"next": Node {
"attribs": Object {
"aria-disabled": "false",
"class": "picker-header-super-next-btn button button-neutral button-small pill-shape icon-left",
"class": "picker-header-super-next-btn button button-neutral button button-small pill-shape icon-left",
},
"children": Array [
Node {
Expand Down Expand Up @@ -422,7 +422,7 @@ LoadedCheerio {
"prev": Node {
"attribs": Object {
"aria-disabled": "false",
"class": "picker-header-super-prev-btn button button-neutral button-small pill-shape icon-left",
"class": "picker-header-super-prev-btn button button-neutral button button-small pill-shape icon-left",
},
"children": Array [
Node {
Expand Down Expand Up @@ -523,7 +523,7 @@ LoadedCheerio {
Node {
"attribs": Object {
"aria-disabled": "false",
"class": "picker-header-super-next-btn button button-neutral button-small pill-shape icon-left",
"class": "picker-header-super-next-btn button button-neutral button button-small pill-shape icon-left",
},
"children": Array [
Node {
Expand Down Expand Up @@ -610,7 +610,7 @@ LoadedCheerio {
Node {
"attribs": Object {
"aria-disabled": "false",
"class": "picker-year-btn button button-neutral button-small pill-shape",
"class": "picker-year-btn button button-neutral button button-small pill-shape",
},
"children": Array [
Node {
Expand Down Expand Up @@ -663,7 +663,7 @@ LoadedCheerio {
"prev": Node {
"attribs": Object {
"aria-disabled": "false",
"class": "picker-header-super-prev-btn button button-neutral button-small pill-shape icon-left",
"class": "picker-header-super-prev-btn button button-neutral button button-small pill-shape icon-left",
},
"children": Array [
Node {
Expand Down Expand Up @@ -14909,7 +14909,7 @@ LoadedCheerio {
Node {
"attribs": Object {
"aria-disabled": "false",
"class": "picker-header-super-prev-btn button button-neutral button-small pill-shape icon-left",
"class": "picker-header-super-prev-btn button button-neutral button button-small pill-shape icon-left",
},
"children": Array [
Node {
Expand Down Expand Up @@ -14994,7 +14994,7 @@ LoadedCheerio {
Node {
"attribs": Object {
"aria-disabled": "false",
"class": "picker-year-btn button button-neutral button-small pill-shape",
"class": "picker-year-btn button button-neutral button button-small pill-shape",
},
"children": Array [
Node {
Expand Down Expand Up @@ -15045,7 +15045,7 @@ LoadedCheerio {
"next": Node {
"attribs": Object {
"aria-disabled": "false",
"class": "picker-header-super-next-btn button button-neutral button-small pill-shape icon-left",
"class": "picker-header-super-next-btn button button-neutral button button-small pill-shape icon-left",
},
"children": Array [
Node {
Expand Down Expand Up @@ -15165,7 +15165,7 @@ LoadedCheerio {
Node {
"attribs": Object {
"aria-disabled": "false",
"class": "picker-year-btn button button-neutral button-small pill-shape",
"class": "picker-year-btn button button-neutral button button-small pill-shape",
},
"children": Array [
Node {
Expand Down Expand Up @@ -15216,7 +15216,7 @@ LoadedCheerio {
"next": Node {
"attribs": Object {
"aria-disabled": "false",
"class": "picker-header-super-next-btn button button-neutral button-small pill-shape icon-left",
"class": "picker-header-super-next-btn button button-neutral button button-small pill-shape icon-left",
},
"children": Array [
Node {
Expand Down Expand Up @@ -15310,7 +15310,7 @@ LoadedCheerio {
"prev": Node {
"attribs": Object {
"aria-disabled": "false",
"class": "picker-header-super-prev-btn button button-neutral button-small pill-shape icon-left",
"class": "picker-header-super-prev-btn button button-neutral button button-small pill-shape icon-left",
},
"children": Array [
Node {
Expand Down Expand Up @@ -15411,7 +15411,7 @@ LoadedCheerio {
Node {
"attribs": Object {
"aria-disabled": "false",
"class": "picker-header-super-next-btn button button-neutral button-small pill-shape icon-left",
"class": "picker-header-super-next-btn button button-neutral button button-small pill-shape icon-left",
},
"children": Array [
Node {
Expand Down Expand Up @@ -15498,7 +15498,7 @@ LoadedCheerio {
Node {
"attribs": Object {
"aria-disabled": "false",
"class": "picker-year-btn button button-neutral button-small pill-shape",
"class": "picker-year-btn button button-neutral button button-small pill-shape",
},
"children": Array [
Node {
Expand Down Expand Up @@ -15551,7 +15551,7 @@ LoadedCheerio {
"prev": Node {
"attribs": Object {
"aria-disabled": "false",
"class": "picker-header-super-prev-btn button button-neutral button-small pill-shape icon-left",
"class": "picker-header-super-prev-btn button button-neutral button button-small pill-shape icon-left",
},
"children": Array [
Node {
Expand Down
2 changes: 2 additions & 0 deletions src/components/DateTimePicker/Internal/ocpicker.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
@import '../DatePicker/Styles/mixins';

.picker {
@include input-reset();

border: $picker-border;
border-radius: $picker-border-radius;
display: inline-flex;
Expand Down
3 changes: 3 additions & 0 deletions src/components/Dropdown/Dropdown.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,9 @@ const Overlay = () => (
iconProps={{
path: item.icon,
}}
style={{
margin: '4px 0',
}}
/>
)}
/>
Expand Down
1 change: 1 addition & 0 deletions src/components/Empty/empty.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
margin-bottom: 8px;

img {
border-style: none;
height: 100%;
}

Expand Down
3 changes: 3 additions & 0 deletions src/components/Inputs/input.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
.input-wrapper {
@include input-reset();
@include textarea-reset();

position: relative;
width: fit-content;

Expand Down
1 change: 1 addition & 0 deletions src/components/Link/link.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.link-style {
align-items: center;
background-color: transparent;
cursor: pointer;
display: flex;
flex-direction: row;
Expand Down
3 changes: 3 additions & 0 deletions src/components/Menu/MenuItem/menuItem.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
.menu-item {
@include button-reset();

--background: transparent;
background-color: var(--background);
color: var(--label);
Expand All @@ -9,6 +11,7 @@
cursor: pointer;
font-weight: $text-font-weight-semibold;
transition: all $motion-duration-extra-fast $motion-easing-easeinout 0s;
margin: 4px 0;

&.large {
height: 44px;
Expand Down
2 changes: 2 additions & 0 deletions src/components/RadioButton/radio.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
.selector {
@include selector-reset();

display: flex;
position: relative;
width: fit-content;
Expand Down
2 changes: 2 additions & 0 deletions src/components/Select/select.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
.select-wrapper {
@include select-reset();

position: relative;
width: 100%;

Expand Down
8 changes: 4 additions & 4 deletions src/components/Table/Tests/__snapshots__/Table.expand.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1898,7 +1898,7 @@ LoadedCheerio {
"aria-checked": "true",
"aria-disabled": "false",
"aria-pressed": "true",
"class": "pagination-button active button button-neutral button-medium",
"class": "pagination-button active button button-neutral button button-medium",
},
"children": Array [
Node {
Expand Down Expand Up @@ -1990,7 +1990,7 @@ LoadedCheerio {
"aria-checked": "true",
"aria-disabled": "false",
"aria-pressed": "true",
"class": "pagination-button active button button-neutral button-medium",
"class": "pagination-button active button button-neutral button button-medium",
},
"children": Array [
Node {
Expand Down Expand Up @@ -2121,7 +2121,7 @@ LoadedCheerio {
"aria-checked": "true",
"aria-disabled": "false",
"aria-pressed": "true",
"class": "pagination-button active button button-neutral button-medium",
"class": "pagination-button active button button-neutral button button-medium",
},
"children": Array [
Node {
Expand Down Expand Up @@ -2213,7 +2213,7 @@ LoadedCheerio {
"aria-checked": "true",
"aria-disabled": "false",
"aria-pressed": "true",
"class": "pagination-button active button button-neutral button-medium",
"class": "pagination-button active button button-neutral button button-medium",
},
"children": Array [
Node {
Expand Down
Loading