From d3992802f2265fc999c45d602c6c5ac7d1019c7f Mon Sep 17 00:00:00 2001 From: Vivianne Langdon Date: Fri, 8 Apr 2022 23:14:30 -0700 Subject: [PATCH 1/2] use a new has-text-default instead of has-text-black --- bookwyrm/static/css/bookwyrm/utilities/_colors.scss | 5 +++++ bookwyrm/static/css/themes/bookwyrm-dark.scss | 1 + bookwyrm/templates/book/editions/editions.html | 2 +- bookwyrm/templates/groups/members.html | 2 +- bookwyrm/templates/groups/suggested_users.html | 2 +- bookwyrm/templates/notifications/items/mention.html | 4 ++-- bookwyrm/templates/notifications/items/reply.html | 4 ++-- bookwyrm/templates/snippets/suggested_users.html | 2 +- 8 files changed, 14 insertions(+), 8 deletions(-) diff --git a/bookwyrm/static/css/bookwyrm/utilities/_colors.scss b/bookwyrm/static/css/bookwyrm/utilities/_colors.scss index e44efee9..f38d2a40 100644 --- a/bookwyrm/static/css/bookwyrm/utilities/_colors.scss +++ b/bookwyrm/static/css/bookwyrm/utilities/_colors.scss @@ -23,3 +23,8 @@ .has-background-tertiary { background-color: $background-tertiary !important; } + +/* Workaround for dark theme as .has-text-black doesn't give desired effect. */ +.has-text-default { + color: $text !important; +} diff --git a/bookwyrm/static/css/themes/bookwyrm-dark.scss b/bookwyrm/static/css/themes/bookwyrm-dark.scss index 96997c4a..6404514f 100644 --- a/bookwyrm/static/css/themes/bookwyrm-dark.scss +++ b/bookwyrm/static/css/themes/bookwyrm-dark.scss @@ -53,6 +53,7 @@ $link-hover: $white-bis; $link-hover-border: #51595d; $link-focus: $white-bis; $link-active: $white-bis; +$link-light: #0d1c26; /* bulma overrides */ $background: $background-secondary; diff --git a/bookwyrm/templates/book/editions/editions.html b/bookwyrm/templates/book/editions/editions.html index e15e7a74..16f65e45 100644 --- a/bookwyrm/templates/book/editions/editions.html +++ b/bookwyrm/templates/book/editions/editions.html @@ -21,7 +21,7 @@

- + {{ book|book_title }}

