Skip to content
This repository has been archived by the owner on Nov 14, 2023. It is now read-only.

refactor: replace color #292

Merged
merged 3 commits into from
Aug 24, 2023
Merged

refactor: replace color #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fbe5eac
refactor: modify base color
Aug 7, 2023
539761f
modify color
Aug 14, 2023
55eeea8
fix: nav link color
Aug 24, 2023
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
6 changes: 5 additions & 1 deletion src/components/RangePicker/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,15 @@
min-width: 366px;
width: auto;
& > input {
color: $text-1;
text-align: center;
border-style: none;
&:focus {
outline: 0;
}
&::placeholder {
color: $text-4;
}
}
&__duration {
border-bottom: 1px solid $border-2;
Expand All @@ -21,7 +25,7 @@
}
&-calendar{
vertical-align: text-top;
fill: $icon-2;
fill: $icon-3;
}
&:hover span.icon-close-line {
visibility: visible;
Expand Down
4 changes: 3 additions & 1 deletion src/components/Tabs/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
@import '../../style/variables.scss';

$tab-bg: $grey-3;
$tab-bg-hover: $grey-5;

.Tabs--right {
flex-grow: 1;
& > #Tabs{
Expand Down Expand Up @@ -151,7 +154,6 @@
font-size: $font-size-14;
height: 34px;
& > a {
color: $text-3;
border-radius: 0;
padding: 8px 10px;
}
Expand Down
4 changes: 4 additions & 0 deletions src/components/TimePicker/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@
.rc-time-picker-input {
height: 34px;
font-size: $font-size-14;
color: $text-1;
&::placeholder {
color: $text-4;
}
}

.rc-time-picker-panel-inner:not(.rc-calendar-time-picker-panel > .rc-time-picker-panel-inner) {
Expand Down
196 changes: 98 additions & 98 deletions src/style/bootstrap-custom.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@

// scss-docs-start gray-color-variables
$white: #fff !default;
$gray-100: #f8f9fa !default;
$gray-200: #e9ecef !default;
$gray-300: #dee2e6 !default;
$gray-400: #ced4da !default;
$gray-500: #adb5bd !default;
$gray-600: #6c757d !default;
$gray-700: #495057 !default;
$gray-800: #343a40 !default;
$gray-900: #212529 !default;
$gray-100: $grey-2 !default;
$gray-200: $grey-3 !default;
$gray-300: $grey-4 !default;
$gray-400: $grey-5 !default;
$gray-500: $grey-6 !default;
$gray-600: $grey-7 !default;
$gray-700: $grey-8 !default;
$gray-800: $grey-9 !default;
$gray-900: $grey-10 !default;
$black: #000 !default;
// scss-docs-end gray-color-variables

Expand All @@ -38,16 +38,16 @@ $grays: (
// fusv-enable

// scss-docs-start color-variables
$blue: #0d6efd !default;
$blue: $blue-6 !default;
$indigo: #6610f2 !default;
$purple: #6f42c1 !default;
$purple: $purple-6 !default;
$pink: #d63384 !default;
$red: #dc3545 !default;
$orange: #fd7e14 !default;
$yellow: #ffc107 !default;
$green: #198754 !default;
$teal: #20c997 !default;
$cyan: #0dcaf0 !default;
$red: $red-6 !default;
$orange: $orange-6 !default;
$yellow: $yellow-6 !default;
$green: $green-6 !default;
$teal: $olivine-6 !default;
$cyan: $azure-6 !default;
// scss-docs-end color-variables

// scss-docs-start colors-map
Expand All @@ -64,8 +64,8 @@ $colors: (
"cyan": $cyan,
"black": $black,
"white": $white,
"gray": $gray-600,
"gray-dark": $gray-800
"gray": $grey-6,
"gray-dark": $grey-8
) !default;
// scss-docs-end colors-map

Expand All @@ -78,15 +78,15 @@ $color-contrast-dark: $black !default;
$color-contrast-light: $white !default;

// fusv-disable
$blue-100: tint-color($blue, 80%) !default;
$blue-200: tint-color($blue, 60%) !default;
$blue-300: tint-color($blue, 40%) !default;
$blue-400: tint-color($blue, 20%) !default;
$blue-100: $blue-2 !default;
$blue-200: $blue-3 !default;
$blue-300: $blue-4 !default;
$blue-400: $blue-5 !default;
$blue-500: $blue !default;
$blue-600: shade-color($blue, 20%) !default;
$blue-700: shade-color($blue, 40%) !default;
$blue-800: shade-color($blue, 60%) !default;
$blue-900: shade-color($blue, 80%) !default;
$blue-600: $blue-7 !default;
$blue-700: $blue-8 !default;
$blue-800: $blue-9 !default;
$blue-900: $blue-10 !default;

$indigo-100: tint-color($indigo, 80%) !default;
$indigo-200: tint-color($indigo, 60%) !default;
Expand All @@ -98,15 +98,15 @@ $indigo-700: shade-color($indigo, 40%) !default;
$indigo-800: shade-color($indigo, 60%) !default;
$indigo-900: shade-color($indigo, 80%) !default;

$purple-100: tint-color($purple, 80%) !default;
$purple-200: tint-color($purple, 60%) !default;
$purple-300: tint-color($purple, 40%) !default;
$purple-400: tint-color($purple, 20%) !default;
$purple-100: $purple-2 !default;
$purple-200: $purple-3 !default;
$purple-300: $purple-4 !default;
$purple-400: $purple-5 !default;
$purple-500: $purple !default;
$purple-600: shade-color($purple, 20%) !default;
$purple-700: shade-color($purple, 40%) !default;
$purple-800: shade-color($purple, 60%) !default;
$purple-900: shade-color($purple, 80%) !default;
$purple-600: $purple-7 !default;
$purple-700: $purple-8 !default;
$purple-800: $purple-9 !default;
$purple-900: $purple-10 !default;

$pink-100: tint-color($pink, 80%) !default;
$pink-200: tint-color($pink, 60%) !default;
Expand All @@ -118,65 +118,65 @@ $pink-700: shade-color($pink, 40%) !default;
$pink-800: shade-color($pink, 60%) !default;
$pink-900: shade-color($pink, 80%) !default;

$red-100: tint-color($red, 80%) !default;
$red-200: tint-color($red, 60%) !default;
$red-300: tint-color($red, 40%) !default;
$red-400: tint-color($red, 20%) !default;
$red-100: $red-2 !default;
$red-200: $red-3 !default;
$red-300: $red-4 !default;
$red-400: $red-5 !default;
$red-500: $red !default;
$red-600: shade-color($red, 20%) !default;
$red-700: shade-color($red, 40%) !default;
$red-800: shade-color($red, 60%) !default;
$red-900: shade-color($red, 80%) !default;

$orange-100: tint-color($orange, 80%) !default;
$orange-200: tint-color($orange, 60%) !default;
$orange-300: tint-color($orange, 40%) !default;
$orange-400: tint-color($orange, 20%) !default;
$red-600: $red-7 !default;
$red-700: $red-8 !default;
$red-800: $red-9 !default;
$red-900: $red-10 !default;

$orange-100: $orange-2 !default;
$orange-200: $orange-3 !default;
$orange-300: $orange-4 !default;
$orange-400: $orange-5 !default;
$orange-500: $orange !default;
$orange-600: shade-color($orange, 20%) !default;
$orange-700: shade-color($orange, 40%) !default;
$orange-800: shade-color($orange, 60%) !default;
$orange-900: shade-color($orange, 80%) !default;

$yellow-100: tint-color($yellow, 80%) !default;
$yellow-200: tint-color($yellow, 60%) !default;
$yellow-300: tint-color($yellow, 40%) !default;
$yellow-400: tint-color($yellow, 20%) !default;
$orange-600: $orange-7 !default;
$orange-700: $orange-8 !default;
$orange-800: $orange-9 !default;
$orange-900: $orange-10 !default;

$yellow-100: $yellow-2 !default;
$yellow-200: $yellow-3 !default;
$yellow-300: $yellow-4 !default;
$yellow-400: $yellow-5 !default;
$yellow-500: $yellow !default;
$yellow-600: shade-color($yellow, 20%) !default;
$yellow-700: shade-color($yellow, 40%) !default;
$yellow-800: shade-color($yellow, 60%) !default;
$yellow-900: shade-color($yellow, 80%) !default;

$green-100: tint-color($green, 80%) !default;
$green-200: tint-color($green, 60%) !default;
$green-300: tint-color($green, 40%) !default;
$green-400: tint-color($green, 20%) !default;
$yellow-600: $yellow-7 !default;
$yellow-700: $yellow-8 !default;
$yellow-800: $yellow-9 !default;
$yellow-900: $yellow-10 !default;

$green-100: $green-2 !default;
$green-200: $green-3 !default;
$green-300: $green-4 !default;
$green-400: $green-5 !default;
$green-500: $green !default;
$green-600: shade-color($green, 20%) !default;
$green-700: shade-color($green, 40%) !default;
$green-800: shade-color($green, 60%) !default;
$green-900: shade-color($green, 80%) !default;

$teal-100: tint-color($teal, 80%) !default;
$teal-200: tint-color($teal, 60%) !default;
$teal-300: tint-color($teal, 40%) !default;
$teal-400: tint-color($teal, 20%) !default;
$green-600: $green-7 !default;
$green-700: $green-8 !default;
$green-800: $green-9 !default;
$green-900: $green-10 !default;

$teal-100: $olivine-2 !default;
$teal-200: $olivine-3 !default;
$teal-300: $olivine-4 !default;
$teal-400: $olivine-5 !default;
$teal-500: $teal !default;
$teal-600: shade-color($teal, 20%) !default;
$teal-700: shade-color($teal, 40%) !default;
$teal-800: shade-color($teal, 60%) !default;
$teal-900: shade-color($teal, 80%) !default;

$cyan-100: tint-color($cyan, 80%) !default;
$cyan-200: tint-color($cyan, 60%) !default;
$cyan-300: tint-color($cyan, 40%) !default;
$cyan-400: tint-color($cyan, 20%) !default;
$teal-600: $olivine-7 !default;
$teal-700: $olivine-8 !default;
$teal-800: $olivine-9 !default;
$teal-900: $olivine-10 !default;

$cyan-100: $azure-2 !default;
$cyan-200: $azure-3 !default;
$cyan-300: $azure-4 !default;
$cyan-400: $azure-5 !default;
$cyan-500: $cyan !default;
$cyan-600: shade-color($cyan, 20%) !default;
$cyan-700: shade-color($cyan, 40%) !default;
$cyan-800: shade-color($cyan, 60%) !default;
$cyan-900: shade-color($cyan, 80%) !default;
$cyan-600: $azure-7 !default;
$cyan-700: $azure-8 !default;
$cyan-800: $azure-9 !default;
$cyan-900: $azure-10 !default;

$blues: (
"blue-100": $blue-100,
Expand Down Expand Up @@ -846,7 +846,7 @@ $input-focus-color: $input-color !default;
$input-focus-width: $input-btn-focus-width !default;
$input-focus-box-shadow: $input-btn-focus-box-shadow !default;

$input-placeholder-color: $text-3 !default;
$input-placeholder-color: $text-4 !default;
$input-plaintext-color: $body-color !default;

$input-height-border: $input-border-width * 2 !default;
Expand Down Expand Up @@ -1071,7 +1071,7 @@ $nav-tabs-border-color: $gray-300 !default;
$nav-tabs-border-width: $border-width !default;
$nav-tabs-border-radius: $border-radius !default;
$nav-tabs-link-hover-border-color: $gray-200 $gray-200 $nav-tabs-border-color !default;
$nav-tabs-link-active-color: $gray-700 !default;
$nav-tabs-link-active-color: $text-2 !default;
$nav-tabs-link-active-bg: $body-bg !default;
$nav-tabs-link-active-border-color: $gray-300 $gray-300 $nav-tabs-link-active-bg !default;

Expand Down Expand Up @@ -1238,13 +1238,13 @@ $card-spacer-y: 16px !default;
$card-spacer-x: 24px !default;
$card-title-spacer-y: $spacer * .5 !default;
$card-border-width: 0 !default;
$card-border-color: #ddd !default;
$card-border-color: transparent !default;
$card-border-radius: $radius-4-card !default;
$card-box-shadow: $shadow-panel !default;
$card-inner-border-radius: subtract($card-border-radius, $card-border-width) !default;
$card-cap-padding-y: 16px !default;
$card-cap-padding-x: 24px !default;
$card-cap-bg: #f5f5f5 !default;
$card-cap-bg: $bg-2 !default;
$card-cap-color: null !default;
$card-height: null !default;
$card-color: $text-1 !default;
Expand All @@ -1261,7 +1261,7 @@ $accordion-padding-x: 22px !default;
$accordion-color: $body-color !default; // Sass variable because of $accordion-button-icon
$accordion-bg: $body-bg !default;
$accordion-border-width: $border-width !default;
$accordion-border-color: #ddd !default;
$accordion-border-color: $border-2 !default;
$accordion-border-radius: $border-radius !default;
$accordion-inner-border-radius: subtract($accordion-border-radius, $accordion-border-width) !default;

Expand All @@ -1271,9 +1271,9 @@ $accordion-body-padding-x: $accordion-padding-x !default;
$accordion-button-padding-y: $accordion-padding-y !default;
$accordion-button-padding-x: $accordion-padding-x !default;
$accordion-button-color: $accordion-color !default;
$accordion-button-bg: #f5f5f5 !default;
$accordion-button-bg: $bg-2 !default;
$accordion-transition: $btn-transition, border-radius .15s ease !default;
$accordion-button-active-bg: #f5f5f5 !default;
$accordion-button-active-bg: $bg-2 !default;
$accordion-button-active-color: $accordion-color !default;

$accordion-button-focus-border-color: $input-focus-border-color !default;
Expand All @@ -1295,7 +1295,7 @@ $accordion-button-active-icon: none !default;
$tooltip-font-size: $font-size-sm !default;
$tooltip-max-width: 200px !default;
$tooltip-color: $white !default;
$tooltip-bg: $tooltips-bg !default;
$tooltip-bg: $grey-12 !default;
$tooltip-border-radius: $border-radius !default;
$tooltip-opacity: .9 !default;
$tooltip-padding-y: $spacer * .25 !default;
Expand Down Expand Up @@ -1327,7 +1327,7 @@ $popover-font-size: $font-size-sm !default;
$popover-bg: $white !default;
$popover-max-width: 276px !default;
$popover-border-width: $border-width !default;
$popover-border-color: var(--#{$prefix}border-color-translucent) !default;
$popover-border-color: transparent !default;
$popover-border-radius: $radius-4-popover !default;
$popover-inner-border-radius: subtract($popover-border-radius, $popover-border-width) !default;
$popover-box-shadow: $shadow-popover !default;
Expand Down Expand Up @@ -1455,7 +1455,7 @@ $alert-dismissible-padding-r: $alert-padding-x * 3 !default; // 3x covers widt
// scss-docs-start progress-variables
$progress-height: 1rem !default;
$progress-font-size: $font-size-base * .75 !default;
$progress-bg: $grey-2 !default;
$progress-bg: $grey-3 !default;
$progress-border-radius: $border-radius !default;
$progress-box-shadow: $box-shadow-inset !default;
$progress-bar-color: $white !default;
Expand Down
7 changes: 7 additions & 0 deletions src/style/bootstrap.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@
appearance: auto !important;
}

.DatePicker input{
color: $text-1;
&::placeholder {
color: $text-4;
}
}

:root {
accent-color: $primary-normal;
}
Loading