IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Web:Common:Fix accent color theme.

Browse Source
This commit is contained in:
Vlada Gazizova 2022-11-14 15:51:53 +03:00
parent e3d4457324
commit 2636ec0705
26 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/common/components/Article/sub-components/article-hide-menu-button.js
View File

@ -42,7 +42,7 @@ const StyledHideArticleMenuButton = styled.div`
.article-hide-menu-text {
margin-left: 8px;
color: ${({ currentColorScheme }) => currentColorScheme.accentColor};
color: ${({ currentColorScheme }) => currentColorScheme.main.accent};
}
@media ${tablet} {
@ -75,7 +75,7 @@ const StyledHideArticleMenuButton = styled.div`
svg {
path {
fill: ${({ currentColorScheme }) => currentColorScheme.accentColor};
fill: ${({ currentColorScheme }) => currentColorScheme.main.accent};
}
}
}

8
packages/common/components/ColorTheme/styled/badge.js
View File

@ -24,7 +24,7 @@ const getDefaultStyles = ({
? "#444444"
: isPaidBadge || $currentColorScheme.id < 7
? theme.badge.color
: $currentColorScheme.textColor} !important;
: $currentColorScheme.text.accent} !important;
}
${StyledInner} {
@ -32,14 +32,14 @@ const getDefaultStyles = ({
? backgroundColor
: $currentColorScheme.id === 7 && !theme.isBase
? "#ECEEF1"
: $currentColorScheme.accentColor};
: $currentColorScheme.main.accent};
&:hover {
background-color: ${backgroundColor
? backgroundColor
: $currentColorScheme.id === 7 && !theme.isBase
? "#ECEEF1"
: $currentColorScheme.accentColor};
: $currentColorScheme.main.accent};
}
}
@ -48,7 +48,7 @@ const getDefaultStyles = ({
? backgroundColor
: $currentColorScheme.id === 7 && !theme.isBase
? "#ECEEF1"
: $currentColorScheme.accentColor};
: $currentColorScheme.main.accent};
}
`;

4
packages/common/components/ColorTheme/styled/calendar.js
View File

@ -5,10 +5,10 @@ const getDefaultStyles = ({ $currentColorScheme, color }) =>
$currentColorScheme &&
css`
.calendar-month_selected-day {
background-color: ${color ? color : $currentColorScheme.accentColor};
background-color: ${color ? color : $currentColorScheme.main.accent};
color: ${$currentColorScheme.id > 7 && $currentColorScheme.textColor};
&:hover {
background-color: ${color ? color : $currentColorScheme.accentColor};
background-color: ${color ? color : $currentColorScheme.main.accent};
color: ${$currentColorScheme.id > 7 && $currentColorScheme.textColor};
}
}

10
packages/common/components/ColorTheme/styled/catalogItem.js
View File

