From 345debb79479dcb2cf1311958aa4adb824596268 Mon Sep 17 00:00:00 2001 From: Glenn Date: Wed, 18 Sep 2024 11:54:51 -0700 Subject: [PATCH 1/7] Various updates - Add chevron icon for Alias list - Add chevron icon for Back button - Update Back button label - Update Alias list to show either the display name OR username - Update alias drill-in page heading to show either the display name OR username - Some spacing updates --- hushline/static/css/style.css | 37 ++++++++++++++++++++ hushline/static/img/app/icon-chevron-dm.png | Bin 0 -> 348 bytes hushline/static/img/app/icon-chevron.png | Bin 0 -> 346 bytes hushline/templates/settings/alias.html | 4 +-- hushline/templates/settings/aliases.html | 10 ++++-- 5 files changed, 46 insertions(+), 5 deletions(-) create mode 100644 hushline/static/img/app/icon-chevron-dm.png create mode 100644 hushline/static/img/app/icon-chevron.png diff --git a/hushline/static/css/style.css b/hushline/static/css/style.css index 62632cf6..8a548c59 100644 --- a/hushline/static/css/style.css +++ b/hushline/static/css/style.css @@ -93,6 +93,10 @@ background-image: url("../img/app/icon-menu.png"); } + .icon.chevron { + background-image: url("../img/app/icon-chevron.png"); + } + .container { border: var(--border); background-color: white; @@ -645,6 +649,10 @@ .icon.verifiedURL { background-image: url("../img/app/icon-verified-dm.png"); } + + .icon.chevron { + background-image: url("../img/app/icon-chevron-dm.png"); + } } body { @@ -2106,3 +2114,32 @@ p.bio + .extra-fields { z-index: q; content: ""; } + +#aliases { + form + h3 { + margin-top: 2rem; + } +} + +.alias-entry .icon, +.icon.back { + width: 1.25rem; + height: 1.25rem; + background-size: contain; + background-repeat: no-repeat; +} + +.icon.back { + transform: rotate(180deg); + display: inline-block; + position: relative; + top: .175rem; +} + +.back-button { + margin-bottom: 1.5rem; +} + +.alias-heading { + margin-bottom: 1rem; +} \ No newline at end of file diff --git a/hushline/static/img/app/icon-chevron-dm.png b/hushline/static/img/app/icon-chevron-dm.png new file mode 100644 index 0000000000000000000000000000000000000000..69450319a0efdb74c4c7313d441300a38356bda9 GIT binary patch literal 348 zcmeAS@N?(olHy`uVBq!ia0vp^azHG_!3HE3EPS&CNO2Z;L>4nJa0`PlBg3pY55jgR3=A9lx&I`x0{I_3T^vIy7~fv=30)f!i8nA z?i-{_nr)oSSNR2)e~_5Sw#z>=JIXKF##tj{UzNa@`#h(l>+KF6XZWK$(ME6D^OkCd znKoMCks(DJ)zmD4HP7{3x4iOo+h)tsm~u0TjUpnCSBUT*-z!_NFLS+RLwI=Tipx8L zj^}PVoXXpyYsDY*dKmdjTDO02K~dY-}4)z4*}Q$iB}rMiXp literal 0 HcmV?d00001 diff --git a/hushline/static/img/app/icon-chevron.png b/hushline/static/img/app/icon-chevron.png new file mode 100644 index 0000000000000000000000000000000000000000..8ae3737646baa6bea85c115b6ac7f37deb04fea0 GIT binary patch literal 346 zcmeAS@N?(olHy`uVBq!ia0vp^azHG_!3HE3EPS&CNO2Z;L>4nJa0`PlBg3pY55jgR3=A9lx&I`x0{QPfT^vIy7~ftw&DrcA!1mxS%X`aeBUznS z2N#!3;7j6ssiLZ~QsL!+)#3+*zNPRsbx3wLs&d?{l=-XAeE7g|oi`d=k17|+#Bb8+ z7E!itKgvbQ=1huUhUe(C3)qT@8vxUZ03Zy+?Cn-(R{;C z*;6+&7n-Xd6ta+f_DE+&^X5b?J*MCS!-|928aw&>_Qli}{mA`NyWdKK?fi0)uEMA? znd6Icqj#I>f4Xw|uU>7S;EbkCiCU+cEHxybEmDbKay^_m>)BjQ`=kgx@ pu)^;D)SgMq=VPUkmA0}@G(W32yQcQ8fELi}44$rjF6*2UngHgRge3p~ literal 0 HcmV?d00001 diff --git a/hushline/templates/settings/alias.html b/hushline/templates/settings/alias.html index f760132c..d68cb578 100644 --- a/hushline/templates/settings/alias.html +++ b/hushline/templates/settings/alias.html @@ -3,8 +3,8 @@ {% block title %}Alias: @{{ alias.username }}{% endblock %} {% block content %} -

< Back to settings

-

Alias: @{{ alias.username }}

+ Back to Settings +

{{ alias.display_name or alias.username }}

{# TODO: much of this is copy/pasted from "settings/profile.html" and will need to be synced with updates there #}

Update Display Name

diff --git a/hushline/templates/settings/aliases.html b/hushline/templates/settings/aliases.html index b8683ced..874afa54 100644 --- a/hushline/templates/settings/aliases.html +++ b/hushline/templates/settings/aliases.html @@ -22,12 +22,16 @@

Current Aliases

{% for username in aliases %}
- -
>
+ +
{% endfor %}
{% else %} -

No alises configured.

+

🙊 No alises configured.

{% endif %} From e8a7264e35d562c6558938a576d4f9c20fe22eed Mon Sep 17 00:00:00 2001 From: Glenn Date: Wed, 18 Sep 2024 11:57:35 -0700 Subject: [PATCH 2/7] Update style.css --- hushline/static/css/style.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hushline/static/css/style.css b/hushline/static/css/style.css index 8a548c59..f7d2de42 100644 --- a/hushline/static/css/style.css +++ b/hushline/static/css/style.css @@ -2129,11 +2129,11 @@ p.bio + .extra-fields { background-repeat: no-repeat; } -.icon.back { +.icon.back { transform: rotate(180deg); display: inline-block; position: relative; - top: .175rem; + top: 0.175rem; } .back-button { @@ -2142,4 +2142,4 @@ p.bio + .extra-fields { .alias-heading { margin-bottom: 1rem; -} \ No newline at end of file +} From 67771eb715a88b86e44ee1caf3eef860f18c8f17 Mon Sep 17 00:00:00 2001 From: Glenn Date: Wed, 18 Sep 2024 12:00:38 -0700 Subject: [PATCH 3/7] Update style.css --- hushline/static/css/style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/hushline/static/css/style.css b/hushline/static/css/style.css index f7d2de42..479421a4 100644 --- a/hushline/static/css/style.css +++ b/hushline/static/css/style.css @@ -2138,6 +2138,7 @@ p.bio + .extra-fields { .back-button { margin-bottom: 1.5rem; + margin-top: -0.75rem; } .alias-heading { From c2b3cb00b1bc15ef656b4778186d4db587b61f60 Mon Sep 17 00:00:00 2001 From: Glenn Date: Wed, 18 Sep 2024 12:03:19 -0700 Subject: [PATCH 4/7] Update style.css --- hushline/static/css/style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/hushline/static/css/style.css b/hushline/static/css/style.css index 479421a4..0a69e30c 100644 --- a/hushline/static/css/style.css +++ b/hushline/static/css/style.css @@ -2095,6 +2095,7 @@ p.bio + .extra-fields { .alias-list { display: flex; flex-direction: column; + gap: 1rem; } .alias-entry { From b8b1047b25a760ec8992db072d05be733f9cd28e Mon Sep 17 00:00:00 2001 From: Glenn Date: Wed, 18 Sep 2024 12:04:48 -0700 Subject: [PATCH 5/7] Update style.css --- hushline/static/css/style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/hushline/static/css/style.css b/hushline/static/css/style.css index 0a69e30c..5be97841 100644 --- a/hushline/static/css/style.css +++ b/hushline/static/css/style.css @@ -2096,6 +2096,7 @@ p.bio + .extra-fields { display: flex; flex-direction: column; gap: 1rem; + margin-top: 1rem; } .alias-entry { From 3d9fa2c7b72ec3f50265446eeb2a2a800f8a2f53 Mon Sep 17 00:00:00 2001 From: Glenn Date: Wed, 18 Sep 2024 12:11:54 -0700 Subject: [PATCH 6/7] fix headings --- hushline/static/css/style.css | 21 ++++++++++++++++++--- hushline/templates/settings/alias.html | 2 ++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/hushline/static/css/style.css b/hushline/static/css/style.css index 5be97841..9cc8f9ad 100644 --- a/hushline/static/css/style.css +++ b/hushline/static/css/style.css @@ -2117,10 +2117,12 @@ p.bio + .extra-fields { content: ""; } -#aliases { - form + h3 { +#aliases form + h3 { margin-top: 2rem; - } +} + +#aliases h3 { + margin-bottom: 0; } .alias-entry .icon, @@ -2146,3 +2148,16 @@ p.bio + .extra-fields { .alias-heading { margin-bottom: 1rem; } + +.drill-in { + display: flex; + flex-direction: column; +} + +.drill-in h3 { + margin-bottom: 0; +} + +.drill-in .checkbox-group { + margin-bottom: 0; +} \ No newline at end of file diff --git a/hushline/templates/settings/alias.html b/hushline/templates/settings/alias.html index d68cb578..1e3425a2 100644 --- a/hushline/templates/settings/alias.html +++ b/hushline/templates/settings/alias.html @@ -3,6 +3,7 @@ {% block title %}Alias: @{{ alias.username }}{% endblock %} {% block content %} +
Back to Settings

{{ alias.display_name or alias.username }}

@@ -174,6 +175,7 @@

Extra Fields

+ {% endblock %} {% block scripts %} From 156aa7573582f02f1622f6259951c2dccfc4941a Mon Sep 17 00:00:00 2001 From: Glenn Date: Wed, 18 Sep 2024 12:12:27 -0700 Subject: [PATCH 7/7] Update style.css --- hushline/static/css/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hushline/static/css/style.css b/hushline/static/css/style.css index 9cc8f9ad..d5f5cbc5 100644 --- a/hushline/static/css/style.css +++ b/hushline/static/css/style.css @@ -2118,7 +2118,7 @@ p.bio + .extra-fields { } #aliases form + h3 { - margin-top: 2rem; + margin-top: 2rem; } #aliases h3 { @@ -2160,4 +2160,4 @@ p.bio + .extra-fields { .drill-in .checkbox-group { margin-bottom: 0; -} \ No newline at end of file +}