Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
web-apps
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
web-apps
Commits
78741d01
Commit
78741d01
authored
Nov 28, 2016
by
Alexander Yuzhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[mobile] Fixed display an active element ot the color palette.
parent
c38fac90
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
30 additions
and
67 deletions
+30
-67
apps/common/mobile/resources/less/ios/_color-palette.less
apps/common/mobile/resources/less/ios/_color-palette.less
+13
-18
apps/common/mobile/resources/less/ios/_listview.less
apps/common/mobile/resources/less/ios/_listview.less
+2
-14
apps/documenteditor/mobile/app/controller/Main.js
apps/documenteditor/mobile/app/controller/Main.js
+1
-1
apps/documenteditor/mobile/app/controller/edit/EditText.js
apps/documenteditor/mobile/app/controller/edit/EditText.js
+1
-1
apps/documenteditor/mobile/resources/css/app-ios.css
apps/documenteditor/mobile/resources/css/app-ios.css
+13
-33
No files found.
apps/common/mobile/resources/less/ios/_color-palette.less
View file @
78741d01
...
...
@@ -7,29 +7,17 @@
min-width: 10px;
min-height: 26px;
margin: 1px 1px 0 0;
border: 0.5px solid #c4c4c4;
html.pixel-ratio-2 & {
border: 0.5px solid #c4c4c4;
}
html.pixel-ratio-3 & {
border: 0.33px solid #c4c4c4;
}
box-shadow: 0 0 0 1px rgba(0,0,0,0.15) inset;
&.active {
&:after {
content:' ';
position: absolute;
left: 50%;
margin-left: -6px;
top: 50%;
margin-top: -4px;
width: 12px;
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);
width: 100%;
height: 100%;
box-shadow: 0 0 0 1px white, 0 0 0 4px @themeColor;
z-index: 1;
border-radius: 1px;
}
}
...
...
@@ -43,6 +31,13 @@
.theme-colors {
.item-inner {
display: inline-block;
overflow: visible;
}
}
.standart-colors {
.item-inner {
overflow: visible;
}
}
}
\ No newline at end of file
apps/common/mobile/resources/less/ios/_listview.less
View file @
78741d01
...
...
@@ -52,13 +52,7 @@
width: 75px;
height: 30px;
margin-top: -3px;
border: 1px solid #c4c4c4;
html.pixel-ratio-2 & {
border: 0.5px solid #c4c4c4;
}
html.pixel-ratio-3 & {
border: 0.33px solid #c4c4c4;
}
box-shadow: 0 0 0 1px rgba(0,0,0,0.15) inset;
}
i .color-preview {
...
...
@@ -67,13 +61,7 @@
display: inline-block;
margin-top: 21px;
box-sizing: border-box;
border: 1px solid #c4c4c4;
html.pixel-ratio-2 & {
border: 0.5px solid #c4c4c4;
}
html.pixel-ratio-3 & {
border: 0.33px solid #c4c4c4;
}
box-shadow: 0 0 0 1px rgba(0,0,0,0.15) inset;
}
}
...
...
apps/documenteditor/mobile/app/controller/Main.js
View file @
78741d01
...
...
@@ -495,7 +495,7 @@ define([
value
=
me
.
_state
.
fastCoauth
;
// Common.localStorage.getItem("de-settings-autosave");
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
)
{
Common
.
NotificationCenter
.
trigger
(
'
api:disconnect
'
);
...
...
apps/documenteditor/mobile/app/controller/edit/EditText.js
View file @
78741d01
...
...
@@ -90,7 +90,7 @@ define([
},
setApi
:
function
(
api
)
{
var
me
=
this
var
me
=
this
;
me
.
api
=
api
;
me
.
api
.
asc_registerCallback
(
'
asc_onInitEditorFonts
'
,
_
.
bind
(
onApiLoadFonts
,
me
));
...
...
apps/documenteditor/mobile/resources/css/app-ios.css
View file @
78741d01
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment