Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
width: toRem(100);
height: toRem(134);
flex-shrink: 0;
border: 1px solid var(--g-colorBorder);
border: 1px solid var(--g-colorBorderSecondary);
border-radius: toRem(4);
box-shadow: var(--g-shadowResting);
overflow: hidden;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.inlineSpinner {
display: inline-flex;
align-items: center;
color: var(--g-colorPrimaryAccent);
color: var(--g-colorPrimary);
}

.spinnerIcon {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

.internalErrorCard {
background-color: var(--g-colorBody);
border-right: 1px solid var(--g-colorBorder);
border-bottom: 1px solid var(--g-colorBorder);
border-left: 1px solid var(--g-colorBorder);
border-right: 1px solid var(--g-colorBorderSecondary);
border-bottom: 1px solid var(--g-colorBorderSecondary);
border-left: 1px solid var(--g-colorBorderSecondary);
box-shadow:
0px 1px 18px rgba(0, 0, 0, 0.08),
inset 0 4px 0 var(--g-colorErrorContent);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@

.dragging {
opacity: 0.7;
outline: toRem(2) dashed var(--g-colorBorder);
outline: toRem(2) dashed var(--g-colorBorderSecondary);
}

.activeDropZone {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
width: 0;
height: calc(100% - toRem(32)); //account for the icon height
margin: toRem(7) 0; //adding gap to the line
border-left: 2px dotted var(--g-colorBorder);
border-left: 2px dotted var(--g-colorBorderSecondary);
z-index: 0;
}
}
Expand All @@ -40,7 +40,7 @@
justify-content: center;
font-size: toRem(14);
font-weight: var(--g-fontWeightSemibold);
border: 1px solid var(--g-colorBorder);
border: 1px solid var(--g-colorBorderSecondary);
color: var(--g-colorBodyContent);
background: var(--g-colorBody);

Expand Down
2 changes: 1 addition & 1 deletion src/components/Common/UI/Alert/Alert.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
.alert {
--color: var(--g-colorBodyContent);
--headerColor: var(--g-colorBodyContent);
--borderColor: var(--g-colorBorder);
--borderColor: var(--g-colorBorderPrimary);

border: 1px solid var(--borderColor);
border-radius: toRem(12);
Expand Down
6 changes: 3 additions & 3 deletions src/components/Common/UI/Banner/Banner.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
border-radius: var(--g-bannerRadius);
overflow: hidden;
box-shadow: var(--g-shadowResting);
border-right: 1px solid var(--g-colorBorder);
border-bottom: 1px solid var(--g-colorBorder);
border-left: 1px solid var(--g-colorBorder);
border-right: 1px solid var(--g-colorBorderSecondary);
border-bottom: 1px solid var(--g-colorBorderSecondary);
border-left: 1px solid var(--g-colorBorderSecondary);
width: 100%;

.header {
Expand Down
14 changes: 7 additions & 7 deletions src/components/Common/UI/Button/Button.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@
border-radius: var(--g-buttonRadius);
vertical-align: middle;
font-size: var(--g-fontSizeSmall);
font-weight: var(--g-fontWeightMedium);
font-weight: var(--g-fontWeightSemibold);
line-height: toRem(24);
min-height: toRem(42);
letter-spacing: 0.32px;
text-align: center;
margin: 0;
outline: none;
Expand All @@ -31,18 +30,19 @@
}

&[data-variant='secondary'] {
color: var(--g-colorSecondaryContent);
color: var(--g-colorBodySubContent);
background: var(--g-colorSecondary);
border-color: var(--g-colorSecondaryContent);
border-color: var(--g-colorBorderPrimary);
box-shadow: var(--g-shadowResting);

&:hover:not([data-disabled]) {
background: var(--g-colorSecondaryAccent);
border-color: var(--g-colorSecondaryContent);
border-color: var(--g-colorBorderPrimary);
}

&:active:not([data-disabled]) {
background: var(--g-colorSecondary);
border-color: var(--g-colorSecondaryContent);
border-color: var(--g-colorBorderPrimary);
}
}

Expand All @@ -53,7 +53,7 @@

&:hover:not([data-disabled]) {
background: var(--g-colorSecondaryAccent);
border-color: var(--g-colorSecondaryAccent);
border-color: transparent;
}

&:active:not([data-disabled]) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
:global(.GSDK) {
.calendar {
.calendarWrapper {
border: toRem(1) solid var(--g-colorBorder);
border: toRem(1) solid var(--g-colorBorderSecondary);
border-radius: toRem(4);
}

.calendarHeader {
padding: 1rem;
border-bottom: toRem(1) solid var(--g-colorBorder);
border-bottom: toRem(1) solid var(--g-colorBorderSecondary);
}

table:global(.react-aria-CalendarGrid) {
Expand Down Expand Up @@ -114,7 +114,7 @@

:global(.react-aria-CalendarLegend) {
padding: toRem(20);
border-top: toRem(1) solid var(--g-colorBorder);
border-top: toRem(1) solid var(--g-colorBorderSecondary);

:global(.react-aria-CalendarLegendMarker) {
width: toRem(16);
Expand Down
2 changes: 1 addition & 1 deletion src/components/Common/UI/Card/Card.module.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.cardContainer {
border: 1px solid var(--g-colorBorder);
border: 1px solid var(--g-colorBorderSecondary);
border-radius: var(--g-cardRadius);
padding: toRem(20);
margin-bottom: 1rem;
Expand Down
10 changes: 8 additions & 2 deletions src/components/Common/UI/Checkbox/Checkbox.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
justify-content: center;
width: 100%;
height: 100%;
border: 1px solid var(--g-colorBodySubContent);
border: 1px solid var(--g-inputBorderColor);
border-radius: toRem(6);
transition: all var(--g-transitionDuration);
pointer-events: none;
Expand Down Expand Up @@ -64,10 +64,16 @@

&:disabled + .checkbox {
cursor: not-allowed;
border-color: var(--g-colorBodyAccent);
border-color: var(--g-inputBorderColor);
background-color: var(--g-colorBodyAccent);
}

&:disabled:checked + .checkbox {
background: var(--g-colorBodyAccent);
& .check {
color: var(--g-colorSecondaryContent);
fill: var(--g-colorSecondaryContent);
opacity: 0.5;
}
}
}
7 changes: 3 additions & 4 deletions src/components/Common/UI/DatePicker/DatePicker.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@

&[data-placeholder] {
color: var(--g-inputPlaceholderColor);
font-style: italic;
}

&[data-hovered] {
Expand Down Expand Up @@ -130,13 +129,13 @@
}

:global(.calendar-wrapper) {
border: toRem(1) solid var(--g-colorBorder);
border: toRem(1) solid var(--g-colorBorderSecondary);
border-radius: toRem(4);
}

:global(.calendar-header) {
padding: 1rem;
border-bottom: toRem(1) solid var(--g-colorBorder);
border-bottom: toRem(1) solid var(--g-colorBorderSecondary);
}

:global(table.react-aria-CalendarGrid) {
Expand Down Expand Up @@ -226,7 +225,7 @@
}

:global(.react-aria-CalendarGridHeader) {
border-bottom: 1px solid var(--g-colorBorder);
border-bottom: 1px solid var(--g-colorBorderSecondary);

th {
padding-bottom: 8px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
&:not(:last-child) {
padding-bottom: toRem(20);
margin-bottom: toRem(20);
border-bottom: 1px solid var(--g-colorBorder);
border-bottom: 1px solid var(--g-colorBorderSecondary);
}
}
}
2 changes: 1 addition & 1 deletion src/components/Common/UI/FileInput/FileInput.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
svg {
width: toRem(40);
height: toRem(40);
color: var(--g-colorPrimaryAccent);
color: var(--g-colorSecondaryContent);
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/components/Common/UI/Modal/Modal.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

.modal {
background-color: var(--g-colorBody);
border: 1px solid var(--g-colorBorder);
border: 1px solid var(--g-colorBorderSecondary);
border-radius: var(--g-buttonRadius);
box-shadow: var(--g-shadowTopmost);
max-width: toRem(544);
Expand Down Expand Up @@ -103,6 +103,6 @@
flex: 0 0 auto;
background-color: var(--g-colorBody);
box-shadow:
0 toRem(-1) 0 0 var(--g-colorBorder),
0 toRem(-1) 0 0 var(--g-colorBorderSecondary),
0 toRem(-8) toRem(16) 0 rgba(0, 0, 0, 0.08);
}
9 changes: 5 additions & 4 deletions src/components/Common/UI/Radio/Radio.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,22 @@
justify-content: center;
width: 100%;
height: 100%;
border: 1px solid var(--g-colorBodySubContent);
border: 1px solid var(--g-inputBorderColor);
border-radius: toRem(10);
transition: all var(--g-transitionDuration);
pointer-events: none;

&.checked {
border-color: var(--g-colorPrimary);
background-color: var(--g-colorPrimary);
}
}

.radioDot {
width: toRem(10);
height: toRem(10);
width: toRem(8);
height: toRem(8);
border-radius: toRem(5);
background-color: var(--g-colorPrimary);
background-color: var(--g-colorPrimaryContent);
}

.radioInput {
Expand Down
10 changes: 5 additions & 5 deletions src/components/Common/UI/Table/Table.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

:global(.react-aria-Table) {
background: var(--g-colorBody);
border: 1px solid var(--g-colorBorder);
border: 1px solid var(--g-colorBorderSecondary);
outline: none;
border-spacing: 0;
min-height: 100px;
Expand All @@ -26,7 +26,7 @@
font-size: var(--g-fontSizeExtraSmall);
background-color: var(--g-colorBodyAccent);
color: var(--g-colorBodySubContent);
border-bottom: 1px solid var(--g-colorBorder);
border-bottom: 1px solid var(--g-colorBorderSecondary);

&:first-child {
border-top-left-radius: toRem(12);
Expand All @@ -45,7 +45,7 @@
}

& tr:last-child .react-aria-Column {
border-bottom: 1px solid var(--g-colorBorder);
border-bottom: 1px solid var(--g-colorBorderSecondary);
cursor: default;
}
}
Expand All @@ -62,7 +62,7 @@
}

&[data-footer='true'] {
border-top: 1px solid var(--g-colorBorder);
border-top: 1px solid var(--g-colorBorderSecondary);
}

&[data-focus-visible] {
Expand Down Expand Up @@ -132,7 +132,7 @@
:global(.react-aria-Cell) {
padding: toRem(14) toRem(16);
transform: translateZ(0);
border-bottom: 1px solid var(--g-colorBorder);
border-bottom: 1px solid var(--g-colorBorderSecondary);

&[role='rowheader'] {
color: var(--g-colorBodyContent);
Expand Down
2 changes: 1 addition & 1 deletion src/components/Common/UI/Tabs/Tabs.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
:global(.react-aria-TabList) {
display: flex;
gap: Helpers.toRem(4);
border-bottom: 1px solid var(--g-colorBorder);
border-bottom: 1px solid var(--g-colorBorderSecondary);
margin-bottom: Helpers.toRem(24);
}

Expand Down
4 changes: 2 additions & 2 deletions src/components/Common/UI/Tabs/Tabs.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ export const ComplexContent = () => {
key={index}
style={{
padding: '12px',
border: '1px solid var(--g-colorBorder)',
border: '1px solid var(--g-colorBorderSecondary)',
borderRadius: '4px',
display: 'flex',
justifyContent: 'space-between',
Expand Down Expand Up @@ -234,7 +234,7 @@ export const ComplexContent = () => {
<div
style={{
padding: '12px',
border: '1px solid var(--g-colorBorder)',
border: '1px solid var(--g-colorBorderSecondary)',
borderRadius: '4px',
display: 'flex',
justifyContent: 'space-between',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.receiptCard {
background: var(--g-colorBody);
border: 1px solid var(--g-colorBorder);
border: 1px solid var(--g-colorBorderSecondary);
border-radius: var(--g-inputRadius);
padding: toRem(24);
width: 100%;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.switchFieldContainer {
border: 1px solid var(--g-colorBorder);
border: 1px solid var(--g-colorBorderSecondary);
border-radius: var(--g-cardRadius);
padding: toRem(20);
background-color: var(--g-colorBody);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
display: flex;
justify-content: center;
align-items: center;
border: 1px solid var(--g-colorBorder);
border: 1px solid var(--g-colorBorderSecondary);
border-radius: toRem(8);
min-height: toRem(410);
height: 100%;
}

.coinHandsIconContainer {
border: 1px solid var(--g-colorBorder);
border: 1px solid var(--g-colorBorderSecondary);
border-radius: toRem(8);
padding: toRem(8);
}
Expand All @@ -20,5 +20,5 @@

.addDeductionButton {
display: flex;
border-color: var(--g-colorBorder);
border-color: var(--g-colorBorderSecondary);
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.switchFieldContainer {
border: 1px solid var(--g-colorBorder);
border: 1px solid var(--g-colorBorderSecondary);
border-radius: var(--g-cardRadius);
padding: toRem(20);
background-color: var(--g-colorBody);
Expand Down
Loading