diff --git a/bookwyrm/templates/groups/members.html b/bookwyrm/templates/groups/members.html index 2c256c61..e9c9047c 100644 --- a/bookwyrm/templates/groups/members.html +++ b/bookwyrm/templates/groups/members.html @@ -38,7 +38,7 @@ {% for membership in group.memberships.all %} {% with member=membership.user %}
- + {% include 'snippets/avatar.html' with user=member large=True %} {{ member.display_name|truncatechars:10 }} @{{ member|username|truncatechars:8 }} diff --git a/bookwyrm/templates/groups/suggested_users.html b/bookwyrm/templates/groups/suggested_users.html index 06f31b44..27001073 100644 --- a/bookwyrm/templates/groups/suggested_users.html +++ b/bookwyrm/templates/groups/suggested_users.html @@ -9,7 +9,7 @@
{% for user in suggested_users %}
- + {% include 'snippets/avatar.html' with user=user large=True %} {{ user.display_name|truncatechars:10 }} @{{ user|username|truncatechars:8 }} diff --git a/bookwyrm/templates/notifications/items/mention.html b/bookwyrm/templates/notifications/items/mention.html index dfd40744..e4e78a11 100644 --- a/bookwyrm/templates/notifications/items/mention.html +++ b/bookwyrm/templates/notifications/items/mention.html @@ -48,12 +48,12 @@ {% block preview %} -
+
{% include 'snippets/status_preview.html' with status=related_status %}
-
+
{{ related_status.published_date|timesince }} {% include 'snippets/privacy-icons.html' with item=related_status %}
diff --git a/bookwyrm/templates/notifications/items/reply.html b/bookwyrm/templates/notifications/items/reply.html index 2472e050..30e7eff7 100644 --- a/bookwyrm/templates/notifications/items/reply.html +++ b/bookwyrm/templates/notifications/items/reply.html @@ -51,12 +51,12 @@ {% block preview %} -
+
{% include 'snippets/status_preview.html' with status=related_status %}
-
+
{{ related_status.published_date|timesince }} {% include 'snippets/privacy-icons.html' with item=related_status %}
diff --git a/bookwyrm/templates/snippets/suggested_users.html b/bookwyrm/templates/snippets/suggested_users.html index 74b69d1f..2699ff2a 100644 --- a/bookwyrm/templates/snippets/suggested_users.html +++ b/bookwyrm/templates/snippets/suggested_users.html @@ -5,7 +5,7 @@ {% for user in suggested_users %}
- + {% include 'snippets/avatar.html' with user=user large=True %} {{ user.display_name|truncatechars:10 }} @{{ user|username|truncatechars:8 }} From 64b623df32263fd08174c2ac58b8c7c777f11c3a Mon Sep 17 00:00:00 2001 From: Vivianne Langdon Date: Sat, 9 Apr 2022 00:06:10 -0700 Subject: [PATCH 2/2] fixes for bulma not having good dark support --- bookwyrm/static/css/themes/bookwyrm-dark.scss | 7 +++++++ bookwyrm/static/css/themes/bookwyrm-light.scss | 8 ++++++++ bookwyrm/templates/notifications/items/boost.html | 4 ++-- bookwyrm/templates/notifications/items/fav.html | 4 ++-- bookwyrm/templates/notifications/items/layout.html | 2 +- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/bookwyrm/static/css/themes/bookwyrm-dark.scss b/bookwyrm/static/css/themes/bookwyrm-dark.scss index 6404514f..88ee865b 100644 --- a/bookwyrm/static/css/themes/bookwyrm-dark.scss +++ b/bookwyrm/static/css/themes/bookwyrm-dark.scss @@ -84,6 +84,13 @@ $progress-value-background-color: $border-light; $family-primary: $family-sans-serif; $family-secondary: $family-sans-serif; +.has-text-muted { + color: $grey-lighter !important; +} + +.has-text-more-muted { + color: $grey-light !important; +} @import "../bookwyrm.scss"; @import "../vendor/icons.css"; diff --git a/bookwyrm/static/css/themes/bookwyrm-light.scss b/bookwyrm/static/css/themes/bookwyrm-light.scss index 69c1a806..75f05164 100644 --- a/bookwyrm/static/css/themes/bookwyrm-light.scss +++ b/bookwyrm/static/css/themes/bookwyrm-light.scss @@ -57,5 +57,13 @@ $invisible-overlay-background-color: rgba($scheme-invert, 0.66); $family-primary: $family-sans-serif; $family-secondary: $family-sans-serif; +.has-text-muted { + color: $grey-dark !important; +} + +.has-text-more-muted { + color: $grey !important; +} + @import "../bookwyrm.scss"; @import "../vendor/icons.css"; diff --git a/bookwyrm/templates/notifications/items/boost.html b/bookwyrm/templates/notifications/items/boost.html index 93bd00cc..5e3e1151 100644 --- a/bookwyrm/templates/notifications/items/boost.html +++ b/bookwyrm/templates/notifications/items/boost.html @@ -47,12 +47,12 @@ {% block preview %} -
+
{% include 'snippets/status_preview.html' with status=related_status %}
-
+
{{ related_status.published_date|timesince }} {% include 'snippets/privacy-icons.html' with item=related_status %}
diff --git a/bookwyrm/templates/notifications/items/fav.html b/bookwyrm/templates/notifications/items/fav.html index 25638574..eb29ebc2 100644 --- a/bookwyrm/templates/notifications/items/fav.html +++ b/bookwyrm/templates/notifications/items/fav.html @@ -47,12 +47,12 @@ {% block preview %} -
+
{% include 'snippets/status_preview.html' with status=related_status %}
-
+
{{ related_status.published_date|timesince }} {% include 'snippets/privacy-icons.html' with item=related_status %}
diff --git a/bookwyrm/templates/notifications/items/layout.html b/bookwyrm/templates/notifications/items/layout.html index d595bf20..e7c3b314 100644 --- a/bookwyrm/templates/notifications/items/layout.html +++ b/bookwyrm/templates/notifications/items/layout.html @@ -1,7 +1,7 @@ {% load notification_page_tags %} {% related_status notification as related_status %}
-
+
{% block icon %}{% endblock %}