From 514f3d375ca834f741846539ee460c6c9912b5f0 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Thu, 5 May 2016 10:00:22 +0300
Subject: [PATCH] =?UTF-8?q?[SSE]=20=D0=92=20=D1=81=D0=BF=D0=B8=D1=81=D0=BE?=
 =?UTF-8?q?=D0=BA=20=D1=86=D0=B2=D0=B5=D1=82=D0=BE=D0=B2=20=D1=84=D0=BE?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D1=81=D0=BE=D1=80=D1=82?=
 =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B8=20=D0=B8=20=D1=84=D0=B8?=
 =?UTF-8?q?=D0=BB=D1=8C=D1=82=D1=80=D0=BE=D0=B2=20=D0=B4=D0=BE=D0=B1=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=20=D0=BF=D1=80=D0=BE=D0=B7=D1=80=D0=B0?=
 =?UTF-8?q?=D1=87=D0=BD=D1=8B=D0=B9=20=D1=86=D0=B2=D0=B5=D1=82=20(=D0=BE?=
 =?UTF-8?q?=D0=BD=20=D0=B6=D0=B5=20"=D0=BD=D0=B5=D1=82=20=D0=B7=D0=B0?=
 =?UTF-8?q?=D0=BB=D0=B8=D0=B2=D0=BA=D0=B8").?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/common/main/resources/less/asc-mixins.less          | 2 +-
 apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/common/main/resources/less/asc-mixins.less b/apps/common/main/resources/less/asc-mixins.less
index 2b68ccbe3..69a4fcedc 100644
--- a/apps/common/main/resources/less/asc-mixins.less
+++ b/apps/common/main/resources/less/asc-mixins.less
@@ -138,7 +138,7 @@
 
 @common-controls-width: 100px;
 .img-commonctrl,
-        .theme-colorpalette .color-transparent, .dropdown-menu li .checked:before, .input-error:before {
+        .theme-colorpalette .color-transparent, .palette-color-ext .color-transparent, .dropdown-menu li .checked:before, .input-error:before {
     background: e(%("url(%s)",'@{common-image-path}/@{common-controls}')) no-repeat;
 
     @media
diff --git a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
index 8a1197f4a..9a109d6bc 100644
--- a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
@@ -755,7 +755,7 @@ define([
 
             var colorFilter = filterObj.asc_getFilter();
             colorFilter.asc_setCellColor(isCellColor);
-            colorFilter.asc_setCColor(Common.Utils.ThemeColor.getRgbColor(color));
+            colorFilter.asc_setCColor(color == 'transparent' ? null : Common.Utils.ThemeColor.getRgbColor(color));
 
             this.api.asc_applyAutoFilter(this.configTo);
 
@@ -863,7 +863,7 @@ define([
             this.miNumFilter.setChecked(isCustomFilter && !isTextFilter, true);
 
             if (colorsFont && colorsFont.length>0) {
-                var colors = [];
+                var colors = ['transparent'];
                 colorsFont.forEach(function(item, index) {
                     colors.push(Common.Utils.ThemeColor.getHexColor(item.get_r(), item.get_g(), item.get_b()).toLocaleUpperCase());
                 });
@@ -877,7 +877,7 @@ define([
             }
 
             if (colorsFill && colorsFill.length>0) {
-                var colors = [];
+                var colors = ['transparent'];
                 colorsFill.forEach(function(item, index) {
                     colors.push(Common.Utils.ThemeColor.getHexColor(item.get_r(), item.get_g(), item.get_b()).toLocaleUpperCase());
                 });