From cb5d21baebc6ca6c2ae0bdb09f1523fd6b6e326b Mon Sep 17 00:00:00 2001 From: Thomas Sileo Date: Wed, 21 Sep 2022 21:00:17 +0200 Subject: [PATCH] More admin profile related tweaks --- app/scss/main.scss | 13 +++++++++++-- app/templates/utils.html | 7 ++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/app/scss/main.scss b/app/scss/main.scss index bfd8ecb..106e935 100644 --- a/app/scss/main.scss +++ b/app/scss/main.scss @@ -388,7 +388,7 @@ nav.flexbox { margin-right: 0px; } } - a { + a:not(.label-btn) { color: $primary-color; text-decoration: none; &:hover, &:active { @@ -396,12 +396,21 @@ nav.flexbox { text-decoration: underline; } } - a.active { + a.active:not(.label-btn) { color: $secondary-color; font-weight: bold; } } +// after nav.flexbox to override default behavior +a.label-btn { + color: $form-text-color; + &:hover { + text-decoration: none; + color: $form-text-color; + } +} + .ap-object { margin: 15px 0; padding: 20px; diff --git a/app/templates/utils.html b/app/templates/utils.html index 3a79743..a5bc1a7 100644 --- a/app/templates/utils.html +++ b/app/templates/utils.html @@ -219,7 +219,9 @@ {% if metadata.is_following %}
  • already following
  • {{ admin_undo_button(metadata.outbox_follow_ap_id, "unfollow")}}
  • -
  • {{ admin_profile_button(actor.ap_id) }}
  • + {% if not with_details %} +
  • {{ admin_profile_button(actor.ap_id) }}
  • + {% endif %} {% elif metadata.is_follow_request_sent %}
  • follow request sent
  • {{ admin_undo_button(metadata.outbox_follow_ap_id, "undo follow") }}
  • @@ -261,6 +263,9 @@
  • rejected
  • {% endif %} {% endif %} + {% if with_details %} +
  • remote profile
  • + {% endif %}