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
1a02a40d
Commit
1a02a40d
authored
Aug 18, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[DE][PE] Table Settings: Change border color when theme colors are changed.
parent
9c5b6f5b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
3 deletions
+13
-3
apps/common/main/lib/component/ThemeColorPalette.js
apps/common/main/lib/component/ThemeColorPalette.js
+6
-0
apps/common/main/resources/less/asc-mixins.less
apps/common/main/resources/less/asc-mixins.less
+1
-1
apps/documenteditor/main/app/view/TableSettings.js
apps/documenteditor/main/app/view/TableSettings.js
+3
-1
apps/presentationeditor/main/app/view/TableSettings.js
apps/presentationeditor/main/app/view/TableSettings.js
+3
-1
No files found.
apps/common/main/lib/component/ThemeColorPalette.js
View file @
1a02a40d
...
...
@@ -365,6 +365,12 @@ define([
aEffectIdx
++
;
}
}
var
selected
=
$
(
this
.
el
).
find
(
'
a.
'
+
this
.
selectedCls
);
if
(
selected
.
length
&&
selected
.
hasClass
(
'
palette-color-effect
'
))
{
this
.
value
=
selected
[
0
].
className
.
match
(
this
.
colorRe
)[
1
].
toUpperCase
();
}
this
.
options
.
updateColorsArr
=
undefined
;
},
...
...
apps/common/main/resources/less/asc-mixins.less
View file @
1a02a40d
...
...
@@ -74,7 +74,7 @@
}
.options-btn-icon(@icon-class, @index, @icon-size) {
.@{icon-class} {background-position:
-@icon-size
-@index*@icon-size;}
.@{icon-class} {background-position:
0
-@index*@icon-size;}
button.over > .@{icon-class} {background-position: -1*@icon-size -@index*@icon-size;}
// .btn-group.open > .@{icon-class},
button.active > .@{icon-class},
...
...
apps/documenteditor/main/app/view/TableSettings.js
View file @
1a02a40d
...
...
@@ -687,8 +687,10 @@ define([
UpdateThemeColors
:
function
()
{
if
(
this
.
colorsBack
)
this
.
colorsBack
.
updateColors
(
Common
.
Utils
.
ThemeColor
.
getEffectColors
(),
Common
.
Utils
.
ThemeColor
.
getStandartColors
());
if
(
this
.
borderColor
)
if
(
this
.
borderColor
)
{
this
.
borderColor
.
updateColors
(
Common
.
Utils
.
ThemeColor
.
getEffectColors
(),
Common
.
Utils
.
ThemeColor
.
getStandartColors
());
this
.
btnBorderColor
.
setColor
(
this
.
borderColor
.
getColor
());
}
},
_onInitTemplates
:
function
(
Templates
){
...
...
apps/presentationeditor/main/app/view/TableSettings.js
View file @
1a02a40d
...
...
@@ -583,8 +583,10 @@ define([
UpdateThemeColors
:
function
()
{
if
(
this
.
colorsBack
)
this
.
colorsBack
.
updateColors
(
Common
.
Utils
.
ThemeColor
.
getEffectColors
(),
Common
.
Utils
.
ThemeColor
.
getStandartColors
());
if
(
this
.
borderColor
)
if
(
this
.
borderColor
)
{
this
.
borderColor
.
updateColors
(
Common
.
Utils
.
ThemeColor
.
getEffectColors
(),
Common
.
Utils
.
ThemeColor
.
getStandartColors
());
this
.
btnBorderColor
.
setColor
(
this
.
borderColor
.
getColor
());
}
},
_onInitTemplates
:
function
(
Templates
){
...
...
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