Commit 78741d01 authored by Alexander Yuzhin's avatar Alexander Yuzhin

[mobile] Fixed display an active element ot the color palette.

parent c38fac90
...@@ -7,29 +7,17 @@ ...@@ -7,29 +7,17 @@
min-width: 10px; min-width: 10px;
min-height: 26px; min-height: 26px;
margin: 1px 1px 0 0; margin: 1px 1px 0 0;
border: 0.5px solid #c4c4c4; box-shadow: 0 0 0 1px rgba(0,0,0,0.15) inset;
html.pixel-ratio-2 & {
border: 0.5px solid #c4c4c4;
}
html.pixel-ratio-3 & {
border: 0.33px solid #c4c4c4;
}
&.active { &.active {
&:after { &:after {
content:' '; content:' ';
position: absolute; position: absolute;
left: 50%; width: 100%;
margin-left: -6px; height: 100%;
top: 50%; box-shadow: 0 0 0 1px white, 0 0 0 4px @themeColor;
margin-top: -4px; z-index: 1;
width: 12px; border-radius: 1px;
height: 9px;
background: no-repeat center;
.encoded-svg-background("<svg xmlns='http://www.w3.org/2000/svg' x='0px' y='0px' viewBox='0 0 12 9' xml:space='preserve'><polygon fill='#fff' points='12,0.7 11.3,0 3.9,7.4 0.7,4.2 0,4.9 3.9,8.8 3.9,8.8 3.9,8.8 '/></svg>");
-webkit-background-size: 12px 9px;
background-size: 12px 9px;
filter: drop-shadow(0px 0px 1px #000);
} }
} }
...@@ -43,6 +31,13 @@ ...@@ -43,6 +31,13 @@
.theme-colors { .theme-colors {
.item-inner { .item-inner {
display: inline-block; display: inline-block;
overflow: visible;
}
}
.standart-colors {
.item-inner {
overflow: visible;
} }
} }
} }
\ No newline at end of file
...@@ -52,13 +52,7 @@ ...@@ -52,13 +52,7 @@
width: 75px; width: 75px;
height: 30px; height: 30px;
margin-top: -3px; margin-top: -3px;
border: 1px solid #c4c4c4; box-shadow: 0 0 0 1px rgba(0,0,0,0.15) inset;
html.pixel-ratio-2 & {
border: 0.5px solid #c4c4c4;
}
html.pixel-ratio-3 & {
border: 0.33px solid #c4c4c4;
}
} }
i .color-preview { i .color-preview {
...@@ -67,13 +61,7 @@ ...@@ -67,13 +61,7 @@
display: inline-block; display: inline-block;
margin-top: 21px; margin-top: 21px;
box-sizing: border-box; box-sizing: border-box;
border: 1px solid #c4c4c4; box-shadow: 0 0 0 1px rgba(0,0,0,0.15) inset;
html.pixel-ratio-2 & {
border: 0.5px solid #c4c4c4;
}
html.pixel-ratio-3 & {
border: 0.33px solid #c4c4c4;
}
} }
} }
......
...@@ -495,7 +495,7 @@ define([ ...@@ -495,7 +495,7 @@ define([
value = me._state.fastCoauth; // Common.localStorage.getItem("de-settings-autosave"); value = me._state.fastCoauth; // Common.localStorage.getItem("de-settings-autosave");
value = (!me._state.fastCoauth && value!==null) ? parseInt(value) : (me.appOptions.canCoAuthoring ? 1 : 0); value = (!me._state.fastCoauth && value!==null) ? parseInt(value) : (me.appOptions.canCoAuthoring ? 1 : 0);
me.api.asc_setAutoSaveGap(value); // me.api.asc_setAutoSaveGap(value);
if (me.needToUpdateVersion) { if (me.needToUpdateVersion) {
Common.NotificationCenter.trigger('api:disconnect'); Common.NotificationCenter.trigger('api:disconnect');
......
...@@ -90,7 +90,7 @@ define([ ...@@ -90,7 +90,7 @@ define([
}, },
setApi: function (api) { setApi: function (api) {
var me = this var me = this;
me.api = api; me.api = api;
me.api.asc_registerCallback('asc_onInitEditorFonts', _.bind(onApiLoadFonts, me)); me.api.asc_registerCallback('asc_onInitEditorFonts', _.bind(onApiLoadFonts, me));
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment