From b7af563fa20dc72a25994b87f5c8244e5702706f Mon Sep 17 00:00:00 2001 From: crythoughts <234468996+crythoughts@users.noreply.github.com> Date: Sun, 5 Jul 2026 14:48:26 +0300 Subject: [PATCH 1/2] update --- Web/Presenters/templates/@layout.latte | 60 ++- Web/Presenters/templates/Apps/Play.latte | 2 +- Web/Presenters/templates/Group/View.latte | 28 +- Web/Presenters/templates/User/Settings.latte | 56 +-- Web/Presenters/templates/User/View.latte | 84 ++-- Web/Presenters/templates/Wall/Post.latte | 8 +- .../templates/components/comment.latte | 8 +- .../components/post/microblogpost.latte | 12 +- .../templates/components/post/oldpost.latte | 30 +- Web/static/css/main.css | 20 +- Web/static/css/mobile.css | 375 +++++++++++++++--- Web/static/img/mobile/menu_icons.png | Bin 7058 -> 7464 bytes locales/en.strings | 1 + locales/ru.strings | 1 + 14 files changed, 506 insertions(+), 179 deletions(-) diff --git a/Web/Presenters/templates/@layout.latte b/Web/Presenters/templates/@layout.latte index 57ea20c62..f4c4ab44b 100644 --- a/Web/Presenters/templates/@layout.latte +++ b/Web/Presenters/templates/@layout.latte @@ -204,30 +204,57 @@ {$thisUser->getCanonicalName()} {_my_page} - {_my_friends} + + {_my_friends} + {_mobile_friends} ({$thisUser->getRequestsCount()}) - {_my_photos} - {_my_videos} - {_my_audios} - {_my_messages} + + {_my_photos} + {_mobile_photos} + + + {_my_videos} + {_mobile_videos} + + + {_my_audios} + {_mobile_audios} + + + {_my_messages} + {_mobile_messages} ({$unreadMessagesCount}) - {_my_notes} - {_my_groups} - {_my_feed} - {_my_feedback} + + {_my_notes} + {_mobile_notes} + + + {_my_groups} + {_mobile_groups} + + + {_my_feed} + {_news} + + + {_my_feedback} + {_feedback} ({$notificationsCount}) - {_my_settings} + + {_my_settings} + {_mobile_settings} + {if $thisUser->getLeftMenuItemStatus('docs') || $thisUser->getLeftMenuItemStatus('apps')} @@ -283,7 +310,12 @@ + {_header_search} {_mobile_desktop_version} + {_invite} + {_menu_support} + {_points} + {_menu_logout} -

+

-

OpenVK {php echo OPENVK_VERSION} | PHP: {phpversion()} | DB: {$dbVersion}

-

+

+ diff --git a/Web/Presenters/templates/Apps/Play.latte b/Web/Presenters/templates/Apps/Play.latte index 99065406f..c268ddeb0 100644 --- a/Web/Presenters/templates/Apps/Play.latte +++ b/Web/Presenters/templates/Apps/Play.latte @@ -32,7 +32,7 @@ -
+

{_app_dev}: {$owner->getFullName()}

diff --git a/Web/Presenters/templates/Group/View.latte b/Web/Presenters/templates/Group/View.latte index 6f9234c5b..72e4cb81f 100644 --- a/Web/Presenters/templates/Group/View.latte +++ b/Web/Presenters/templates/Group/View.latte @@ -4,7 +4,7 @@ {* default variables *} {var $hasAvatar = $hasAvatar ?? false} -{block title}{$club->getName()}{/block} +{block title}{$club->getName()}{/block} {block headIncludes} {if !$club->isBanned()} @@ -24,7 +24,7 @@ {block header} {$club->getName()} - + {_information} - +
- + @@ -63,9 +63,9 @@
{_name_group}:{$club->getName()}{$club->getName()}
{_description}:
-
+
{var $followersCount = $club->getFollowersCount()} - +
{_participants}
@@ -86,12 +86,12 @@ {$follower->getFirstName()} {$follower->getLastName()} - +
-
+
{_discussions}
@@ -111,7 +111,7 @@
-
+
{_audios}
@@ -129,7 +129,7 @@
- + @@ -266,7 +266,7 @@ -
+
{_albums}
@@ -281,7 +281,7 @@
{var $cover = $album->getCoverPhoto()} - + @@ -294,7 +294,7 @@
-
+
{_discussions}
@@ -313,7 +313,7 @@
-
+
{_documents}
diff --git a/Web/Presenters/templates/User/Settings.latte b/Web/Presenters/templates/User/Settings.latte index 3466bd1e4..3d3f2571b 100644 --- a/Web/Presenters/templates/User/Settings.latte +++ b/Web/Presenters/templates/User/Settings.latte @@ -35,8 +35,8 @@ {_interface}
- -
+ +
{if $isMain}
@@ -80,7 +80,7 @@ - + @@ -111,7 +111,7 @@ - + @@ -121,7 +121,7 @@
{_bookmarks_tab} - • + • {_s_posts}

