diff --git a/apps/common/main/lib/component/ColorButton.js b/apps/common/main/lib/component/ColorButton.js
index 8e2a2280b..90c428b8c 100644
--- a/apps/common/main/lib/component/ColorButton.js
+++ b/apps/common/main/lib/component/ColorButton.js
@@ -91,7 +91,7 @@ define([
auto.push({
id: id + '-color-auto',
caption: (typeof options.auto == 'object') ? options.auto.caption || this.textAutoColor : this.textAutoColor,
- template: _.template('<%= caption %>')
+ template: _.template('<%= caption %>')
});
auto.push({caption: '--'});
}
diff --git a/apps/common/main/lib/component/ThemeColorPalette.js b/apps/common/main/lib/component/ThemeColorPalette.js
index 1af6e825b..f50b7a928 100644
--- a/apps/common/main/lib/component/ThemeColorPalette.js
+++ b/apps/common/main/lib/component/ThemeColorPalette.js
@@ -64,11 +64,11 @@ define([
template :
_.template(
- '
' +
+ '
' +
'<% var me = this; var idx = 0; %>' +
'<% $(colors).each(function(num, item) { %>' +
- '<% if (me.isBlankSeparator(item)) { %>
' +
- '<% } else if (me.isSeparator(item)) { %>
' +
+ '<% if (me.isBlankSeparator(item)) { %>
' +
+ '<% } else if (me.isSeparator(item)) { %>
' +
'<% } else if (me.isColor(item)) { %> ' +
'
' +
' ' +
@@ -79,20 +79,20 @@ define([
'' +
'<% } else if (me.isEffect(item)) { %>' +
'<% if (idx>0 && me.columns>0 && idx%me.columns===0) { %> ' +
- '
' +
+ '
' +
'<% } %>' +
'
' +
' ' +
'' +
'<% } else if (me.isCaption(item)) { %>' +
- '
<%=item%>
' +
+ '
<%=item%>
' +
'<% } %>' +
'<% }); %>' +
'
' +
'<% if (me.options.dynamiccolors!==undefined) { %>' +
- '
' +
- '
' +
- '
<%=me.textRecentColors%>
' +
+ '
' +
+ '
' +
+ '
<%=me.textRecentColors%>
' +
'<% for (var i=0; i
' +
'' +
' ' +
diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less
index e53641a0a..a1e62faf4 100644
--- a/apps/common/main/resources/less/buttons.less
+++ b/apps/common/main/resources/less/buttons.less
@@ -721,13 +721,26 @@
// for color button auto color
.dropdown-menu {
- li > a.selected,
- li > a:hover {
+ li > a {
span.color-auto {
- outline: @scaled-one-px-value-ie solid @icon-normal-ie;
- outline: @scaled-one-px-value solid @icon-normal;
- border: @scaled-one-px-value-ie solid @background-normal-ie;
- border: @scaled-one-px-value solid @background-normal;
+ background-image: none;
+ width: 12px;
+ height: 12px;
+ margin: 1px 7px 0 1px;
+
+ .rtl & {
+ margin: 1px 1px 0 7px;
+ }
+ }
+
+ &.selected,
+ &:hover {
+ span.color-auto {
+ outline: @scaled-one-px-value-ie solid @icon-normal-ie;
+ outline: @scaled-one-px-value solid @icon-normal;
+ border: @scaled-one-px-value-ie solid @background-normal-ie;
+ border: @scaled-one-px-value solid @background-normal;
+ }
}
}
}
diff --git a/apps/common/main/resources/less/theme-colorpalette.less b/apps/common/main/resources/less/theme-colorpalette.less
index 3c71fba63..fd63a4483 100644
--- a/apps/common/main/resources/less/theme-colorpalette.less
+++ b/apps/common/main/resources/less/theme-colorpalette.less
@@ -32,6 +32,10 @@
outline: 0 none;
cursor: pointer;
+ .rtl & {
+ float: right;
+ }
+
em span {
border: @scaled-one-px-value-ie solid @border-color-shading-ie;
border: @scaled-one-px-value solid @border-color-shading;
@@ -65,5 +69,49 @@
border:solid @scaled-one-px-value @border-color-shading;
}
}
+
+ .palette-inner {
+ padding: 4px 0 0 12px;
+ .rtl & {
+ padding: 4px 12px 0 0;
+ }
+ }
+
+ .palette-color-caption {
+ width:100%;
+ float:left;
+ font-size: 11px;
+ .rtl & {
+ float: right;
+ text-align: right;
+ }
+ }
+
+ .palette-color-spacer {
+ width: 100%;
+ height: 8px;
+ float: left;
+ .rtl & {
+ float: right;
+ }
+ }
+
+ .palette-color-dynamiccolors {
+ padding: 4px 0 0 12px;
+ .rtl & {
+ padding: 4px 12px 0 0;
+ }
+ }
+
+ .divider {
+ width: 100%;
+ float: left;
+ }
+
+ .color-divider {
+ width:100%;
+ height:0;
+ float:left;
+ }
}