Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #792 from ONLYOFFICE/feature/pr12-fix-bug-44009

Browse source 
[common] fix bug 44009, added logo for dark theme
This commit is contained in:
maxkadushkin 2021-04-06 16:26:56 +03:00 committed by GitHub
parent 1637bd64c4 68e41a2ffe
commit 5103c1a194
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/common/main/resources/img/about/logo-white_s.svg Normal file
View file

@ -0,0 +1,6 @@
<svg width="245" height="45" viewBox="0 0 245 45" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M64.7249 13.8022C62.4284 15.6827 61.3173 18.5757 61.3173 22.4089C61.3173 26.2422 62.4284 29.1352 64.7249 31.088C67.0213 33.0408 69.614 33.981 72.6512 33.981C75.6143 33.981 78.2812 33.0408 80.5035 31.088C82.7258 29.2075 83.837 26.3145 83.837 22.4813C83.837 18.5757 82.7258 15.755 80.5035 13.8022C78.2812 11.8494 75.6884 10.9092 72.6512 10.9092C69.614 10.9092 66.9472 11.8494 64.7249 13.8022ZM67.688 28.195C66.725 26.9654 66.2064 25.085 66.2064 22.4089C66.2064 19.8052 66.725 17.8524 67.688 16.7675C68.7251 15.538 69.8362 14.7424 71.0215 14.4531L71.0215 14.4531C71.3178 14.3808 71.6141 14.3085 71.8364 14.3085C72.0586 14.2362 72.2808 14.2362 72.5771 14.2362C72.7253 14.2362 72.8549 14.2542 72.9846 14.2723C73.1142 14.2904 73.2438 14.3085 73.392 14.3085C73.6142 14.3085 73.9105 14.3808 74.2069 14.4531C75.3921 14.7424 76.5033 15.538 77.4663 16.7675C78.4293 17.9971 78.9479 19.8775 78.9479 22.4813C78.9479 25.0126 78.4293 26.9654 77.4663 28.195C76.5033 29.4245 75.3921 30.2201 74.2069 30.5094C74.1561 30.5218 74.1075 30.5342 74.0604 30.5462L74.0601 30.5462L74.0601 30.5462C73.8321 30.6044 73.6375 30.654 73.392 30.654C73.0957 30.7264 72.8734 30.7264 72.5771 30.7264C72.466 30.7264 72.3364 30.7083 72.2067 30.6902C72.0771 30.6721 71.9475 30.654 71.8364 30.654C71.5909 30.654 71.3962 30.6044 71.1682 30.5462L71.168 30.5462L71.1676 30.5461C71.1206 30.5341 71.0721 30.5217 71.0215 30.5094C69.8362 30.2201 68.7251 29.4245 67.688 28.195ZM92.356 11.1262H86.2816V33.6918H90.9485V20.3839L90.8745 16.406H90.9485L92.1338 18.9374L100.134 33.6918H106.209V11.1262H101.542V24.3618L101.616 28.412H101.542L100.356 25.302L92.356 11.1262ZM111.024 11.1262H115.691V29.8585H124.876V33.6918H111.024V11.1262ZM127.395 11.1262H121.987L130.506 24.4341V33.6918H135.173V24.5064L143.544 11.1262H138.581L133.766 19.0097L133.025 20.6009H132.877L132.136 19.0097L127.395 11.1262ZM142.951 22.4089C142.951 18.5757 144.063 15.6827 146.359 13.8022C148.581 11.8494 151.248 10.9092 154.285 10.9092C157.323 10.9092 159.915 11.8494 162.138 13.8022C164.36 15.755 165.471 18.5757 165.471 22.4812C165.471 26.3145 164.36 29.2075 162.138 31.088C159.915 33.0408 157.248 33.981 154.285 33.981C151.248 33.981 148.655 33.0408 146.359 31.088C144.137 29.1352 142.951 26.2422 142.951 22.4089ZM147.841 22.4089C147.841 25.085 148.359 26.9654 149.322 28.195C150.359 29.4245 151.396 30.2201 152.656 30.5094C152.697 30.5196 152.738 30.5298 152.777 30.5398L152.802 30.5462C153.03 30.6044 153.225 30.654 153.471 30.654C153.582 30.654 153.711 30.6721 153.841 30.6902C153.971 30.7083 154.1 30.7264 154.211 30.7264C154.508 30.7264 154.73 30.7264 155.026 30.654C155.272 30.654 155.466 30.6044 155.694 30.5462L155.695 30.5461C155.742 30.5341 155.79 30.5217 155.841 30.5094C157.026 30.2201 158.137 29.4245 159.1 28.195C160.063 26.9654 160.582 25.0126 160.582 22.4812C160.582 19.8775 160.063 17.9971 159.1 16.7675C158.137 15.538 157.026 14.7424 155.841 14.4531C155.545 14.3808 155.248 14.3085 155.026 14.3085C154.878 14.3085 154.748 14.2904 154.619 14.2723C154.489 14.2542 154.359 14.2361 154.211 14.2361C153.915 14.2361 153.693 14.2362 153.471 14.3085C153.248 14.3085 152.952 14.3808 152.656 14.4531C151.47 14.7424 150.359 15.538 149.322 16.7675C148.359 17.8524 147.841 19.8052 147.841 22.4089ZM181.62 11.1262H168.73V33.6918H173.397V24.2171H181.25V20.3839H173.397V14.8871H181.62V11.1262ZM185.102 11.1262H197.991V14.8871H189.769V20.3839H197.621V24.2171H189.769V33.6918H185.102V11.1262ZM200.732 11.1262V33.6918H205.399V11.1262H200.732ZM225.963 11.6323V15.5379C225.148 15.2486 224.333 15.0316 223.444 14.887C222.555 14.7423 221.518 14.67 220.481 14.67C218.036 14.67 216.184 15.3932 214.851 16.9121C213.518 18.3586 212.851 20.239 212.851 22.4811C212.851 24.6509 213.443 26.459 214.703 27.9055C215.962 29.352 217.74 30.1476 220.036 30.1476C220.741 30.1476 221.445 30.0936 222.245 30.0323C222.37 30.0226 222.498 30.0128 222.629 30.003C223.592 29.8583 224.555 29.6413 225.592 29.2074L225.889 33.0406C225.74 33.113 225.518 33.1853 225.296 33.2576C225 33.33 224.703 33.4023 224.333 33.4746C223.95 33.568 223.506 33.6312 223 33.7033L223 33.7033C222.722 33.7428 222.426 33.785 222.111 33.8362C221.222 33.9086 220.333 33.9809 219.37 33.9809H218.999H218.629C215.962 33.8362 213.518 32.8237 211.295 31.0879C209.073 29.2797 207.962 26.459 207.962 22.6981C207.962 19.0095 209.073 16.1165 211.221 14.0914C213.369 12.0663 216.333 11.0537 219.962 11.0537C220.925 11.0537 221.814 11.0537 222.555 11.126C223.26 11.1886 223.91 11.3054 224.6 11.4295L224.601 11.4296C224.708 11.4488 224.816 11.4682 224.926 11.4877C225 11.5238 225.092 11.5419 225.185 11.56C225.277 11.5781 225.37 11.5962 225.444 11.6323C225.539 11.5862 225.633 11.5989 225.747 11.6141C225.811 11.6228 225.882 11.6323 225.963 11.6323ZM243.519 11.1262H229.667V33.6918H243.519V30.1478H234.408V23.7832H242.63V20.3116H234.408V14.6702H243.519V11.1262Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M21.4402 44.448L1.28816 35.1797C-0.428493 34.3706 -0.428493 33.1201 1.28816 32.3845L8.30407 29.1479L21.3656 35.1797C23.0823 35.9889 25.8438 35.9889 27.4859 35.1797L40.5474 29.1479L47.5633 32.3845C49.2799 33.1936 49.2799 34.4441 47.5633 35.1797L27.4112 44.448C25.8438 45.1836 23.0823 45.1836 21.4402 44.448Z" fill="white" fill-opacity="0.5"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M21.4402 33.0471L1.28816 23.7788C-0.428493 22.9696 -0.428493 21.7191 1.28816 20.9836L8.15479 17.8206L21.4402 23.9259C23.1569 24.735 25.9184 24.735 27.5605 23.9259L40.8459 17.8206L47.7125 20.9836C49.4292 21.7927 49.4292 23.0432 47.7125 23.7788L27.5605 33.0471C25.8438 33.8562 23.0822 33.8562 21.4402 33.0471Z" fill="white" fill-opacity="0.75"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M21.4396 21.9387L1.28749 12.6704C-0.429164 11.8612 -0.429164 10.6108 1.28749 9.87517L21.4396 0.606854C23.1562 -0.202285 25.9178 -0.202285 27.5598 0.606854L47.7119 9.87517C49.4285 10.6843 49.4285 11.9348 47.7119 12.6704L27.5598 21.9387C25.8432 22.6743 23.0816 22.6743 21.4396 21.9387Z" fill="white"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 6 KiB

