From 5005e0a6c02afae66b865584ab9000e18182db1f Mon Sep 17 00:00:00 2001
From: Ilya Oleshko <ilya.oleshko@onlyoffice.com>
Date: Thu, 14 Oct 2021 13:09:54 +0300
Subject: [PATCH] Web: Icons: Fixed old checkbox icons, change header plus icon

---
 .../components/FilterInput/sub-components/FilterButton.js    | 2 +-
 .../checkbox/svg/checkbox.checked.react.svg                  | 3 +--
 .../checkbox/svg/checkbox.indeterminate.react.svg            | 5 ++---
 packages/asc-web-components/checkbox/svg/checkbox.react.svg  | 3 +--
 products/ASC.Files/Client/public/images/header.plus.svg      | 3 +++
 .../ASC.Files/Client/src/pages/Home/Section/Header/index.js  | 4 ++--
 public/images/rectangle.filter.click.react.svg               | 5 ++---
 public/images/rectangle.filter.react.svg                     | 3 +--
 8 files changed, 13 insertions(+), 15 deletions(-)
 create mode 100644 products/ASC.Files/Client/public/images/header.plus.svg

diff --git a/packages/asc-web-common/components/FilterInput/sub-components/FilterButton.js b/packages/asc-web-common/components/FilterInput/sub-components/FilterButton.js
index bb5922b796..fc7d97f9d6 100644
--- a/packages/asc-web-common/components/FilterInput/sub-components/FilterButton.js
+++ b/packages/asc-web-common/components/FilterInput/sub-components/FilterButton.js
@@ -16,7 +16,7 @@ class FilterButton extends React.PureComponent {
     //console.log('render FilterButton)
     return (
       <ContextMenuButton
-        className="filter-button"
+        //className="filter-button"
         directionY="bottom"
         getData={getData}
         iconName="/static/images/rectangle.filter.react.svg"
diff --git a/packages/asc-web-components/checkbox/svg/checkbox.checked.react.svg b/packages/asc-web-components/checkbox/svg/checkbox.checked.react.svg
index b2e55326cf..cdca72d591 100644
--- a/packages/asc-web-components/checkbox/svg/checkbox.checked.react.svg
+++ b/packages/asc-web-components/checkbox/svg/checkbox.checked.react.svg
@@ -1,5 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="0.5" y="0.5" width="15" height="15" rx="2.5" fill="white" stroke="#D0D5DA" stroke-opacity="1"/>
-<rect x="0.5" y="0.5" width="15" height="15" rx="2.5" fill="white" stroke="#D0D5DA" stroke-opacity="1" stroke-width="8%" />
+<rect x="0.5" y="0.5" width="15" height="15" rx="2.5" fill="white" stroke="#D0D5DA"/>
 <path d="M7.97926 11.6351C7.48054 12.1216 6.67132 12.1216 6.17284 11.6351L3.37404 8.90491C2.87532 8.41864 2.87532 7.62926 3.37404 7.14299C3.87252 6.65649 4.68174 6.65649 5.18046 7.14299L6.84799 8.76943C6.97387 8.89199 7.17822 8.89199 7.30435 8.76943L11.8195 4.36487C12.318 3.87838 13.1272 3.87838 13.626 4.36487C13.8655 4.5985 14 4.91547 14 5.24583C14 5.57619 13.8655 5.89317 13.626 6.12679L7.97926 11.6351Z" fill="#333333"/>
 </svg>
diff --git a/packages/asc-web-components/checkbox/svg/checkbox.indeterminate.react.svg b/packages/asc-web-components/checkbox/svg/checkbox.indeterminate.react.svg
index 58295c3c6c..9472b52112 100644
--- a/packages/asc-web-components/checkbox/svg/checkbox.indeterminate.react.svg
+++ b/packages/asc-web-components/checkbox/svg/checkbox.indeterminate.react.svg
@@ -1,5 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="0.5" y="0.5" width="15" height="15" rx="2.5" fill="white" stroke="#D0D5DA" stroke-opacity="1"/>
-<rect x="0.5" y="0.5" width="15" height="15" rx="2.5" fill="white" stroke="#D0D5DA" stroke-opacity="1" stroke-width="8%"/>
+<rect x="0.5" y="0.5" width="15" height="15" rx="2.5" fill="white" stroke="#D0D5DA"/>
 <rect x="3" y="3" width="10" height="10" rx="2" fill="#333333"/>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/packages/asc-web-components/checkbox/svg/checkbox.react.svg b/packages/asc-web-components/checkbox/svg/checkbox.react.svg
index 8570fa86d4..a7b62f6ad0 100644
--- a/packages/asc-web-components/checkbox/svg/checkbox.react.svg
+++ b/packages/asc-web-components/checkbox/svg/checkbox.react.svg
@@ -1,4 +1,3 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="0.5" y="0.5" width="15" height="15" rx="2.5" fill="white" stroke="#D0D5DA" stroke-opacity="1" />
-<rect x="0.5" y="0.5" width="15" height="15" rx="2.5" fill="white" stroke="#D0D5DA" stroke-opacity="1"  stroke-width="8%" />
+<rect x="0.5" y="0.5" width="15" height="15" rx="2.5" fill="white" stroke="#D0D5DA"/>
 </svg>
diff --git a/products/ASC.Files/Client/public/images/header.plus.svg b/products/ASC.Files/Client/public/images/header.plus.svg
new file mode 100644
index 0000000000..548ddee738
--- /dev/null
+++ b/products/ASC.Files/Client/public/images/header.plus.svg
@@ -0,0 +1,3 @@
+<svg width="17" height="17" viewBox="0 0 17 17" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.5 0C7.67157 0 7 0.671573 7 1.5V7H1.5C0.671573 7 0 7.67157 0 8.5C0 9.32843 0.671573 10 1.5 10H7V15.5C7 16.3284 7.67157 17 8.5 17C9.32843 17 10 16.3284 10 15.5V10H15.5C16.3284 10 17 9.32843 17 8.5C17 7.67157 16.3284 7 15.5 7H10V1.5C10 0.671573 9.32843 0 8.5 0Z" fill="#A3A9AE"/>
+</svg>
diff --git a/products/ASC.Files/Client/src/pages/Home/Section/Header/index.js b/products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
index 9ecb3545ae..d9dafab5ae 100644
--- a/products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
+++ b/products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
@@ -410,7 +410,7 @@ class SectionHeaderContent extends React.Component {
                         <ContextMenuButton
                           className="add-button"
                           directionX="right"
-                          iconName="images/plus.svg"
+                          iconName="images/header.plus.svg"
                           size={17}
                           color="#A3A9AE"
                           hoverColor="#657077"
@@ -437,7 +437,7 @@ class SectionHeaderContent extends React.Component {
                         <ContextMenuButton
                           className="add-button"
                           directionX="right"
-                          iconName="images/plus.svg"
+                          iconName="images/header.plus.svg"
                           size={17}
                           color="#A3A9AE"
                           hoverColor="#657077"
diff --git a/public/images/rectangle.filter.click.react.svg b/public/images/rectangle.filter.click.react.svg
index 374d288ab7..29420d74dd 100644
--- a/public/images/rectangle.filter.click.react.svg
+++ b/public/images/rectangle.filter.click.react.svg
@@ -1,5 +1,4 @@
 <svg width="33" height="26" viewBox="0 0 33 26" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M0.5 3C0.5 1.61929 1.61929 0.5 3 0.5H21.1954C21.9785 0.5 22.7163 0.866919 23.1889 1.49134L31.2783 12.1803C31.6858 12.7188 31.6832 13.4633 31.2719 13.999L23.1913 24.5226C22.7182 25.1388 21.9854 25.5 21.2084 25.5H3C1.61929 25.5 0.5 24.3807 0.5 23V3Z" fill="#ECEEF1" stroke="#A3A9AE"/>
-<rect x="13.5" y="6.5" width="13" height="1" transform="rotate(90 13.5 6.5)" fill="#D8D8D8" stroke="#555F65"/>
-<rect x="6.5" y="12.5" width="13" height="1" fill="#D8D8D8" stroke="#555F65"/>
-</svg>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 12L6 12V14L12 14V20H14L14 14H20V12H14V6L12 6L12 12Z" fill="#555F65"/>
+</svg>
\ No newline at end of file
diff --git a/public/images/rectangle.filter.react.svg b/public/images/rectangle.filter.react.svg
index 2cbcd68cda..f9fbd3c3ce 100644
--- a/public/images/rectangle.filter.react.svg
+++ b/public/images/rectangle.filter.react.svg
@@ -1,5 +1,4 @@
 <svg width="33" height="26" viewBox="0 0 33 26" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path d="M0.5 3C0.5 1.61929 1.61929 0.5 3 0.5H21.1954C21.9785 0.5 22.7163 0.866919 23.1889 1.49134L31.2783 12.1803C31.6858 12.7188 31.6832 13.4633 31.2719 13.999L23.1913 24.5226C22.7182 25.1388 21.9854 25.5 21.2084 25.5H3C1.61929 25.5 0.5 24.3807 0.5 23V3Z" fill="#F8F9F9" stroke="#ECEEF1"/>
-<rect x="13.5" y="6.5" width="13" height="1" transform="rotate(90 13.5 6.5)" fill="#D8D8D8" stroke="#979797"/>
-<rect x="6.5" y="12.5" width="13" height="1" fill="#D8D8D8" stroke="#979797"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 12L6 12V14L12 14V20H14L14 14H20V12H14V6L12 6L12 12Z" fill="#A3A9AE"/>
 </svg>