{_you_can_also} {_delete_your_page}. @@ -170,7 +170,7 @@ - + @@ -261,11 +261,11 @@ - + {elseif $isPrivacy}
- +
{_privacy_setting_access_page} @@ -427,18 +427,18 @@
- + - +
- + {elseif $isFinance} - +
{presenter "openvk!Support->knowledgeBaseArticle", "points"} @@ -463,13 +463,13 @@ {script "js/node_modules/textfit/textFit.min.js"} - + {elseif $isFinanceTU} - +

{_voucher_explanation} {_voucher_explanation_ex}

- @@ -499,13 +499,13 @@ -

- +
- + {elseif $isInterface} - +

{_ui_settings_interface}

@@ -592,11 +592,11 @@ @@ -615,7 +615,7 @@
- + - +
- +

{_ui_settings_timezone}

@@ -631,10 +631,10 @@ @@ -774,7 +774,7 @@
- + - {_save} + {_save}
- + @@ -798,7 +798,7 @@ @@ -809,5 +809,5 @@ {/if} {/if} - + {/block} diff --git a/Web/Presenters/templates/User/View.latte b/Web/Presenters/templates/User/View.latte index 170b9e515..534a59276 100644 --- a/Web/Presenters/templates/User/View.latte +++ b/Web/Presenters/templates/User/View.latte @@ -4,7 +4,7 @@ {var $backdrops = $user->getBackDropPictureURLs()} {/if} -{block title}{$user->getCanonicalName()}{/block} +{block title}{$user->getCanonicalName()}{/block} {block headIncludes} {if $user->getPrivacyPermission('page.read', $thisUser ?? NULL)} @@ -22,7 +22,7 @@ - + - {else} + {else} {/if} {/block} @@ -44,7 +44,7 @@ src="/assets/packages/static/openvk/img/checkmark.png" /> ({_this_is_you}) - +
{if $user->isOnline()} @@ -65,18 +65,18 @@ {block content} {if !$user->isBanned()} - + {if !$user->getPrivacyPermission('page.read', $thisUser ?? NULL)}
{_forbidden}
{_forbidden_comment}
{else} - +
{var $hasAvatar = !str_contains($user->getAvatarUrl('miniscule'), "/assets/packages/static/openvk/img/camera_200.png")} - + {if $thisUser && $user->getId() == $thisUser->getId()}
@@ -109,7 +109,7 @@ {tr("login_as", $user->getFirstName())} {/if} - + {if $thisUser->getChandlerUser()->can("access")->model("admin")->whichBelongsTo(NULL)} {_manage_user_action} @@ -137,7 +137,7 @@ {/if} {/if} - + {_send_gift} {_send_message} @@ -184,12 +184,12 @@
{var $completeness = $user->getProfileCompletenessReport()} - +
{$completeness->total}%
- + {if isset($thisUser) && $user->getId() === $thisUser->getId() && sizeof($completeness->unfilled) > 0}
@@ -215,9 +215,9 @@ {/if}

-
-
+
{var $friendOnlineCount = $user->getFriendsOnlineCount()} - +
{_friends_online}
@@ -266,12 +266,12 @@ {$friend->getFirstName()} {$friend->getLastName()} - +
-
+
{_albums}
@@ -286,7 +286,7 @@
{var $cover = $album->getCoverPhoto()} - + @@ -299,7 +299,7 @@
-
+
{_videos}
@@ -325,7 +325,7 @@
-
+
{_notes}
@@ -336,7 +336,7 @@ {_all_title}
- +
  • @@ -353,7 +353,7 @@
