Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0
This commit is contained in:
commit
4d090c4873
@ -25,7 +25,6 @@ const StyledSsoPage = styled.div`
|
||||
display: flex;
|
||||
.toggle-caption_title_badge {
|
||||
margin-left: 4px;
|
||||
margin-top: -3px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -26,6 +26,11 @@ const StyledButton = styled.div`
|
||||
|
||||
&:hover {
|
||||
border: ${(props) => props.theme.filterInput.button.hoverBorder};
|
||||
svg {
|
||||
path {
|
||||
fill: ${(props) => props.theme.iconButton.hoverColor};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
div {
|
||||
|
@ -96,6 +96,14 @@ const StyledComboButton = styled.div`
|
||||
`
|
||||
border-color: ${props.theme.comboBox.button.hoverDisabledBorderColor};
|
||||
`}
|
||||
|
||||
.optionalBlock {
|
||||
svg {
|
||||
path {
|
||||
fill: ${(props) => props.theme.iconButton.hoverColor};
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.combo-button-label {
|
||||
margin-right: ${(props) =>
|
||||
@ -124,6 +132,14 @@ const StyledComboButton = styled.div`
|
||||
props.isOpen
|
||||
? props.theme.comboBox.button.hoverBorderColorOpen
|
||||
: props.theme.comboBox.button.hoverBorderColor};
|
||||
|
||||
.optionalBlock {
|
||||
svg {
|
||||
path {
|
||||
fill: ${(props) => props.theme.iconButton.hoverColor};
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
`;
|
||||
StyledComboButton.defaultProps = { theme: Base };
|
||||
|
@ -9,6 +9,12 @@ const StyledScrollbar = styled(Scrollbars)`
|
||||
? props.color
|
||||
: props.theme.scrollbar.backgroundColorVertical};
|
||||
z-index: 201;
|
||||
|
||||
:hover,
|
||||
:active {
|
||||
background-color: ${(props) =>
|
||||
props.theme.scrollbar.hoverBackgroundColorVertical};
|
||||
}
|
||||
}
|
||||
.nav-thumb-horizontal {
|
||||
background-color: ${(props) =>
|
||||
@ -16,11 +22,6 @@ const StyledScrollbar = styled(Scrollbars)`
|
||||
? props.color
|
||||
: props.theme.scrollbar.backgroundColorHorizontal};
|
||||
}
|
||||
|
||||
.nav-thumb-vertical:hover {
|
||||
background-color: ${(props) =>
|
||||
props.theme.scrollbar.hoverBackgroundColorVertical};
|
||||
}
|
||||
`;
|
||||
|
||||
StyledScrollbar.defaultProps = {
|
||||
|
@ -570,9 +570,9 @@ const Base = {
|
||||
},
|
||||
|
||||
scrollbar: {
|
||||
backgroundColorVertical: "rgba(208, 213, 218, 1)",
|
||||
backgroundColorVertical: "rgba(0, 0, 0, 0.1)",
|
||||
backgroundColorHorizontal: "rgba(0, 0, 0, 0.1)",
|
||||
hoverBackgroundColorVertical: "rgba(163, 169, 174, 1)",
|
||||
hoverBackgroundColorVertical: grayMid,
|
||||
},
|
||||
|
||||
modalDialog: {
|
||||
|
@ -563,9 +563,9 @@ const Dark = {
|
||||
},
|
||||
|
||||
scrollbar: {
|
||||
backgroundColorVertical: "rgba(208, 213, 218, 1)",
|
||||
backgroundColorHorizontal: "rgba(0, 0, 0, 0.1)",
|
||||
hoverBackgroundColorVertical: "rgba(163, 169, 174, 1)",
|
||||
backgroundColorVertical: "rgba(255, 255, 255, 0.1)",
|
||||
backgroundColorHorizontal: "rgba(255, 255, 255, 0.1)",
|
||||
hoverBackgroundColorVertical: "#ADADAD",
|
||||
},
|
||||
|
||||
modalDialog: {
|
||||
|
@ -84,6 +84,11 @@ const IconWrapper = styled.div`
|
||||
border: 1px solid
|
||||
${(props) => props.theme.viewSelector.hoverBorderColor};
|
||||
`}
|
||||
svg {
|
||||
path {
|
||||
fill: ${(props) => props.theme.iconButton.hoverColor};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
& > div {
|
||||
|
Loading…
Reference in New Issue
Block a user