Skip to content

Commit

Permalink
version 8
Browse files Browse the repository at this point in the history
  • Loading branch information
roienatan committed Nov 16, 2023
1 parent ad764fc commit 43ff266
Show file tree
Hide file tree
Showing 12 changed files with 67 additions and 31 deletions.
32 changes: 16 additions & 16 deletions public/assets/images/floppy-disk.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/constants.scss
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ $sticky-info-shadow: rgba(0, 0, 0, 0.02);
$carousel-overlay-shadow: rgba(0, 26, 54, 0.4);
$shadow-1: rgba(79, 92, 105, 0.1);
$date-picker-arrow-color: #aeaeae;
$transparent: rgba(255, 255, 255, 0);

/* colors v2 */
$c-primary-100: #f4f6ff;
Expand Down
24 changes: 23 additions & 1 deletion src/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,37 @@
font-display: swap;
}

html {
background-color: var(--primary-background);
}

:root {
--page-extra-pr: 0px;
}

// Remove Arrows/Spinners from input type number
/* Chrome, Safari, Edge, Opera */
input::-webkit-outer-spin-button,
input::-webkit-inner-spin-button {
-webkit-appearance: none;
margin: 0;
}

/* Firefox */
input[type="number"] {
-moz-appearance: textfield;
}

// Disable highlight when Touch/Press for inputs
input:focus {
outline: $transparent;
}

body {
--safe-area-inset-bottom: 0;

// Disable highlight when Touch/Press
-webkit-tap-highlight-color: rgba(255, 255, 255, 0);
-webkit-tap-highlight-color: $transparent;
margin: 0;
font-family: PoppinsSans, sans-serif;
-webkit-font-smoothing: antialiased;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
padding: 1.25rem 0.625rem;
display: flex;
align-items: center;
background-color: $c-light-gray;
background-color: var(--secondary-background);
margin-top: 2.5rem;
}

Expand All @@ -14,13 +14,13 @@
}

.tableHead {
border-bottom: 1px solid $c-neutrals-200;
border-bottom: 1px solid var(--gentle-stroke);
padding: 0 1rem;
}

.tableBody {
padding: 0 1rem;
background-color: $white;
background-color: var(--tertiary-fill);
width: 100%;
}

Expand All @@ -31,6 +31,7 @@
font-size: $xsmall;
font-weight: 400;
padding-right: 1rem;
color: var(--primary-text);
}

.tableHeader:first-child {
Expand All @@ -41,14 +42,14 @@
.tableCell {
padding-top: 0.5rem;
padding-bottom: 0.375rem;
border-top: 0.0625rem solid $c-neutrals-200;
border-bottom: 0.0625rem solid $c-neutrals-200;
border-top: 0.0625rem solid var(--gentle-stroke);
border-bottom: 0.0625rem solid var(--gentle-stroke);
}

.tableCell:first-child {
padding-left: 0.5625rem;
width: 1.125rem;
border-left: 0.0625rem solid $c-neutrals-200;
border-left: 0.0625rem solid var(--gentle-stroke);
}

.goalCell {
Expand All @@ -60,7 +61,7 @@
}

.tableCell:last-child {
border-right: 0.0625rem solid $c-neutrals-200;
border-right: 0.0625rem solid var(--gentle-stroke);
}

.editIcon {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,27 @@ export const selectorStyles = (hasError: boolean, isDarkMode: boolean) => ({
menuPortal: (provided) => ({ ...provided, zIndex: 10000 }),
menuList: (provided) => ({
...provided,
backgroundColor: isDarkMode ? "#2e3452" : "#f8f8f5",
backgroundColor: isDarkMode ? "#131b23" : "#ffffff",
}),
control: (provided) => ({
...provided,
height: "3rem",
...(hasError && { borderColor: Colors.error }),
backgroundColor: isDarkMode ? "#2e3452" : "#f8f8f5",
color: isDarkMode ? "#ffffff" : "#001a36",
border: "none",
borderColor: "rgba(255, 255, 255, 0)",
boxShadow: "rgba(255, 255, 255, 0)",
"&:hover": {
boxShadow: "rgba(255, 255, 255, 0)",
},
}),
option: (provided) => ({
...provided,
backgroundColor: isDarkMode ? "#2e3452" : "#f8f8f5",
backgroundColor: isDarkMode ? "#131b23" : "#ffffff",
color: isDarkMode ? "#ffffff" : "#001a36",
"&:hover": {
backgroundColor: isDarkMode ? "#2e3452" : "#fff9fd",
},
}),
indicatorSeparator: () => ({ display: "none" }),
indicatorsContainer: (provided) => ({
Expand Down
1 change: 1 addition & 0 deletions src/shared/components/ButtonIcon/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
padding: 0;
background: transparent;
border: 0;
color: var(--primary-text);

&:hover {
cursor: pointer;
Expand Down
1 change: 0 additions & 1 deletion src/shared/components/Form/RadioButtonGroup/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
font-family: PoppinsSans, sans-serif;
font-weight: normal;
font-size: $xsmall;
color: $secondary-blue;
margin-bottom: 1rem;

.custom-radio-button-group__label {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@
margin-right: var(--item-image-mr);
color: var(--item-text-color);
}

.text {
color: $c-pink-primary;
}
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ const PlaceholderTreeItem: FC<PlaceholderTreeItemProps> = (props) => {
className={classNames(
treeItemTriggerStyles.name,
treeItemTriggerStylesFromContext?.name,
styles.text,
)}
title={name}
>
Expand Down
2 changes: 1 addition & 1 deletion src/shared/ui-kit/Loader/Loader.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@
display: flex;
justify-content: center;
align-items: center;
background-color: $c-shades-white;
background-color: var(--secondary-background);
border-radius: 1rem;
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
}

&:focus {
border-color: $c-pink-active-feed-cards;
outline: $transparent;
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "../../../../../../../constants";

.link {
color: $c-primary-500;
color: var(--secondary-text);
}

0 comments on commit 43ff266

Please sign in to comment.