diff --git a/apps/common/mobile/lib/component/ThemeColorPalette.jsx b/apps/common/mobile/lib/component/ThemeColorPalette.jsx index b9799ef1e..fbac6dd5b 100644 --- a/apps/common/mobile/lib/component/ThemeColorPalette.jsx +++ b/apps/common/mobile/lib/component/ThemeColorPalette.jsx @@ -7,12 +7,12 @@ const ThemeColors = ({ themeColors, onColorClick, curColor }) => {
{themeColors.map((row, rowIndex) => { return( -
+
{row.map((effect, index) => { return( - {onColorClick(effect.color, effect.effectId)}} > ) @@ -29,16 +29,16 @@ const StandartColors = ({ options, standartColors, onColorClick, curColor }) =>
{standartColors.map((color, index) => { return( - index === 0 && options.transparent ? - {onColorClick('transparent')}} - > : - {onColorClick(color)}} - > + index === 0 && options.transparent ? + {onColorClick('transparent')}} + > : + {onColorClick(color)}} + > ) })}
@@ -46,13 +46,13 @@ const StandartColors = ({ options, standartColors, onColorClick, curColor }) => }; const CustomColors = ({ options, customColors, onColorClick, curColor }) => { - const colors = customColors.length > 0 ? customColors : [];//dynamiColors; + const colors = customColors.length > 0 ? customColors : []; const emptyItems = []; if (colors.length < options.customcolors) { for (let i = colors.length; i < options.customcolors; i++) { - emptyItems.push( {onColorClick('empty')}} + emptyItems.push( {onColorClick('empty')}} >) } } @@ -60,7 +60,7 @@ const CustomColors = ({ options, customColors, onColorClick, curColor }) => {
{colors && colors.length > 0 && colors.map((color, index) => { return( - {onColorClick(color)}} diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less index a5e93e181..29c8bdb54 100644 --- a/apps/common/mobile/resources/less/common.less +++ b/apps/common/mobile/resources/less/common.less @@ -3,7 +3,7 @@ @black: #000000; @gray: #c4c4c4; @green: #4cd964; - +@background-normal: @white; .popup, .popover, .sheet-modal { .list:first-child { @@ -53,7 +53,7 @@ } &.active { .color-auto { - box-shadow: 0 0 0 1px @white, 0 0 0 4px @themeColor; + box-shadow: 0 0 0 1px @background-normal, 0 0 0 4px @themeColor; border-radius: 1px; } } @@ -74,7 +74,7 @@ position: absolute; width: 100%; height: 100%; - box-shadow: 0 0 0 1px @white, 0 0 0 4px @themeColor; + box-shadow: 0 0 0 1px @background-normal, 0 0 0 4px @themeColor; z-index: 1; border-radius: 1px; } @@ -91,6 +91,12 @@ display: flex; } } + + .dynamic-colors { + .empty-color { + background-color: @background-normal; + } + } } #color-picker { diff --git a/apps/documenteditor/mobile/src/css/app.less b/apps/documenteditor/mobile/src/css/app.less index 6e73cb840..39a4c6a80 100644 --- a/apps/documenteditor/mobile/src/css/app.less +++ b/apps/documenteditor/mobile/src/css/app.less @@ -10,38 +10,6 @@ @import './icons-ios.less'; @import './icons-material.less'; -/* Left Panel right border when it is visible by breakpoint */ -.panel-left.panel-in-breakpoint:before { - position: absolute; - right: 0; - top: 0; - height: 100%; - width: 1px; - background: rgba(0,0,0,0.1); - content: ''; - z-index: 6000; -} - -/* Hide navbar link which opens left panel when it is visible by breakpoint */ -.panel-left.panel-in-breakpoint ~ .view .navbar .panel-open[data-panel="left"] { - display: none; -} - -/* - Extra borders for main view and left panel for iOS theme when it behaves as panel (before breakpoint size) -*/ -.ios .panel-left:not(.panel-in-breakpoint).panel-in ~ .view-main:before, -.ios .panel-left:not(.panel-in-breakpoint).panel-closing ~ .view-main:before { - position: absolute; - left: 0; - top: 0; - height: 100%; - width: 1px; - background: rgba(0,0,0,0.1); - content: ''; - z-index: 6000; -} - :root { --f7-popover-width: 360px; } diff --git a/apps/documenteditor/mobile/src/view/app.jsx b/apps/documenteditor/mobile/src/view/app.jsx index 64a7a3ab9..da82af4b7 100644 --- a/apps/documenteditor/mobile/src/view/app.jsx +++ b/apps/documenteditor/mobile/src/view/app.jsx @@ -31,51 +31,9 @@ export default class extends React.Component { return ( - {/* Left panel with cover effect when hidden */} - - - - - Left View Navigation - - - - - - - - - - {/* Right panel with reveal effect*/} - - - - - Right panel content goes here - - - - - {/* Your main view, should have "view-main" class */} - - {/* Popup */} - - - - - - Close - - - -

Popup content goes here.

-
-
-
-
) }