@ -12,10 +12,10 @@ const getDefaultStyles = ({ $currentColorScheme, isActive, theme }) =>
$currentColorScheme &&
css`
${StyledCatalogItemText} {
color: ${isActive && theme.isBase && $currentColorScheme.accentColor};
color: ${isActive && theme.isBase && $currentColorScheme.main.accent};
&:hover {
color: ${isActive && theme.isBase && $currentColorScheme.accentColor};
color: ${isActive && theme.isBase && $currentColorScheme.main.accent};
}
}
@ -24,12 +24,12 @@ const getDefaultStyles = ({ $currentColorScheme, isActive, theme }) =>
path {
fill: ${isActive &&
theme.isBase &&
$currentColorScheme.accentColor} !important;
$currentColorScheme.main.accent} !important;
}
circle {
fill: ${isActive &&
theme.isBase &&
$currentColorScheme.accentColor} !important;
$currentColorScheme.main.accent} !important;
}
}
@ -38,7 +38,7 @@ const getDefaultStyles = ({ $currentColorScheme, isActive, theme }) =>
path {
fill: ${isActive &&
theme.isBase &&
$currentColorScheme.accentColor} !important;
$currentColorScheme.main.accent} !important;
}
}
}

4
packages/common/components/ColorTheme/styled/comboButton.js
View File

@ -7,13 +7,13 @@ const getDefaultStyles = ({ $currentColorScheme, isOpen, theme }) =>
css`
border-color: ${isOpen &&
(theme.isBase
? $currentColorScheme.accentColor
? $currentColorScheme.main.accent
: theme.comboBox.button.openBorderColor)};
:focus {
border-color: ${isOpen &&
(theme.isBase
? $currentColorScheme.accentColor
? $currentColorScheme.main.accent
: theme.comboBox.button.hoverBorderColor)};
}
`;

8
packages/common/components/ColorTheme/styled/filterBlockItemTag.js
View File

@ -6,15 +6,15 @@ const getDefaultStyles = ({ $currentColorScheme, isSelected, theme }) =>
$currentColorScheme &&
isSelected &&
css`
background: ${$currentColorScheme.accentColor};
border-color: ${$currentColorScheme.accentColor};
background: ${$currentColorScheme.main.accent};
border-color: ${$currentColorScheme.main.accent};
p {
color: ${$currentColorScheme.id > 7 && $currentColorScheme.textColor};
}
&:hover {
background: ${$currentColorScheme.accentColor};
border-color: ${$currentColorScheme.accentColor};
background: ${$currentColorScheme.main.accent};
border-color: ${$currentColorScheme.main.accent};
}
`;

4
packages/common/components/ColorTheme/styled/floatingButton.js
View File

@ -16,10 +16,10 @@ const getDefaultStyles = ({
}) =>
$currentColorScheme &&
css`
background: ${color ? color : $currentColorScheme.accentColor} !important;
background: ${color ? color : $currentColorScheme.main.accent} !important;
${StyledFloatingButton} {
background: ${color ? color : $currentColorScheme.accentColor} !important;
background: ${color ? color : $currentColorScheme.main.accent} !important;
}
${IconBox} {

4
packages/common/components/ColorTheme/styled/iconButton.js
View File

@ -18,14 +18,14 @@ const getDefaultStyles = ({
path {
fill: ${(shared || locked || isFavorite || isEditing) &&
theme.isBase &&
$currentColorScheme.accentColor};
$currentColorScheme.main.accent};
}
}
&:hover {
svg {
path {
fill: ${theme.isBase && $currentColorScheme.accentColor};
fill: ${theme.isBase && $currentColorScheme.main.accent};
}
}
}

4
packages/common/components/ColorTheme/styled/iconButtonPin.js
View File

@ -9,14 +9,14 @@ const getDefaultStyles = ({ $currentColorScheme, theme }) =>
${commonIconsStyles}
svg {
path {
fill: ${theme.isBase && $currentColorScheme.accentColor};
fill: ${theme.isBase && $currentColorScheme.main.accent};
}
}
&:hover {
svg {
path {
fill: ${theme.isBase && $currentColorScheme.accentColor};
fill: ${theme.isBase && $currentColorScheme.main.accent};
}
}
}

2
packages/common/components/ColorTheme/styled/iconWrapper.js
View File

@ -6,7 +6,7 @@ const getDefaultStyles = ({ $currentColorScheme }) =>
css`
svg {
path:nth-child(2) {
fill: ${$currentColorScheme.accentColor};
fill: ${$currentColorScheme.main.accent};
}
`;

4
packages/common/components/ColorTheme/styled/indicatorFilterButton.js
View File

@ -4,10 +4,10 @@ import StyledIndicator from "@docspace/common/components/FilterInput/sub-compone
const getDefaultStyles = ({ $currentColorScheme }) =>
$currentColorScheme &&
css`
background: ${$currentColorScheme.accentColor};
background: ${$currentColorScheme.main.accent};
&:hover {
background: ${$currentColorScheme.accentColor};
background: ${$currentColorScheme.main.accent};
}
`;

4
packages/common/components/ColorTheme/styled/indicatorLoader.js
View File

@ -5,10 +5,10 @@ const getDefaultStyles = ({ $currentColorScheme }) =>
$currentColorScheme &&
css`
#ipl-progress-indicator {
background-color: ${$currentColorScheme.accentColor};
background-color: ${$currentColorScheme.main.accent};
&:hover {
background-color: ${$currentColorScheme.accentColor};
background-color: ${$currentColorScheme.main.accent};
}
}
`;

2
packages/common/components/ColorTheme/styled/infoPanelToggle.js
View File

@ -8,7 +8,7 @@ const getDefaultStyles = ({ $currentColorScheme, theme }) =>
.info-panel-toggle-bg {
path {
fill: ${theme.isBase
? $currentColorScheme.accentColor
? $currentColorScheme.main.accent
: theme.infoPanel.sectionHeaderToggleIconActive};
}
}

2
packages/common/components/ColorTheme/styled/inputBlock.js
View File

@ -9,7 +9,7 @@ const getDefaultStyles = ({ $currentColorScheme, hasError, theme }) =>
:focus-within {
border-color: ${(hasError && theme.input.focusErrorBorderColor) ||
(theme.isBase
? $currentColorScheme.accentColor
? $currentColorScheme.main.accent
: theme.inputBlock.borderColor)};
}
`;

4
packages/common/components/ColorTheme/styled/link.js
View File

@ -4,10 +4,10 @@ import StyledText from "@docspace/components/link/styled-link";
const getDefaultStyles = ({ $currentColorScheme, noHover }) =>
$currentColorScheme &&
css`
color: ${$currentColorScheme.accentColor};
color: ${$currentColorScheme.main.accent};
&:hover {
color: ${!noHover && $currentColorScheme.accentColor};
color: ${!noHover && $currentColorScheme.main.accent};
text-decoration: underline;
}
`;

2
packages/common/components/ColorTheme/styled/linkForgotPassword.js
View File

@ -5,7 +5,7 @@ const getDefaultStyles = ({ $currentColorScheme }) =>
$currentColorScheme &&
css`
.login-link {
color: ${$currentColorScheme.accentColor};
color: ${$currentColorScheme.main.accent};
}
`;

4
packages/common/components/ColorTheme/styled/loadingButton.js
View File

@ -12,14 +12,14 @@ const getDefaultStyles = ({ $currentColorScheme, theme }) =>
${StyledCircle} {
.circle__mask .circle__fill {
background-color: ${theme.isBase
? $currentColorScheme.accentColor
? $currentColorScheme.main.accent
: theme.filesPanels.upload.loadingButton.color};
}
}
${StyledLoadingButton} {
color: ${theme.isBase
? $currentColorScheme.accentColor
? $currentColorScheme.main.accent
: theme.filesPanels.upload.loadingButton.color};
}
`;

6
packages/common/components/ColorTheme/styled/mainButton.js
View File

@ -20,16 +20,16 @@ const disableStyles = css`
const getDefaultStyles = ({ $currentColorScheme, isDisabled, theme }) =>
$currentColorScheme &&
css`
background-color: ${$currentColorScheme.accentColor};
background-color: ${$currentColorScheme.main.accent};
&:hover {
background-color: ${$currentColorScheme.accentColor};
background-color: ${$currentColorScheme.main.accent};
opacity: 0.85;
cursor: pointer;
}
&:active {
background-color: ${$currentColorScheme.accentColor};
background-color: ${$currentColorScheme.main.accent};
opacity: 1;
filter: ${theme.isBase ? "brightness(90%)" : "brightness(82%)"};
cursor: pointer;

6
packages/common/components/ColorTheme/styled/slider.js
View File

@ -11,11 +11,11 @@ const getDefaultStyles = ({
css`
background-image: ${withPouring &&
((theme.isBase &&
`linear-gradient( ${$currentColorScheme.accentColor}, ${$currentColorScheme.accentColor})`) ||
`linear-gradient( ${$currentColorScheme.main.accent}, ${$currentColorScheme.main.accent})`) ||
(!theme.isBase && `linear-gradient(#FFFFFF, #FFFFFF)`))};
&::-webkit-slider-thumb {
background: ${(theme.isBase && $currentColorScheme.accentColor) ||
background: ${(theme.isBase && $currentColorScheme.main.accent) ||
(!theme.isBase && "#FFFFFF")};
box-shadow: ${!theme.isBase &&
"0px 3px 12px rgba(0, 0, 0, 0.25); !important"};
@ -24,7 +24,7 @@ const getDefaultStyles = ({
&:hover {
background-image: ${withPouring &&
((theme.isBase &&
`linear-gradient( ${$currentColorScheme.accentColor}, ${$currentColorScheme.accentColor})`) ||
`linear-gradient( ${$currentColorScheme.main.accent}, ${$currentColorScheme.main.accent})`) ||
(!theme.isBase && `linear-gradient(#FFFFFF, #FFFFFF)`))};
}

4
packages/common/components/ColorTheme/styled/submenuItemLabel.js
View File

@ -5,10 +5,10 @@ import { StyledSubmenuItemLabel } from "@docspace/components/submenu/styled-subm
const getDefaultStyles = ({ $currentColorScheme, isActive }) =>
$currentColorScheme &&
css`
background-color: ${isActive ? $currentColorScheme.accentColor : "none"};
background-color: ${isActive ? $currentColorScheme.main.accent : "none"};
&:hover {
background-color: ${isActive && $currentColorScheme.accentColor};
background-color: ${isActive && $currentColorScheme.main.accent};
}
`;

4
packages/common/components/ColorTheme/styled/submenuText.js
View File

@ -7,12 +7,12 @@ const getDefaultStyles = ({ $currentColorScheme, isActive, theme }) =>
css`
color: ${isActive &&
theme.isBase &&
$currentColorScheme.accentColor} !important;
$currentColorScheme.main.accent} !important;
&:hover {
color: ${isActive &&
theme.isBase &&
$currentColorScheme.accentColor} !important;
$currentColorScheme.main.accent} !important;
}
`;

2
packages/common/components/ColorTheme/styled/tabsContainer.js
View File

@ -7,7 +7,7 @@ const getDefaultStyles = ({ $currentColorScheme, selected, theme }) =>
css`
background-color: ${selected &&
theme.isBase &&
$currentColorScheme.accentColor} !important;
$currentColorScheme.main.accent} !important;
.title_style {
color: ${$currentColorScheme.id > 7 &&

2
packages/common/components/ColorTheme/styled/textInput.js
View File

@ -16,7 +16,7 @@ const getDefaultStyles = ({
(hasWarning && theme.input.focusWarningBorderColor) ||
(isDisabled && theme.input.focusDisabledBorderColor) ||
(theme.isBase
? $currentColorScheme.accentColor
? $currentColorScheme.main.accent
: theme.input.focusBorderColor)};
}
`;

2
packages/common/components/ColorTheme/styled/textarea.js
View File

@ -9,7 +9,7 @@ const getDefaultStyles = ({ $currentColorScheme, hasError, theme }) =>
border-color: ${hasError
? theme.textArea.focusErrorBorderColor
: theme.isBase
? $currentColorScheme.accentColor
? $currentColorScheme.main.accent
: theme.textArea.focusBorderColor};
}
`;

2
packages/common/components/ColorTheme/styled/toggleButton.js
View File

@ -15,7 +15,7 @@ const getDefaultStyles = ({
${ToggleButtonContainer} {
svg {
rect {
fill: ${isChecked && $currentColorScheme.accentColor};
fill: ${isChecked && $currentColorScheme.main.accent};
}
circle {

4
packages/common/components/ColorTheme/styled/versionBadge.js
View File

@ -10,13 +10,13 @@ const getDefaultStyles = ({ $currentColorScheme, $isVersion, theme, index }) =>
? theme.filesVersionHistory.badge.defaultFill
: index === 0
? theme.filesVersionHistory.badge.fill
: $currentColorScheme.accentColor};
: $currentColorScheme.main.accent};
stroke: ${!$isVersion
? theme.filesVersionHistory.badge.stroke
: index === 0
? theme.filesVersionHistory.badge.fill
: $currentColorScheme.accentColor};
: $currentColorScheme.main.accent};
}
}