IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Web: fix conflicts after merge

Browse Source
This commit is contained in:
TimofeyBoyko 2022-07-01 11:10:33 +03:00
parent 3e07ef1efc
commit ed8b06f88c
3 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/images/catalog.favorites.react.svg
View File

@ -1,17 +1,9 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<<<<<<< HEAD
<g clip-path="url(#clip0_3364_37742)">
<path fill-rule="evenodd" clip-rule="evenodd" d="M8.0002 0C8.39034 0 8.74485 0.226888 8.90826 0.581154L10.6488 4.35457L14.7753 4.84384C15.1628 4.88977 15.4881 5.15682 15.6087 5.52786C15.7292 5.8989 15.623 6.30618 15.3366 6.57106L12.2857 9.39243L13.0955 13.4682C13.1716 13.8509 13.0181 14.2428 12.7025 14.4721C12.3869 14.7015 11.9667 14.7263 11.6263 14.5357L8.0002 12.506L4.37415 14.5357C4.03372 14.7263 3.61355 14.7015 3.29792 14.4721C2.9823 14.2428 2.82885 13.8509 2.90488 13.4682L3.71474 9.39243L0.663856 6.57106C0.377426 6.30618 0.271193 5.8989 0.391751 5.52786C0.51231 5.15682 0.837645 4.88977 1.22507 4.84384L5.35164 4.35457L7.09215 0.581154C7.25555 0.226888 7.61007 0 8.0002 0ZM8.0002 3.38751L6.9333 5.70055C6.78763 6.01636 6.48835 6.2338 6.14299 6.27475L3.61347 6.57466L5.48361 8.30411C5.73894 8.54024 5.85326 8.89207 5.78548 9.23319L5.28905 11.7316L7.51176 10.4874C7.81524 10.3175 8.18517 10.3175 8.48865 10.4874L10.7114 11.7316L10.2149 9.23319C10.1472 8.89207 10.2615 8.54024 10.5168 8.30411L12.3869 6.57466L9.85742 6.27475C9.51206 6.2338 9.21277 6.01636 9.06711 5.70055L8.0002 3.38751Z" fill="#657077"/>
</g>
<defs>
<clipPath id="clip0_3364_37742">
=======
<g clip-path="url(#clip0_12525_261704)">
<path fill-rule="evenodd" clip-rule="evenodd" d="M7.99923 0C8.38936 0 8.74388 0.226888 8.90728 0.581154L10.6478 4.35457L14.7744 4.84384C15.1618 4.88977 15.4871 5.15682 15.6077 5.52786C15.7282 5.8989 15.622 6.30618 15.3356 6.57106L12.2847 9.39243L13.0945 13.4682C13.1706 13.8509 13.0171 14.2428 12.7015 14.4721C12.3859 14.7015 11.9657 14.7263 11.6253 14.5357L7.99923 12.506L4.37317 14.5357C4.03274 14.7263 3.61257 14.7015 3.29695 14.4721C2.98132 14.2428 2.82787 13.8509 2.90391 13.4682L3.71376 9.39243L0.66288 6.57106C0.376449 6.30618 0.270216 5.8989 0.390775 5.52786C0.511333 5.15682 0.836668 4.88977 1.22409 4.84384L5.35066 4.35457L7.09117 0.581154C7.25458 0.226888 7.60909 0 7.99923 0Z" fill="#657077"/>
</g>
<defs>
<clipPath id="clip0_12525_261704">
>>>>>>> develop
<rect width="16" height="16" fill="white"/>
</clipPath>
</defs>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 961 B

4
public/images/catalog.recent.react.svg
View File

@ -1,7 +1,3 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<<<<<<< HEAD
<path fill-rule="evenodd" clip-rule="evenodd" d="M2 8C2 4.68629 4.68629 2 8 2C11.3137 2 14 4.68629 14 8C14 11.3137 11.3137 14 8 14C4.68629 14 2 11.3137 2 8ZM8 0C3.58172 0 0 3.58172 0 8C0 12.4183 3.58172 16 8 16C12.4183 16 16 12.4183 16 8C16 3.58172 12.4183 0 8 0ZM7 3.5V9C7 9.55228 7.44772 10 8 10H11V8H9V3.5H7Z" fill="#657077"/>
=======
<path fill-rule="evenodd" clip-rule="evenodd" d="M8 16C12.4183 16 16 12.4183 16 8C16 3.58172 12.4183 0 8 0C3.58172 0 0 3.58172 0 8C0 12.4183 3.58172 16 8 16ZM7 3V9C7 9.55228 7.44772 10 8 10H12V8H9V3H7Z" fill="#657077"/>
>>>>>>> develop
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 690 B

After

Width:  |  Height:  |  Size: 323 B

4
public/images/catalog.user.react.svg
View File

