From a7944a1e089f2da85e83d3809ab97cd2bfba5447 Mon Sep 17 00:00:00 2001 From: veselcraft Date: Mon, 20 Dec 2021 18:02:49 +0300 Subject: [PATCH] User: Friends mini-list redesign Also fixes #180 --- Web/Presenters/templates/Group/View.xml | 33 ++++++---------- Web/Presenters/templates/User/View.xml | 51 ++++++++----------------- Web/static/css/style.css | 42 ++++++++++++++++++++ 3 files changed, 70 insertions(+), 56 deletions(-) diff --git a/Web/Presenters/templates/Group/View.xml b/Web/Presenters/templates/Group/View.xml index b7a5d70d..f16c435d 100644 --- a/Web/Presenters/templates/Group/View.xml +++ b/Web/Presenters/templates/Group/View.xml @@ -53,27 +53,18 @@ {_all_title} -
- - - - - - - - - -
- - - -
- {$follower->getFirstName()} -
+
diff --git a/Web/Presenters/templates/User/View.xml b/Web/Presenters/templates/User/View.xml index be1dc914..b7149c7e 100644 --- a/Web/Presenters/templates/User/View.xml +++ b/Web/Presenters/templates/User/View.xml @@ -95,21 +95,21 @@ {var subStatus = $user->getSubscriptionStatus($thisUser)} {if $subStatus === 0} -
+
{elseif $subStatus === 1} -
+
{elseif $subStatus === 2} -
+ @@ -117,7 +117,7 @@
{elseif $subStatus === 3} {_"send_message"} -
+ @@ -125,6 +125,7 @@
{/if} {/if} + {tr("followers", $user->getFollowersCount())}
{var completeness = $user->getProfileCompletenessReport()} @@ -196,37 +197,17 @@ {_"all_title"}
-
- -
- - -
- {var followersCount = $user->getFollowersCount()} - -
- {_followers} -
-
-
- {tr("followers", $followersCount)} -
- {_"all_title"} -
-
-
- diff --git a/Web/static/css/style.css b/Web/static/css/style.css index 93eb67fb..4fdf6f8f 100644 --- a/Web/static/css/style.css +++ b/Web/static/css/style.css @@ -307,6 +307,10 @@ a { cursor: pointer; } +.profile_link_form { + margin-bottom: 0; +} + #profile_links { margin: 10px 0; } @@ -683,6 +687,44 @@ span { max-height: 63px; } +.content_list { + display: flex; + width: 200px; + flex-wrap: wrap; +} + +.content_list.long { + width: 397px; +} + +.content_list .cl_element { + width: 33%; +} + +.content_list.long .cl_element { + width: 16.5%; +} + +.content_list .cl_element .cl_avatar { + padding: 7px 7px 0 7px; + text-align: center; +} + +.content_list .cl_element .cl_name { + padding: 0 3px; + text-align: center; + display: flex; + flex-direction: column; +} + +.content_list .cl_element .cl_name .cl_lname { + font-size: 7pt; +} + +.ava { + width: 45px; +} + table.User { vertical-align: text-top; }