From f640451257fd23ba34a8462fbb07921988afbe76b34ad7364ced1cc5ff64b2ed Mon Sep 17 00:00:00 2001 From: AidarKC Date: Wed, 22 Jul 2026 15:20:05 +0400 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=D1=82=D1=8C=20=D0=BF=D1=80=D0=BE=D1=84=D0=B8=D0=BB=D1=8C?= =?UTF-8?q?=D0=BD=D1=8B=D0=B5=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=B8=20=D0=BD=D0=B0=D0=B2=D0=B8=D0=B3=D0=B0=D1=86=D0=B8=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VERSION.properties | 4 ++-- shine-UI/assets/profile-icon-settings.svg | 12 +++--------- shine-UI/js/pages/profile-edit-view.js | 2 +- shine-UI/js/pages/profile-view.js | 4 ++-- shine-UI/js/pages/settings-view.js | 4 ---- shine-UI/js/pages/wallet-view.js | 2 +- shine-UI/styles/components.css | 14 +++++++------- 7 files changed, 16 insertions(+), 26 deletions(-) diff --git a/VERSION.properties b/VERSION.properties index 2aadb317..0af54c47 100644 --- a/VERSION.properties +++ b/VERSION.properties @@ -1,2 +1,2 @@ -client.version=1.2.341 -server.version=1.2.313 +client.version=1.2.342 +server.version=1.2.314 diff --git a/shine-UI/assets/profile-icon-settings.svg b/shine-UI/assets/profile-icon-settings.svg index 1364d2a1..ec391c81 100644 --- a/shine-UI/assets/profile-icon-settings.svg +++ b/shine-UI/assets/profile-icon-settings.svg @@ -1,12 +1,6 @@ - - - - - - - - - + + + diff --git a/shine-UI/js/pages/profile-edit-view.js b/shine-UI/js/pages/profile-edit-view.js index f56e2fed..b86ac20c 100644 --- a/shine-UI/js/pages/profile-edit-view.js +++ b/shine-UI/js/pages/profile-edit-view.js @@ -96,7 +96,7 @@ export function render({ navigate }) { screen.append( renderHeader({ title: 'Редактирование профиля', - leftAction: { label: '←', onClick: () => navigate('settings-view') }, + leftAction: { label: '←', onClick: () => navigate('profile-view') }, }), ); diff --git a/shine-UI/js/pages/profile-view.js b/shine-UI/js/pages/profile-view.js index b9ada1bb..4682f5bf 100644 --- a/shine-UI/js/pages/profile-view.js +++ b/shine-UI/js/pages/profile-view.js @@ -101,7 +101,7 @@ export function render({ navigate }) { const topActions = document.createElement('div'); topActions.className = 'profile-top-actions'; topActions.innerHTML = ` - `; - topActions.querySelector('[data-top-action="profile"]')?.addEventListener('click', () => navigate('profile')); + topActions.querySelector('[data-top-action="profile"]')?.addEventListener('click', () => navigate('profile-edit-view')); topActions.querySelector('[data-top-action="wallet"]')?.addEventListener('click', () => navigate('wallet')); topActions.querySelector('[data-top-action="settings"]')?.addEventListener('click', () => navigate('settings-view')); diff --git a/shine-UI/js/pages/settings-view.js b/shine-UI/js/pages/settings-view.js index e946644d..05a47605 100644 --- a/shine-UI/js/pages/settings-view.js +++ b/shine-UI/js/pages/settings-view.js @@ -41,8 +41,6 @@ export function render({ navigate }) { const card = document.createElement('div'); card.className = 'card stack'; card.innerHTML = ` - - @@ -52,8 +50,6 @@ export function render({ navigate }) { `; - card.querySelector('#settings-profile-edit').addEventListener('click', () => navigate('profile-edit-view')); - card.querySelector('#settings-wallet').addEventListener('click', () => navigate('wallet-view')); card.querySelector('#settings-links').addEventListener('click', () => { navigate(makeProfileLinksRoute(state.session.login)); }); diff --git a/shine-UI/js/pages/wallet-view.js b/shine-UI/js/pages/wallet-view.js index 10826498..2462493e 100644 --- a/shine-UI/js/pages/wallet-view.js +++ b/shine-UI/js/pages/wallet-view.js @@ -433,7 +433,7 @@ export function render({ navigate }) { screen.append( renderHeader({ title: 'Кошелёк', - leftAction: { label: '←', onClick: () => navigate('settings-view') }, + leftAction: { label: '←', onClick: () => navigate('profile-view') }, }), content, status, diff --git a/shine-UI/styles/components.css b/shine-UI/styles/components.css index d2d9945c..30b0bacd 100644 --- a/shine-UI/styles/components.css +++ b/shine-UI/styles/components.css @@ -5605,20 +5605,20 @@ html, body { overflow-x: hidden; } .profile-top-action-btn { position: relative; - width: 42px; - height: 42px; - min-width: 42px; - min-height: 42px; + width: 48px; + height: 48px; + min-width: 48px; + min-height: 48px; padding: 0; display: inline-flex; align-items: center; justify-content: center; - border-radius: 14px; + border-radius: 15px; } .profile-top-icon-btn img { - width: 22px; - height: 22px; + width: 44px; + height: 44px; display: block; opacity: 0.94; filter: drop-shadow(0 1px 4px rgba(0, 0, 0, 0.34));