Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Style editing and selector

Browse source
This commit is contained in:
ShimaginAndrey 2021-06-09 17:26:36 +03:00
parent 15160e4f95
commit 4c3323f12e
4 changed files with 44 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/common/mobile/resources/less/common-ios.less
View file

@ -148,6 +148,19 @@
} }
} }
.simple-list li:after, .links-list a:after, .list .item-inner:after {
display: none;
}
.device-ios .popover__titled .list:last-child li:last-child:after {
display: none;
}
.list ul:before {
display: none;
}
.list ul:after{
display: none;
}
li { li {
width: 70px; width: 70px;
height: 70px; height: 70px;

13
apps/common/mobile/resources/less/common-material.less
View file

@ -298,6 +298,19 @@
} }
} }
.simple-list li:after, .links-list a:after, .list .item-inner:after {
display: none;
}
.device-ios .popover__titled .list:last-child li:last-child:after {
display: none;
}
.list ul:before {
display: none;
}
.list ul:after{
display: none;
}
li { li {
width: 70px; width: 70px;
height: 70px; height: 70px;

14
apps/documenteditor/mobile/src/less/app.less
View file

@ -102,16 +102,8 @@
} }
} }
.simple-list li:after, .links-list a:after, .list .item-inner:after { .swiper-pagination-bullet-active{
display: none; background: #000;
}
.device-ios .popover__titled .list:last-child li:last-child:after {
display: none;
}
.list ul:before {
display: none;
}
.list ul:after{
display: none;
} }

18
apps/documenteditor/mobile/src/view/edit/EditText.jsx
View file

@ -161,7 +161,8 @@ const PageBullets = props => {
{bulletArrays.map((bullets, index) => ( {bulletArrays.map((bullets, index) => (
<List className="row" style={{listStyle: 'none'}} key={'bullets-' + index}> <List className="row" style={{listStyle: 'none'}} key={'bullets-' + index}>
{bullets.map((bullet) => ( {bullets.map((bullet) => (
<ListItem key={'bullet-' + bullet.type} data-type={bullet.type} className={bullet.type === typeBullets ? 'active' : ''} <ListItem key={'bullet-' + bullet.type} data-type={bullet.type} className={(bullet.type === typeBullets) &&
(storeTextSettings.listType === 0 || storeTextSettings.listType === -1) ? 'active' : ''}
onClick={() => { onClick={() => {
if (bullet.type === -1) { if (bullet.type === -1) {
storeTextSettings.resetBullets(-1); storeTextSettings.resetBullets(-1);
@ -208,7 +209,8 @@ const PageNumbers = props => {
{numberArrays.map((numbers, index) => ( {numberArrays.map((numbers, index) => (
<List className="row" style={{listStyle: 'none'}} key={'numbers-' + index}> <List className="row" style={{listStyle: 'none'}} key={'numbers-' + index}>
{numbers.map((number) => ( {numbers.map((number) => (
<ListItem key={'number-' + number.type} data-type={number.type} className={number.type === typeNumbers ? 'active' : ''} <ListItem key={'number-' + number.type} data-type={number.type} className={(number.type === typeNumbers) &&
(storeTextSettings.listType === 1 || storeTextSettings.listType === -1) ? 'active' : ''}
onClick={() => { onClick={() => {
if (number.type === -1) { if (number.type === -1) {
storeTextSettings.resetNumbers(-1); storeTextSettings.resetNumbers(-1);
@ -480,6 +482,16 @@ const EditText = props => {
const isStrikethrough = storeTextSettings.isStrikethrough; const isStrikethrough = storeTextSettings.isStrikethrough;
const paragraphAlign = storeTextSettings.paragraphAlign; const paragraphAlign = storeTextSettings.paragraphAlign;
let previewList;
switch(storeTextSettings.listType) {
case -1: previewList = ''
break;
case 0: previewList = 'Bullets'
break;
case 1: previewList = 'Numbers'
break;
}
const fontColorPreview = fontColor !== 'auto' ? const fontColorPreview = fontColor !== 'auto' ?
<span className="color-preview" style={{ background: `#${(typeof fontColor === "object" ? fontColor.color : fontColor)}`}}></span> : <span className="color-preview" style={{ background: `#${(typeof fontColor === "object" ? fontColor.color : fontColor)}`}}></span> :
<span className="color-preview auto"></span>; <span className="color-preview auto"></span>;
@ -557,7 +569,7 @@ const EditText = props => {
onNumber: props.onNumber, onNumber: props.onNumber,
onMultiLevelList: props.onMultiLevelList onMultiLevelList: props.onMultiLevelList
}}> }}>
<div>{storeTextSettings.listType === 1 ? 'Numbers' : ' Bullets'}</div> <div style= {{color:"gray"}}>{previewList}</div>
{!isAndroid && <Icon slot="media" icon="icon-bullets"></Icon>} {!isAndroid && <Icon slot="media" icon="icon-bullets"></Icon>}
</ListItem> </ListItem>
<ListItem title={t("Edit.textLineSpacing")} link='/edit-text-line-spacing/' routeProps={{ <ListItem title={t("Edit.textLineSpacing")} link='/edit-text-line-spacing/' routeProps={{