Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
# Conflicts: # packages/asc-web-components/toast/styled-toastr.js
This commit is contained in:
commit
bd0679e4ba
@ -1,4 +1,3 @@
|
||||
import { isMobile } from "react-device-detect";
|
||||
import styled, { css } from "styled-components";
|
||||
import Base from "../themes/base";
|
||||
import { tablet } from "../utils/device";
|
||||
@ -42,7 +41,6 @@ const StyledDropdownItem = styled.div`
|
||||
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
|
||||
|
||||
.drop-down-item_icon {
|
||||
${isMobile && `margin: auto; text-align: center;`}
|
||||
path {
|
||||
fill: ${(props) =>
|
||||
props.disabled
|
||||
@ -103,6 +101,7 @@ StyledDropdownItem.defaultProps = { theme: Base };
|
||||
|
||||
const IconWrapper = styled.div`
|
||||
display: flex;
|
||||
align-items: center;
|
||||
width: ${(props) => props.theme.dropDownItem.icon.width};
|
||||
margin-right: ${(props) => props.theme.dropDownItem.icon.marginRight};
|
||||
line-height: ${(props) => props.theme.dropDownItem.icon.lineHeight};
|
||||
|
@ -2,7 +2,7 @@ import styled from "styled-components";
|
||||
import Base from "../themes/base";
|
||||
|
||||
const IconWrapper = styled.div`
|
||||
align-self: flex-start;
|
||||
align-self: start;
|
||||
display: flex;
|
||||
svg {
|
||||
width: ${(props) => props.theme.toastr.svg.width};
|
||||
|
@ -23,6 +23,9 @@ const StyledContainer = styled.div`
|
||||
|
||||
#customScrollBar {
|
||||
z-index: 0;
|
||||
> .scroll-body {
|
||||
-webkit-user-select: none;
|
||||
}
|
||||
}
|
||||
#articleScrollBar {
|
||||
> .scroll-body {
|
||||
|
Loading…
Reference in New Issue
Block a user