-
+
{var $clubsCount = $user->getClubCount()}
{_groups} @@ -372,7 +372,7 @@
-
+
{var $meetingCount = $user->getMeetingCount()}
{_meetings} @@ -391,9 +391,9 @@
- + - +
{strpos($alert, "@") === 0 ? tr(substr($alert, 1)) : $alert}
@@ -433,7 +433,7 @@
- +
@@ -473,13 +473,13 @@
{_pronouns}:
-
+
{_information}
- + {capture $contactInfo_Tmp} - +
@@ -523,13 +523,13 @@
{_email}:
{/capture} {capture $uInfo_Tmp} - +
-
{_interests}: {var $interests = explode(", ", $user->getInterests())} - + {foreach $interests as $interest} {$interest}{if $interest != end($interests)},{/if} {/foreach} @@ -558,7 +558,7 @@
{_favorite_shows}: + {var $shows = explode(", ", $user->getFavoriteShows())} {foreach $shows as $show} @@ -616,7 +616,7 @@ -
+
{_audios}
@@ -656,17 +656,17 @@ {$hideInfo ? tr('gift') : ($giftDescriptor->caption ?? tr('gift'))} - +
- + {presenter "openvk!Wall->wallEmbedded", $user->getId()} - + - + {/if} - + {else} {* isBanned() *} {include "banned.latte"} {/if} diff --git a/Web/Presenters/templates/Wall/Post.latte b/Web/Presenters/templates/Wall/Post.latte index 67234aeac..f2e7f5787 100644 --- a/Web/Presenters/templates/Wall/Post.latte +++ b/Web/Presenters/templates/Wall/Post.latte @@ -49,8 +49,10 @@ {_post} - {include "../components/post.latte", post => $post, forceNoCommentsLink => TRUE, forceNoDeleteLink => TRUE} -
+
+ {include "../components/post.latte", post => $post, forceNoCommentsLink => TRUE, forceNoDeleteLink => TRUE} +
+
{include "../components/comments.latte", @@ -69,7 +71,7 @@ {var $canReport = true} {/if} {/if} - + {_delete} {if !$timeOnly} {if $comment->canBeDeletedBy($thisUser)} - | + | {_delete} {/if} {if $comment->canBeEditedBy($thisUser)} - | + | {_edit} {/if} {if !$no_reply_button} - | + | {_reply} {/if} {if $thisUser->getId() != $author->getRealId()} - | + | {var $canReport = true} {_report} {/if} diff --git a/Web/Presenters/templates/components/post/microblogpost.latte b/Web/Presenters/templates/components/post/microblogpost.latte index 62a547ea3..857c39d24 100644 --- a/Web/Presenters/templates/components/post/microblogpost.latte +++ b/Web/Presenters/templates/components/post/microblogpost.latte @@ -20,7 +20,7 @@ {var $bigText = mb_strlen($post->getText()) > 520 || substr_count($post->getText(), "\n") + 1 > 10} - +
-
+
diff --git a/Web/static/css/main.css b/Web/static/css/main.css index f1a43c6a3..e0d3c963d 100644 --- a/Web/static/css/main.css +++ b/Web/static/css/main.css @@ -88,7 +88,12 @@ h1 { .page_header .mobile_title, #fast_notifications, #myPagePreview, -.navigation .link.fullsize { +.navigation .link.fullsize, +.navigation .link.search_link, +.navigation .link.invite_link, +.navigation .link.support_link, +.navigation .link.finances_link, +.navigation .link.logout { display: none; } @@ -190,6 +195,15 @@ h1 { border-top: 1px solid #CCCCCC; } +.navigation .link .mobile_v { + display: none; +} + +.navigation .link .pc_v { + display: inline-block; + padding: unset; +} + .navigation .link_soon { display: block; padding: 3px 3px 3px 6px; @@ -732,7 +746,7 @@ input[type="number"] { } #reg_checkbox { - margin-left: 100px; + margin-left: 100px; margin-right: 100px; text-align: center; } @@ -4554,4 +4568,4 @@ hr { .collapse_button { display: block; -} \ No newline at end of file +} diff --git a/Web/static/css/mobile.css b/Web/static/css/mobile.css index f7cd673aa..f25ea9a2b 100644 --- a/Web/static/css/mobile.css +++ b/Web/static/css/mobile.css @@ -38,6 +38,15 @@ width: 100%; } + select { + padding: 4px; + background-color: #fff; + border: 1px solid #b9c4d1; + border-radius: 2px; + outline-color: #5d80a6; + font-size: 100%; + } + body.dimmed { overflow-x: auto; } @@ -231,6 +240,10 @@ box-sizing: border-box; } + #votesBalance { + display: none; + } + .navigation_infos a, .navigation_infos text, .navigation_infos b, @@ -340,17 +353,22 @@ #left_menu_checkmarks { border-spacing: unset; width: 100%; - margin-top: 10px; - margin-bottom: 10px; + padding: 10px 0px 10px 0px; } - #_js_settings td, - #left_menu_checkmarks td { - width: unset; + #_js_settings td[width="120"], + #left_menu_checkmarks td[width="120"] { + width: 20px; } .container_gray { width: auto; + box-sizing: border-box; + background: unset; + } + + #auth .container_gray.settings_padding { + padding: 4px 15px; } .page_footer { @@ -507,11 +525,6 @@ padding-top: 0px; } - body.menu-expanded .header_navigation .link:not(#search_box) { - display: block; - } - - body.menu-expanded .header_navigation .link:not(#search_box), body.menu-expanded .search_expanded_at_all .header_navigation { display: inline-flex; align-items: center; @@ -595,16 +608,33 @@ .navigation_footer { display: flex; - flex-direction: column; + justify-content: center; + font-size: 11px; + } + + .page_footer .navigation_centrize { + text-align: center; + font-size: 11px; + } + + .navigation .link { + padding: 10px 3px 10px 45px; } .navigation .link, - .page_footer .navigation_footer .link { - padding: 12px 3px 12px 45px; + .navigation .link span { font-weight: 600; font-size: 16px !important; } + .navigation .link .pc_v { + display: none; + } + + .navigation .link .mobile_v { + display: inline-block; + } + body.menu-expanded .header_navigation .link:not(#search_box) a { font-size: 13px; user-select: none; @@ -638,7 +668,8 @@ background-position: 0px -67px; } - .navigation .link.fullsize { + .navigation .link.fullsize, + .navigation .link.mobiles_only { display: block; } @@ -701,7 +732,7 @@ } .navigation .link.my_support::before { - background-position: 0px -332px; + background-position: -1px -332px; } .navigation .link.my_notifications::before { @@ -733,6 +764,26 @@ background-position: -1px -415px; } + .navigation .link.search_link::before { + background-position: -1px -134px; + } + + .navigation .link.invite_link::before { + background-position: 0px -532px; + } + + .navigation .link.support_link::before { + background-position: -1px -332px; + } + + .navigation .link.finances_link::before { + background-position: 0px -310px; + } + + .navigation .link.logout::before { + background-position: 0px -287px; + } + .navigation-lang { grid-template-columns: repeat(3, 1fr) !important; } @@ -742,8 +793,22 @@ } .msg { - width: 100%; + padding: 8px; + color: #686868; box-sizing: border-box; + margin: -8px 0px 10px -8px; + width: 104%; + font-size: 16px; + } + + .msg b { + color: #6d829a; + font-weight: bolder; + } + + .msg.msg_succ { + background-color: #e6ecf1; + border-color: #d7e0e7; } #sudo-banner { @@ -764,6 +829,7 @@ margin-top: 5px; margin-bottom: 10px; font-size: 16px; + border-bottom: unset; } textarea { @@ -782,6 +848,10 @@ padding: 3px 8px; } + .tab a { + color: #3b3b3b; + } + #activetabs { background: #595959; color: #fff; @@ -798,13 +868,13 @@ table.flexible_table td[width="120"], table.flexible_table td { text-align: left; + padding: 3px 0px 3px 0px; } table.flexible_table thead, tbody { display: flex; flex-direction: column; - gap: 13px; } table.not_flexible_table tbody { @@ -813,6 +883,15 @@ gap: unset; } + .fullsize_selects select { + width: 100% !important; + } + + .fullsize_button { + width: 100%; + padding: 8px 14px; + } + .auth_table { padding: 0% 0% 0% 0%; margin-bottom: 10px !important; @@ -1000,20 +1079,27 @@ } #wallAttachmentMenu { - top: 0; + bottom: 0; left: 0; margin-top: -17px; margin-left: unset; width: 100%; - position: static; + position: fixed; display: flex; - flex-direction: column; + flex-direction: column-reverse; z-index: 297; } #wallAttachmentMenu > a { - padding: 5px 6px; - font-size: 12px; + padding: 14px 6px; + font-size: 14px; + gap: 19px; + } + + #wallAttachmentMenu>.header { + padding: 30px 15px; + background-color: #eee; + justify-content: center; } #noteFactory input, @@ -1049,10 +1135,16 @@ padding: 8px 8px; font-size: 15px; width: 100% !important; + text-align: center; + border-bottom: unset; } .profile-hints { padding: 13px 8px; + box-sizing: border-box; + position: absolute; + top: 168px; + width: 100%; } .profile-hints a { @@ -1061,6 +1153,7 @@ .completeness-gauge { height: 21px; + width: 97%; } .small-textarea { @@ -1092,6 +1185,19 @@ width: 100% !important; } + .fictional_profile_section { + display: inline-block; + width: 100%; + margin-bottom: 5px; + } + + .fictional_profile_section .content_subtitle { + width: 100%; + display: flex; + justify-content: space-between; + gap: 12px; + } + /* Search */ .page_wrap_content_main { @@ -1141,7 +1247,11 @@ margin-left: -7px; margin-right: unset; border-right: unset; - padding-top: 235px; + padding-top: 412px; + } + + .right_small_block { + padding-top: 164px; } .left_small_block.mobile_no_padding { @@ -1170,6 +1280,23 @@ font-size: 13px !important; } + .accountInfo { + border-bottom: unset; + } + + .profileName { + margin-top: 6px; + } + + .profileName h2 { + font-size: 16px; + color: #565656; + } + + .page_status { + font-size: 14px; + } + .user_info_none { font-size: 15px; } @@ -1196,27 +1323,36 @@ .content_title_expanded { background-image: unset !important; border-top: unset; - padding: 8px 7px 8px 16px; + padding: 5px 12px; font-size: 14px; + margin-top: unset; + } + + .fictional_profile_section .content_title_expanded { + display: none; } .content_subtitle { border-top: unset; border-bottom: unset; - padding: 7px 16px; + padding: 5px 12px; font-size: 13px; - width: 99vw; + width: 99%; box-sizing: border-box; } .avatar_block { - width: 30%; + width: 50px; position: absolute !important; - left: 18px; + left: 12px; top: 9px; max-height: 248px; } + .avatar_controls { + display: none; + } + .hide_on_mobiles_name { display: none; } @@ -1228,18 +1364,27 @@ .page_info_main { position: absolute; - top: 9px; - left: 35%; - width: 65%; + top: 10px; + left: 60px; + width: 88%; overflow-x: hidden; overflow-y: auto; - height: 248px; + height: 162px; padding-left: 11px; box-sizing: border-box; } + #entityAdditionalInfoBlock { + height: 200px; + overflow-y: auto; + position: absolute; + top: 213px; + width: 100%; + box-sizing: border-box; + } + .page_info_main.page_info_main_profile { - padding-left: 11px; + padding-left: 4px; } .tour { @@ -1642,9 +1787,18 @@ /* Apps */ #appFrame { - width: 102vw; - margin-left: -16px; - margin-top: -8px; + position: absolute; + width: 96vw !important; + height: 84vh !important; + left: 0; + top: 0px; + } + + #app_dev { + position: fixed; + bottom: 0px; + text-align: center; + width: 100%; } /* Modals */ @@ -1691,6 +1845,15 @@ box-sizing: border-box; } + .ovk-photo-view .photo_viewer_wrapper { + margin: 0px -35px 0px -35px; + } + + .ovk-photo-slide-left, + .ovk-photo-slide-right { + width: 25%; + } + .ovk-diag-action { position: absolute; display: flex; @@ -1703,7 +1866,7 @@ } .ovk-diag-head { - font-size: 24px; + font-size: 18px; } .media-page-wrapper-details { @@ -1724,6 +1887,11 @@ /* Photos, videos */ + .attachment_insert #show_more { + position: fixed; + bottom: 60px; + } + .uploadedImage { float: unset; width: 90px; @@ -1781,10 +1949,18 @@ display: inline-block; } + .attachment_selector #attachment_insert .photosList .album-photo { + height: 70px; + } + .attachment_selector #attachment_insert #attachment_insert_count { display: none; } + .attachment_selector #attachment_insert .photosList { + grid-template-columns: repeat(5, 1fr); + } + .attachment_selector #attachment_insert .photosList .album-photo { width: 100%; } @@ -1831,6 +2007,24 @@ margin-right: 1px; } + .list_view .list_view_item_cover a img { + width: 55px; + max-width: 55px; + max-height: 55px; + border-radius: 2px; + object-fit: cover; + object-position: center; + } + + .list_view .content { + border: #dedede solid 1px; + padding: 4px; + } + + .list_view .list_view_item_info > table:not(.ugc-table) { + display: none; + } + .videosInsert .video_list { position: relative; } @@ -1905,9 +2099,18 @@ display: none; } - .post-menu { + .post.post_microblog .post-menu { height: unset; margin-top: 8px; + margin-left: -54px; + } + + .post.post_oldschool .post-menu .m_hide { + display: none; + } + + #post_page_main .post.post_oldschool .post-menu .m_hide { + display: inline; } #post_page_meta { @@ -1948,6 +2151,10 @@ width: 40px; } + .post .post-menu-s .post-menu { + margin-left: -42px; + } + .post-author { font-size: 14px; } @@ -1975,6 +2182,44 @@ height: 100% !important; } + .post.post_microblog > tbody > tr { + display: flex; + } + + .post.post_microblog > tbody > tr > .post-author-ava { + display: inline-block; + } + + .post.post_microblog > tbody > tr > td > .post-content, + .post.post_oldschool > tbody > tr > td > .post-content, + .editing .post-edit { + margin-left: -53px; + margin-top: 13px; + } + + .post.post_microblog .post-all-contents > .post-author { + margin-top: 10px; + margin-left: -5px; + } + + .post .post-avatar { + max-width: 35px; + max-height: 35px; + border-radius: 2px; + } + + .post-online { + display: none; + } + + .post .attachments.attachments_m .post.post_microblog { + padding-left: 35px; + } + + .post .attachments.attachments_m .post.post_microblog .post-author { + margin-top: 0px; + } + .sort_link, .menu_toggler { font-size: 15px; @@ -1994,13 +2239,22 @@ /* Messenger */ + .crp-entry { + display: grid; + grid-template-columns: 0fr 0fr 1fr; + } + + .crp-entry .crp-entry--message { + width: 100%; + } + .crp-entry--image { margin-right: 0px; } .crp-entry--info { margin-top: unset; - width: unset; + width: 93px; margin-left: 8px; margin-right: 0px; font-size: 15px; @@ -2168,16 +2422,12 @@ font-size: 16px; } - .content .list_view_item_info { - width: unset !important; - } - .scroll_node { position: relative; } .list_view_item_actions { - position: absolute; + display: none; top: 0; right: 0; } @@ -2193,8 +2443,21 @@ white-space: nowrap; } + .list_view_item_info a { + color: #3b3b3b; + } + .list_view_item_info { - padding-left: 4px; + padding-left: 11px; + } + + .list_view_item_info.alt { + display: inline-flex; + align-items: center; + } + + .list_view .content > table > tbody > tr { + display: flex; } .friend_table, @@ -2229,6 +2492,23 @@ .expand_button { font-size: 14px; } + + /* other */ + + .nobold, nobold, nobold span { + color: unset; + } + + body.ajax_request_made #ajloader, + #ajloader.shown { + display: flex; + align-items: center; + justify-content: center; + } + + .post .post-menu-s .post-menu *:not(.comment-reply) { + display: none; + } } @media screen and (max-width: 510px) { @@ -2253,6 +2533,7 @@ white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + display: none; } body.menu-expanded .header_navigation .link:not(#search_box) a { @@ -2267,8 +2548,4 @@ .header_navigation #search_box .search_box_button span { font-size: 10px; } - - .list_view_item_cover { - display: none; - } } diff --git a/Web/static/img/mobile/menu_icons.png b/Web/static/img/mobile/menu_icons.png index 370a6442a923ea17e126ccbb08dbbad70f99eca8..0d255c65be635db0146221db50a772ac4e3ae03e 100644 GIT binary patch delta 7458 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 b*k1Rt2=B#IkBSWW#SJjfF+tR6yT<(wWDO8g diff --git a/locales/en.strings b/locales/en.strings index 48bc2e430..285a2aff2 100644 --- a/locales/en.strings +++ b/locales/en.strings @@ -1127,6 +1127,7 @@ "bday_reminder_text" = "$1 is $2's birthday."; "bday_and" = " and "; "points" = "Votes"; +"balance" = "Votes balance"; "points_count" = "votes"; "on_your_account" = "on your account"; "top_up_your_account" = "Get more"; diff --git a/locales/ru.strings b/locales/ru.strings index 72c6b6df9..126e72e04 100644 --- a/locales/ru.strings +++ b/locales/ru.strings @@ -1079,6 +1079,7 @@ "bday_reminder_text" = "$1 день рождения $2."; "bday_and" = " и "; "points" = "Голоса"; +"balance" = "Баланс"; "points_count" = "голосов"; "on_your_account" = "на вашем счету"; "top_up_your_account" = "Пополнить баланс"; From 579568ff571fe46a95df98a83f1e4a6ee70063b1 Mon Sep 17 00:00:00 2001 From: crythoughts <234468996+crythoughts@users.noreply.github.com> Date: Mon, 6 Jul 2026 21:13:01 +0300 Subject: [PATCH 2/2] fixes --- Web/Presenters/templates/User/View.latte | 2 +- Web/static/css/mobile.css | 24 ++++++++++++++---------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/Web/Presenters/templates/User/View.latte b/Web/Presenters/templates/User/View.latte index 534a59276..e5243e851 100644 --- a/Web/Presenters/templates/User/View.latte +++ b/Web/Presenters/templates/User/View.latte @@ -635,7 +635,7 @@
-
+
{_gifts}
diff --git a/Web/static/css/mobile.css b/Web/static/css/mobile.css index f25ea9a2b..df0626a6b 100644 --- a/Web/static/css/mobile.css +++ b/Web/static/css/mobile.css @@ -214,7 +214,7 @@ } .sidebar { - width: 100vw; + width: 100vw !important; float: unset !important; margin: unset !important; } @@ -269,12 +269,12 @@ .page_header { height: 49px !important; - width: 100vw; + width: 100vw !important; background: linear-gradient(#707070, #3b3b3b); display: flex; align-items: center; justify-content: center; - position: fixed; + position: fixed !important; z-index: 298; top: 0; } @@ -323,7 +323,7 @@ float: unset !important; margin-right: unset !important; min-height: 80vh; - width: 100%; + width: 100% !important; } .page_body .page_content { @@ -478,12 +478,12 @@ .home_button { background: url(/assets/packages/static/openvk/img/mobile/logo.png) !important; - background-repeat: no-repeat; background-size: contain; width: 24px; height: 24px; top: 12px; left: 12px; + background-repeat: no-repeat !important; } .header_navigation .link:not(#search_box) { @@ -583,7 +583,7 @@ gap: 13px; justify-content: normal; align-items: center; - padding: 12px 3px 12px 16px; + padding: 12px 3px 12px 16px !important; background-color: #ededed47; } @@ -618,7 +618,7 @@ } .navigation .link { - padding: 10px 3px 10px 45px; + padding: 10px 3px 10px 45px !important; } .navigation .link, @@ -826,9 +826,9 @@ h4 { color: #505050; - margin-top: 5px; - margin-bottom: 10px; - font-size: 16px; + margin-top: 5px !important; + margin-bottom: 10px !important; + font-size: 16px !important; border-bottom: unset; } @@ -975,6 +975,10 @@ margin-bottom: 10px; } + .searchList li, .searchList a, .verticalGrayTabs a { + font-size: 14px; + } + .verticalGrayTabsWrapper { width: 100%; font-size: 16px;