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
36a24ae3
Commit
36a24ae3
authored
Nov 24, 2016
by
Alexander Yuzhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[DE mobile] Fixed display chart styles.
parent
c106b6ec
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
68 additions
and
25 deletions
+68
-25
apps/documenteditor/mobile/app/controller/edit/EditChart.js
apps/documenteditor/mobile/app/controller/edit/EditChart.js
+6
-3
apps/documenteditor/mobile/app/template/EditChart.template
apps/documenteditor/mobile/app/template/EditChart.template
+2
-10
apps/documenteditor/mobile/app/view/edit/EditChart.js
apps/documenteditor/mobile/app/view/edit/EditChart.js
+10
-12
apps/documenteditor/mobile/resources/css/app-ios.css
apps/documenteditor/mobile/resources/css/app-ios.css
+9
-0
apps/documenteditor/mobile/resources/css/app-material.css
apps/documenteditor/mobile/resources/css/app-material.css
+9
-0
apps/documenteditor/mobile/resources/less/app-ios.less
apps/documenteditor/mobile/resources/less/app-ios.less
+16
-0
apps/documenteditor/mobile/resources/less/app-material.less
apps/documenteditor/mobile/resources/less/app-material.less
+16
-0
No files found.
apps/documenteditor/mobile/app/controller/edit/EditChart.js
View file @
36a24ae3
...
...
@@ -42,8 +42,11 @@
define
([
'
core
'
,
'
documenteditor/mobile/app/view/edit/EditChart
'
],
function
(
core
)
{
'
documenteditor/mobile/app/view/edit/EditChart
'
,
'
jquery
'
,
'
underscore
'
,
'
backbone
'
],
function
(
core
,
view
,
$
,
_
,
Backbone
)
{
'
use strict
'
;
DE
.
Controllers
.
EditChart
=
Backbone
.
Controller
.
extend
(
_
.
extend
((
function
()
{
...
...
@@ -564,7 +567,7 @@ define([
Common
.
SharedSettings
.
set
(
'
chartstyles
'
,
styles
);
Common
.
NotificationCenter
.
trigger
(
'
chartstyles:load
'
,
styles
);
$
(
'
#tab-chart-style
.dataview .row div
'
).
single
(
'
click
'
,
_
.
bind
(
this
.
onStyle
,
this
));
$
(
'
#tab-chart-style
li
'
).
single
(
'
click
'
,
_
.
bind
(
this
.
onStyle
,
this
));
},
_uiTransformByWrap
:
function
(
type
)
{
...
...
apps/documenteditor/mobile/app/template/EditChart.template
View file @
36a24ae3
...
...
@@ -317,16 +317,8 @@
</ul>
<% }); %>
</div>
<div id="tab-chart-style" class="page-content tab">
<div class="list-block">
<ul>
<li id="edit-chart-styles">
<div class="item-content">
<div class="item-inner"></div>
</div>
</li>
</ul>
</div>
<div id="tab-chart-style" class="page-content tab dataview chart-styles">
<!--Styles-->
</div>
<div id="tab-chart-fill" class="page-content tab">
<!--Fill colors-->
...
...
apps/documenteditor/mobile/app/view/edit/EditChart.js
View file @
36a24ae3
...
...
@@ -178,10 +178,10 @@ define([
},
renderStyles
:
function
()
{
var
$styleContainer
=
$
(
'
#
edit-chart-styles .item-inner
'
);
var
$styleContainer
=
$
(
'
#
tab-chart-style
'
);
if
(
$styleContainer
.
length
>
0
)
{
var
columns
=
parseInt
(
$styleContainer
.
width
()
/
6
0
),
// magic
var
columns
=
parseInt
(
$styleContainer
.
width
()
/
7
0
),
// magic
row
=
-
1
,
styles
=
[];
...
...
@@ -194,17 +194,15 @@ define([
});
var
template
=
_
.
template
([
'
<div class="dataview chart-styles" style="width: 100%;">
'
,
'
<% _.each(styles, function(row) { %>
'
,
'
<div
class="row">
'
,
'
<ul
class="row">
'
,
'
<% _.each(row, function(style) { %>
'
,
'
<div
data-type="<%= style.asc_getStyle() %>">
'
,
'
<li
data-type="<%= style.asc_getStyle() %>">
'
,
'
<img src="<%= style.asc_getImageUrl() %>" width="50px" height="50px">
'
,
'
</div
>
'
,
'
</li
>
'
,
'
<% }); %>
'
,
'
</div>
'
,
'
<% }); %>
'
,
'
</div>
'
'
</ul>
'
,
'
<% }); %>
'
].
join
(
''
),
{
styles
:
styles
});
...
...
apps/documenteditor/mobile/resources/css/app-ios.css
View file @
36a24ae3
...
...
@@ -6619,6 +6619,15 @@ i.icon.icon-wrap-behind {
width
:
70px
;
height
:
50px
;
}
.chart-styles
.row
,
.chart-styles
.row
li
{
margin-bottom
:
12px
;
}
.chart-styles
li
,
.chart-styles
.row
div
{
margin
:
0
;
padding
:
1px
;
}
.shapes
li
{
width
:
70px
;
height
:
70px
;
...
...
apps/documenteditor/mobile/resources/css/app-material.css
View file @
36a24ae3
...
...
@@ -6182,6 +6182,15 @@ textarea {
width
:
70px
;
height
:
50px
;
}
.chart-styles
.row
,
.chart-styles
.row
li
{
margin-bottom
:
12px
;
}
.chart-styles
li
,
.chart-styles
.row
div
{
margin
:
0
;
padding
:
1px
;
}
.shapes
li
{
width
:
70px
;
height
:
70px
;
...
...
apps/documenteditor/mobile/resources/less/app-ios.less
View file @
36a24ae3
...
...
@@ -117,6 +117,22 @@ input, textarea {
}
}
// Chart styles
.chart-styles {
.row {
&, li {
margin-bottom: 12px;
}
}
li,
.row div {
margin: 0;
padding: 1px;
}
}
// Shapes
.shapes {
...
...
apps/documenteditor/mobile/resources/less/app-material.less
View file @
36a24ae3
...
...
@@ -110,6 +110,22 @@ input, textarea {
}
}
// Chart styles
.chart-styles {
.row {
&, li {
margin-bottom: 12px;
}
}
li,
.row div {
margin: 0;
padding: 1px;
}
}
// Shapes
.shapes {
...
...
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