@ -1,7 +1,4 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<<<<<<< HEAD
<path d="M7.99997 1L7.99999 0L7.99997 1ZM2.09635 14.0067L3.0834 14.1671L2.09635 14.0067ZM6.072 9.90315L6.54435 9.02174H6.54434L6.072 9.90315ZM9.92868 9.90322L9.4563 9.02182H9.4563L9.92868 9.90322ZM10.572 9.64271L10.573 8.64271H10.573L10.572 9.64271ZM13.9047 14.0067L14.8918 13.8462V13.8462L13.9047 14.0067ZM8.99966 3.49996C8.99966 4.41142 8.84443 5.10385 8.6175 5.52952C8.4105 5.9178 8.20629 5.99996 8.0002 5.99996V7.99996C9.12744 7.99996 9.92297 7.33211 10.3824 6.4704C10.8218 5.64607 10.9997 4.5885 10.9997 3.49996H8.99966ZM8.99966 2.99973V3.49996H10.9997V2.99973H8.99966ZM7.99995 2C8.55208 2.00001 8.99966 2.4476 8.99966 2.99973H10.9997C10.9997 1.34305 9.65667 3.57628e-05 7.99999 0L7.99995 2ZM7.0002 2.99973C7.0002 2.44759 7.44781 1.99999 7.99995 2L7.99999 0C6.34326 -3.57628e-05 5.0002 1.343 5.0002 2.99973H7.0002ZM7.0002 3.49996V2.99973H5.0002V3.49996H7.0002ZM8.0002 5.99996C7.79403 5.99996 7.58967 5.91771 7.38255 5.52937C7.15553 5.1037 7.0002 4.41131 7.0002 3.49996H5.0002C5.0002 4.58861 5.1782 5.64621 5.61785 6.47055C6.0774 7.33221 6.87304 7.99996 8.0002 7.99996V5.99996ZM5.42914 8.64271C3.85407 8.64271 2.81753 9.64685 2.19537 10.6849C1.57614 11.7181 1.25546 12.9469 1.1093 13.8463L3.0834 14.1671C3.2084 13.3979 3.47235 12.4448 3.91086 11.7131C4.34643 10.9863 4.84071 10.6427 5.42914 10.6427V8.64271ZM6.54434 9.02174C6.41951 8.95484 6.25972 8.86846 6.10857 8.80228C5.97301 8.74293 5.72285 8.64271 5.42914 8.64271V10.6427C5.35003 10.6427 5.29839 10.6288 5.28696 10.6256C5.27422 10.622 5.27857 10.6222 5.30644 10.6344C5.33331 10.6461 5.37002 10.6638 5.42165 10.6903C5.47345 10.717 5.53001 10.7472 5.59965 10.7846L6.54434 9.02174ZM8.00057 9.49986C7.46412 9.49986 7.02309 9.2783 6.54435 9.02174L5.59965 10.7846C6.06212 11.0324 6.9068 11.4999 8.00057 11.4999V9.49986ZM9.4563 9.02182C8.97758 9.27839 8.53672 9.49986 8.00057 9.49986V11.4999C9.0941 11.4999 9.93865 11.0324 10.401 10.7846L9.4563 9.02182ZM10.573 8.64271C10.2787 8.64243 10.0282 8.74278 9.89248 8.80217C9.74118 8.86839 9.58122 8.95487 9.4563 9.02182L10.401 10.7846C10.4707 10.7473 10.5273 10.717 10.5792 10.6903C10.6308 10.6637 10.6676 10.6461 10.6944 10.6344C10.7223 10.6222 10.7266 10.6221 10.7137 10.6257C10.7022 10.6289 10.6504 10.6428 10.571 10.6427L10.573 8.64271ZM14.8918 13.8462C14.7456 12.9471 14.4249 11.7188 13.8056 10.6859C13.1835 9.64797 12.1473 8.64423 10.573 8.64271L10.571 10.6427C11.1601 10.6433 11.6547 10.9876 12.0902 11.7142C12.5288 12.4457 12.7927 13.3984 12.9177 14.1672L14.8918 13.8462ZM13.0006 16C14.073 16 15.0942 15.091 14.8918 13.8462L12.9177 14.1672C12.9149 14.1496 12.9152 14.1217 12.9249 14.0908C12.9342 14.0614 12.9487 14.0397 12.9618 14.0256C12.9869 13.9987 13.0055 14 13.0006 14V16ZM3.00057 16H13.0006V14H3.00057V16ZM1.1093 13.8463C0.907021 15.091 1.9281 16 3.00057 16V14C2.99566 14 3.01424 13.9987 3.03936 14.0256C3.05244 14.0396 3.06691 14.0614 3.0762 14.0908C3.08596 14.1217 3.08625 14.1495 3.0834 14.1671L1.1093 13.8463Z" fill="#657077"/>
=======
<g clip-path="url(#clip0_336_34052)">
<path fill-rule="evenodd" clip-rule="evenodd" d="M7.99961 7.99994C9.99961 7.99994 10.9996 5.18818 10.9996 2.96465C10.9992 1.32721 9.67165 3.27366e-05 8.03421 5.57118e-10H7.96432C6.32697 -3.13999e-05 4.99961 1.3273 4.99961 2.96465C4.99961 5.18818 5.99961 7.99994 7.99961 7.99994ZM1.07807 15.0055C1.34902 12.9127 2.37806 9 4.9998 9C5.18281 9 5.43281 9.13397 5.7498 9.30385C6.29884 9.59808 7.04884 10 7.9998 10C8.95045 10 9.70027 9.59815 10.2493 9.30392C10.5665 9.1339 10.8167 8.99982 10.9998 9C13.6215 9.00252 14.6505 12.9133 14.9215 15.0055C14.9924 15.5532 14.5521 16 13.9998 16H1.9998C1.44751 16 1.00716 15.5532 1.07807 15.0055Z" fill="#657077"/>
</g>
@ -10,5 +7,4 @@
<rect width="16" height="16" fill="white" transform="translate(-0.000488281)"/>
</clipPath>
</defs>
>>>>>>> develop
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 932 B