From 539bee51bdb3165657f5d494c4c0067782f25a13 Mon Sep 17 00:00:00 2001 From: Dmitry Tretyakov <76806170+tretdm@users.noreply.github.com> Date: Tue, 25 Apr 2023 19:15:00 +0700 Subject: [PATCH 1/4] =?UTF-8?q?=D0=9F=D0=BE=D1=81=D0=BB=D0=B5=D0=B4=D0=BD?= =?UTF-8?q?=D0=B8=D0=B9=20=D1=88=D1=82=D1=80=D0=B8=D1=85,=20=D0=BD=D0=B0?= =?UTF-8?q?=20=D1=8D=D1=82=D0=BE=D0=BC=20=D0=B2=D1=81=D0=B5=20-=20=D1=81?= =?UTF-8?q?=20=D0=B1=D1=8B=D1=81=D1=82=D1=80=D0=BE=D0=B9=20=D1=81=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE=D0=B9=20=D0=B0=D0=B2=D0=B0=D1=82=D0=B0=D1=80?= =?UTF-8?q?=D0=BE=D0=BA=20=D0=B7=D0=B0=D0=BA=D0=BE=D0=BD=D1=87=D0=B8=D0=BB?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Web/static/js/openvk.cls.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Web/static/js/openvk.cls.js b/Web/static/js/openvk.cls.js index 571223a0..c43aba38 100644 --- a/Web/static/js/openvk.cls.js +++ b/Web/static/js/openvk.cls.js @@ -110,7 +110,11 @@ document.addEventListener("DOMContentLoaded", function() { //BEGIN u("#_newPicture").on("click", function(e) { MessageBox(tr('new_photo'), "
"+ - "
"+tr('real_photo')+"

"+tr('formats')+"

"+"

"+tr('upload_problems')+"
"+ + "
"+tr('formats')+"

"+ + ""+ + "
"+ + "

"+tr('upload_problems')+"
"+ //"

"+tr('leave_photo')+"

"+ ""+ "
", [ @@ -130,7 +134,11 @@ document.addEventListener("DOMContentLoaded", function() { //BEGIN u("#_newAvatarPicture").on("click", function(e) { MessageBox(tr('new_photo'), "
"+ - "
"+tr('good_photo')+"

"+tr('formats')+"

"+"

"+tr('upload_problems')+"
"+ + "
"+tr('good_photo')+ + "

"+tr('formats')+"

"+ + ""+ + "
"+ //"

"+tr('leave_photo')+"

"+ ""+ "", [ From 85f8f45c04df4b855d0d91d9d272fa51ee06114f Mon Sep 17 00:00:00 2001 From: Dmitry Tretyakov <76806170+tretdm@users.noreply.github.com> Date: Tue, 25 Apr 2023 19:17:49 +0700 Subject: [PATCH 2/4] i forgor --- Web/static/js/openvk.cls.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Web/static/js/openvk.cls.js b/Web/static/js/openvk.cls.js index c43aba38..dd2c89a0 100644 --- a/Web/static/js/openvk.cls.js +++ b/Web/static/js/openvk.cls.js @@ -139,6 +139,7 @@ document.addEventListener("DOMContentLoaded", function() { //BEGIN ""+ "
"+ + "

"+tr('upload_problems')+"
"+ //"

"+tr('leave_photo')+"

"+ ""+ "", [ From 353efccca835b86586c8af91e596aba62f0b46c0 Mon Sep 17 00:00:00 2001 From: makar0nny <99399973+lalka2016@users.noreply.github.com> Date: Sun, 30 Apr 2023 10:28:29 +0300 Subject: [PATCH 3/4] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D0=B7=D1=80=D0=B0=D1=87=D0=BD=D0=BE=D1=81?= =?UTF-8?q?=D1=82=D0=B8=20=D0=B8=D0=BA=D0=BE=D0=BD=D0=BA=D0=B5=20=D0=B7?= =?UTF-8?q?=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B8,=20=D0=B8=D1=81?= =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BA=D1=80=D0=B8=D0=BD?= =?UTF-8?q?=D0=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Добавил прозрачности кнопке загрузки, убрал повторяющиеся классы у CSS, исправил кринж который я понаделал --- Web/Presenters/templates/Group/View.xml | 23 +++++++++++----------- Web/Presenters/templates/User/View.xml | 7 +++---- Web/static/css/avataredit.css | 26 +++---------------------- 3 files changed, 17 insertions(+), 39 deletions(-) diff --git a/Web/Presenters/templates/Group/View.xml b/Web/Presenters/templates/Group/View.xml index 219b751e..9189664e 100644 --- a/Web/Presenters/templates/Group/View.xml +++ b/Web/Presenters/templates/Group/View.xml @@ -98,28 +98,28 @@ {var $avatarLink = ((is_null($avatarPhoto) ? FALSE : $avatarPhoto->isAnonymous()) ? "/photo" . ("s/" . base_convert((string) $avatarPhoto->getId(), 10, 32)) : $club->getAvatarLink())}
{if !is_null($thisUser) && $club->canBeModifiedBy($thisUser)} {if is_null($avatarPhoto) == true} - {_add_photo} + {_add_photo} {else} - -
diff --git a/Web/Presenters/templates/User/View.xml b/Web/Presenters/templates/User/View.xml index 711c8d2b..7d26d60e 100644 --- a/Web/Presenters/templates/User/View.xml +++ b/Web/Presenters/templates/User/View.xml @@ -74,7 +74,7 @@ {if !is_null($thisUser) && $user->getId() == $thisUser->getId()} onmouseover=" {if is_null($user->getAvatarPhoto()) == false && $user->getAvatarPhoto()->getURL() != "$serverUrl/assets/packages/static/openvk/img/camera_200.png"} _avatarDelete.style.backgroundColor='rgba(0, 0, 0, 0.7)'; - deleteButton.style.opacity='100%'; + deleteButton.style.opacity='0.7'; {/if} avatarChange.style.backgroundColor='rgba(0, 0, 0, 0.7)'; avatarChange.style.opacity='100%'; @@ -82,11 +82,10 @@ onmouseleave=" {if is_null($user->getAvatarPhoto()) == false && $user->getAvatarPhoto()->getURL() != "$serverUrl/assets/packages/static/openvk/img/camera_200.png"} _avatarDelete.style.backgroundColor='rgba(0, 0, 0, 0)'; - deleteButton.style.opacity='0%'; + deleteButton.style.opacity='0'; {/if} avatarChange.style.backgroundColor='rgba(0, 0, 0, 0)'; - avatarChange.style.opacity='0%'; - //pizdec + avatarChange.style.opacity='0'; "{/if}>
diff --git a/Web/static/css/avataredit.css b/Web/static/css/avataredit.css index df10bebc..85a72863 100644 --- a/Web/static/css/avataredit.css +++ b/Web/static/css/avataredit.css @@ -17,7 +17,7 @@ { opacity:0; } -#avatarChange, #_avatarDelete, #groupAvatarChange { +#avatarChange, #_avatarDelete, #_newPicture, #deleteButton, #_avatarDelete { -webkit-transition: all 200ms ease-in-out; -moz-transition: all 200ms ease-in-out; -o-transition: all 200ms ease-in-out; @@ -40,6 +40,7 @@ div#avatarAll:hover #avatarChange { } #uploadIcon { + opacity:75%; position:absolute; left:0; margin-left:20px; @@ -62,25 +63,4 @@ div#avatarAll:hover #avatarChange { .newpict:hover { color:#5680a0; -} -#groupAvatarChange -{ - position:absolute; - width:100px; - background-color:rgba(51, 51, 51, 0); - list-style-type: none; - font-size:11px; - padding-top:10px; - padding-bottom:10px; - opacity:0%; -} -#_newAvatarPicture2 -{ - position:absolute; - left:0; - margin-left:20px; -} -#_newAvatarPicture:hover -{ - color:#D9D9D9; -} +} \ No newline at end of file From 2993c688a9e3db602601057d547aa877bfa56897 Mon Sep 17 00:00:00 2001 From: makar0nny <99399973+lalka2016@users.noreply.github.com> Date: Sun, 30 Apr 2023 17:35:27 +0300 Subject: [PATCH 4/4] =?UTF-8?q?=D0=9E=D0=BA=2050%?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit И ещё иконка серая теперь --- Web/static/css/avataredit.css | 2 +- Web/static/img/upload.png | Bin 257 -> 211 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Web/static/css/avataredit.css b/Web/static/css/avataredit.css index 85a72863..6b003576 100644 --- a/Web/static/css/avataredit.css +++ b/Web/static/css/avataredit.css @@ -40,7 +40,7 @@ div#avatarAll:hover #avatarChange { } #uploadIcon { - opacity:75%; + opacity:50%; position:absolute; left:0; margin-left:20px; diff --git a/Web/static/img/upload.png b/Web/static/img/upload.png index 033009d2ae19ea404c6c1ecf3349f82919392f2c..e6280bc409ed82f60e09ba741372d77cfbe9ab7c 100644 GIT binary patch delta 146 zcmV;D0B!$)0@DGINq-Rl01FWTe`H^g0001JNkl#@`6HJ5nZ~)f{G{qT6?F3?GumA-71!8xg zbM}HbV8uX%azN?~5Q~ENXy7#vn*cRDVgxGW0CEliu_;If2RS$m#C9MzPX=Oq3PAuQ uKN;E0|Dj9_0CWOa9eQZs1%pB{0|Nl}?jkA&l8|!%0000