BIN
apps/common/main/resources/img/about/logo.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.5 KiB

BIN
apps/common/main/resources/img/about/logo@2x.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 7.3 KiB

6
apps/common/main/resources/img/about/logo_s.svg Normal file
View file

@ -0,0 +1,6 @@
<svg width="245" height="45" viewBox="0 0 245 45" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M64.7249 13.8022C62.4284 15.6827 61.3173 18.5757 61.3173 22.4089C61.3173 26.2422 62.4284 29.1352 64.7249 31.088C67.0213 33.0408 69.614 33.981 72.6512 33.981C75.6143 33.981 78.2812 33.0408 80.5035 31.088C82.7258 29.2075 83.837 26.3145 83.837 22.4813C83.837 18.5757 82.7258 15.755 80.5035 13.8022C78.2812 11.8494 75.6884 10.9092 72.6512 10.9092C69.614 10.9092 66.9472 11.8494 64.7249 13.8022ZM67.688 28.195C66.725 26.9654 66.2064 25.085 66.2064 22.4089C66.2064 19.8052 66.725 17.8524 67.688 16.7675C68.7251 15.538 69.8362 14.7424 71.0215 14.4531L71.0215 14.4531C71.3178 14.3808 71.6141 14.3085 71.8364 14.3085C72.0586 14.2362 72.2808 14.2362 72.5771 14.2362C72.7253 14.2362 72.8549 14.2542 72.9846 14.2723C73.1142 14.2904 73.2438 14.3085 73.392 14.3085C73.6142 14.3085 73.9105 14.3808 74.2069 14.4531C75.3921 14.7424 76.5033 15.538 77.4663 16.7675C78.4293 17.9971 78.9479 19.8775 78.9479 22.4813C78.9479 25.0126 78.4293 26.9654 77.4663 28.195C76.5033 29.4245 75.3921 30.2201 74.2069 30.5094C74.1561 30.5218 74.1075 30.5342 74.0604 30.5462L74.0601 30.5462L74.0601 30.5462C73.8321 30.6044 73.6375 30.654 73.392 30.654C73.0957 30.7264 72.8734 30.7264 72.5771 30.7264C72.466 30.7264 72.3364 30.7083 72.2067 30.6902C72.0771 30.6721 71.9475 30.654 71.8364 30.654C71.5909 30.654 71.3962 30.6044 71.1682 30.5462L71.168 30.5462L71.1676 30.5461C71.1206 30.5341 71.0721 30.5217 71.0215 30.5094C69.8362 30.2201 68.7251 29.4245 67.688 28.195ZM92.356 11.1262H86.2816V33.6918H90.9485V20.3839L90.8745 16.406H90.9485L92.1338 18.9374L100.134 33.6918H106.209V11.1262H101.542V24.3618L101.616 28.412H101.542L100.356 25.302L92.356 11.1262ZM111.024 11.1262H115.691V29.8585H124.876V33.6918H111.024V11.1262ZM127.395 11.1262H121.987L130.506 24.4341V33.6918H135.173V24.5064L143.544 11.1262H138.581L133.766 19.0097L133.025 20.6009H132.877L132.136 19.0097L127.395 11.1262ZM142.951 22.4089C142.951 18.5757 144.063 15.6827 146.359 13.8022C148.581 11.8494 151.248 10.9092 154.285 10.9092C157.323 10.9092 159.915 11.8494 162.138 13.8022C164.36 15.755 165.471 18.5757 165.471 22.4812C165.471 26.3145 164.36 29.2075 162.138 31.088C159.915 33.0408 157.248 33.981 154.285 33.981C151.248 33.981 148.655 33.0408 146.359 31.088C144.137 29.1352 142.951 26.2422 142.951 22.4089ZM147.841 22.4089C147.841 25.085 148.359 26.9654 149.322 28.195C150.359 29.4245 151.396 30.2201 152.656 30.5094C152.697 30.5196 152.738 30.5298 152.777 30.5398L152.802 30.5462C153.03 30.6044 153.225 30.654 153.471 30.654C153.582 30.654 153.711 30.6721 153.841 30.6902C153.971 30.7083 154.1 30.7264 154.211 30.7264C154.508 30.7264 154.73 30.7264 155.026 30.654C155.272 30.654 155.466 30.6044 155.694 30.5462L155.695 30.5461C155.742 30.5341 155.79 30.5217 155.841 30.5094C157.026 30.2201 158.137 29.4245 159.1 28.195C160.063 26.9654 160.582 25.0126 160.582 22.4812C160.582 19.8775 160.063 17.9971 159.1 16.7675C158.137 15.538 157.026 14.7424 155.841 14.4531C155.545 14.3808 155.248 14.3085 155.026 14.3085C154.878 14.3085 154.748 14.2904 154.619 14.2723C154.489 14.2542 154.359 14.2361 154.211 14.2361C153.915 14.2361 153.693 14.2362 153.471 14.3085C153.248 14.3085 152.952 14.3808 152.656 14.4531C151.47 14.7424 150.359 15.538 149.322 16.7675C148.359 17.8524 147.841 19.8052 147.841 22.4089ZM181.62 11.1262H168.73V33.6918H173.397V24.2171H181.25V20.3839H173.397V14.8871H181.62V11.1262ZM185.102 11.1262H197.991V14.8871H189.769V20.3839H197.621V24.2171H189.769V33.6918H185.102V11.1262ZM200.732 11.1262V33.6918H205.399V11.1262H200.732ZM225.963 11.6323V15.5379C225.148 15.2486 224.333 15.0316 223.444 14.887C222.555 14.7423 221.518 14.67 220.481 14.67C218.036 14.67 216.184 15.3932 214.851 16.9121C213.518 18.3586 212.851 20.239 212.851 22.4811C212.851 24.6509 213.443 26.459 214.703 27.9055C215.962 29.352 217.74 30.1476 220.036 30.1476C220.741 30.1476 221.445 30.0936 222.245 30.0323C222.37 30.0226 222.498 30.0128 222.629 30.003C223.592 29.8583 224.555 29.6413 225.592 29.2074L225.889 33.0406C225.74 33.113 225.518 33.1853 225.296 33.2576C225 33.33 224.703 33.4023 224.333 33.4746C223.95 33.568 223.506 33.6312 223 33.7033L223 33.7033C222.722 33.7428 222.426 33.785 222.111 33.8362C221.222 33.9086 220.333 33.9809 219.37 33.9809H218.999H218.629C215.962 33.8362 213.518 32.8237 211.295 31.0879C209.073 29.2797 207.962 26.459 207.962 22.6981C207.962 19.0095 209.073 16.1165 211.221 14.0914C213.369 12.0663 216.333 11.0537 219.962 11.0537C220.925 11.0537 221.814 11.0537 222.555 11.126C223.26 11.1886 223.91 11.3054 224.6 11.4295L224.601 11.4296C224.708 11.4488 224.816 11.4682 224.926 11.4877C225 11.5238 225.092 11.5419 225.185 11.56C225.277 11.5781 225.37 11.5962 225.444 11.6323C225.539 11.5862 225.633 11.5989 225.747 11.6141C225.811 11.6228 225.882 11.6323 225.963 11.6323ZM243.519 11.1262H229.667V33.6918H243.519V30.1478H234.408V23.7832H242.63V20.3116H234.408V14.6702H243.519V11.1262Z" fill="#333333"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M21.4402 44.448L1.28816 35.1797C-0.428493 34.3706 -0.428493 33.1201 1.28816 32.3845L8.30407 29.1479L21.3656 35.1797C23.0823 35.9889 25.8438 35.9889 27.4859 35.1797L40.5474 29.1479L47.5633 32.3845C49.2799 33.1936 49.2799 34.4441 47.5633 35.1797L27.4112 44.448C25.8438 45.1836 23.0823 45.1836 21.4402 44.448Z" fill="#FF6F3D"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M21.4402 33.0471L1.28816 23.7788C-0.428493 22.9696 -0.428493 21.7191 1.28816 20.9836L8.15479 17.8206L21.4402 23.9259C23.1569 24.735 25.9184 24.735 27.5605 23.9259L40.8459 17.8206L47.7125 20.9836C49.4292 21.7927 49.4292 23.0432 47.7125 23.7788L27.5605 33.0471C25.8438 33.8562 23.0822 33.8562 21.4402 33.0471Z" fill="#95C038"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M21.4396 21.9387L1.28749 12.6704C-0.429164 11.8612 -0.429164 10.6108 1.28749 9.87517L21.4396 0.606854C23.1562 -0.202285 25.9178 -0.202285 27.5598 0.606854L47.7119 9.87517C49.4285 10.6843 49.4285 11.9348 47.7119 12.6704L27.5598 21.9387C25.8432 22.6743 23.0816 22.6743 21.4396 21.9387Z" fill="#5DC0E8"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 5.9 KiB

17
apps/common/main/resources/less/about.less
View file

@ -4,18 +4,15 @@
margin-bottom: 5px;
&:before {
content: if(@icon-src-base64, data-uri(%("%s",'@{common-image-path}/about/logo.png')), ~"url('@{common-image-const-path}/about/logo.png')");
//content: if(@icon-src-base64, data-uri(%("%s",'@{common-image-path}/about/logo.png')), ~"url('@{common-image-const-path}/about/logo.png')");
content: ~"url('@{common-image-const-path}/about/logo_s.svg')";
@media only screen {
@media (-webkit-min-device-pixel-ratio: 2),
(min-resolution: 2dppx),
(min-resolution: 192dpi)
{
content: ~"url('@{common-image-const-path}/about/logo@2x.png')";
display: block;
transform: scale(.5);
}
.theme-dark & {
content: ~"url('@{common-image-const-path}/about/logo-white_s.svg')";
}
height: 45px;
width: auto;
}
}