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

Make highlight color palette

Browse source
This commit is contained in:
SergeyEzhin 2021-09-13 17:29:12 +03:00
parent f6107e516e
commit e4c58e80bd
3 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/common/mobile/resources/less/common.less
View file

@ -901,6 +901,14 @@ input[type="number"]::-webkit-inner-spin-button {
} }
} }
// Highlight Colors
.highlight-color {
width: 38px;
height: 38px;
margin: 1px;
border: 0.5px solid #9E9E9E;
}

3
apps/documenteditor/mobile/locale/en.json
View file

@ -304,7 +304,8 @@
"textTopAndBottom": "Top and Bottom", "textTopAndBottom": "Top and Bottom",
"textTotalRow": "Total Row", "textTotalRow": "Total Row",
"textType": "Type", "textType": "Type",
"textWrap": "Wrap" "textWrap": "Wrap",
"textNoFill": "No Fill"
}, },
"Error": { "Error": {
"convertationTimeoutText": "Conversion timeout exceeded.", "convertationTimeoutText": "Conversion timeout exceeded.",

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

@ -4,6 +4,7 @@ import {f7, Swiper, View, SwiperSlide, List, ListItem, Icon, Row, Button, Page,
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import {Device} from '../../../../../common/mobile/utils/device'; import {Device} from '../../../../../common/mobile/utils/device';
import { ThemeColorPalette, CustomColorPicker } from '../../../../../common/mobile/lib/component/ThemeColorPalette.jsx'; import { ThemeColorPalette, CustomColorPicker } from '../../../../../common/mobile/lib/component/ThemeColorPalette.jsx';
import HighlightColorPalette from '../../../../../common/mobile/lib/component/HighlightColorPalette.jsx';
import { LocalStorage } from '../../../../../common/mobile/utils/LocalStorage'; import { LocalStorage } from '../../../../../common/mobile/utils/LocalStorage';
const PageFonts = props => { const PageFonts = props => {
@ -465,18 +466,19 @@ const PageBackgroundColor = props => {
const { t } = useTranslation(); const { t } = useTranslation();
const _t = t('Edit', {returnObjects: true}); const _t = t('Edit', {returnObjects: true});
const backgroundColor = props.storeTextSettings.backgroundColor; const backgroundColor = props.storeTextSettings.backgroundColor;
const customColors = props.storePalette.customColors; // const customColors = props.storePalette.customColors;
const changeColor = (color, effectId) => { const changeColor = (color, effectId) => {
if (color !== 'empty') { if (color !== 'empty') {
if (effectId !==undefined ) { if (effectId !== undefined ) {
props.onBackgroundColor({color: color, effectId: effectId}); props.onBackgroundColor({color: color, effectId: effectId});
} else { } else {
props.onBackgroundColor(color); props.onBackgroundColor(color);
} }
} else {
// open custom color menu
props.f7router.navigate('/edit-text-custom-back-color/', {props: {onBackgroundColor: props.onBackgroundColor}});
} }
// } else {
// // open custom color menu
// props.f7router.navigate('/edit-text-custom-back-color/', {props: {onBackgroundColor: props.onBackgroundColor}});
// }
}; };
return( return(
<Page> <Page>
@ -489,12 +491,13 @@ const PageBackgroundColor = props => {
</NavRight> </NavRight>
} }
</Navbar> </Navbar>
<ThemeColorPalette changeColor={changeColor} curColor={backgroundColor} customColors={customColors} transparent={true}/> <HighlightColorPalette />
{/* <ThemeColorPalette changeColor={changeColor} curColor={backgroundColor} customColors={customColors} transparent={true}/>
<List> <List>
<ListItem title={_t.textAddCustomColor} link={'/edit-text-custom-back-color/'} routeProps={{ <ListItem title={_t.textAddCustomColor} link={'/edit-text-custom-back-color/'} routeProps={{
onBackgroundColor: props.onBackgroundColor onBackgroundColor: props.onBackgroundColor
}}></ListItem> }}></ListItem>
</List> </List> */}
</Page> </Page>
) )
}; };