From aea8a80fe122ed62123f64e047865cc6f6a7089f Mon Sep 17 00:00:00 2001 From: Thomas Sileo Date: Sun, 1 Jul 2018 12:49:16 +0200 Subject: [PATCH] More design tweaks --- config.py | 2 +- sass/base_theme.scss | 29 +++++++++++++++++++++++++++++ templates/header.html | 3 +-- templates/index.html | 4 ++-- templates/layout.html | 2 +- templates/stream.html | 6 +++--- templates/utils.html | 6 ++++-- 7 files changed, 41 insertions(+), 11 deletions(-) diff --git a/config.py b/config.py index 3e883c0..a5a6bb7 100644 --- a/config.py +++ b/config.py @@ -24,7 +24,7 @@ DEFAULT_THEME_STYLE = ThemeStyle.LIGHT.value DEFAULT_THEME_PRIMARY_COLOR = { ThemeStyle.LIGHT: "#1d781d", # Green - ThemeStyle.DARK: "#e14eea", # Purple + ThemeStyle.DARK: "#33ff00", # Purple } diff --git a/sass/base_theme.scss b/sass/base_theme.scss index c54114d..ec5bd98 100644 --- a/sass/base_theme.scss +++ b/sass/base_theme.scss @@ -28,6 +28,23 @@ a:hover { .gold { color: $primary-color; } +.pcolor { + color: $primary-color; +} + +.remote-follow-button { + background: $color-menu-background; + color: $color-light; + text-decoration: none; + padding: 5px 8px; + margin-top: 5px; + border-radius: 2px; +} +.remote-follow-button:hover { + text-decoration: none; + background: $primary-color; + color: $background-color; +} #header { margin-bottom: 70px; @@ -171,6 +188,14 @@ a:hover { } } +.bar-item-no-hover { + background: $color-menu-background; + padding: 5px; + color: $color-light; + margin-right:5px; + border-radius:2px; +} + .bar-item { background: $color-menu-background; padding: 5px; @@ -178,6 +203,10 @@ a:hover { margin-right:5px; border-radius:2px; } +.bar-item:hover { + background: $primary-color; + color: $background-color; +} button.bar-item { border: 0 } diff --git a/templates/header.html b/templates/header.html index 167cc1d..0bfe9a4 100644 --- a/templates/header.html +++ b/templates/header.html @@ -4,8 +4,7 @@ {{ config.NAME }} @{{ config.USERNAME }}@{{ config.DOMAIN }} - Remote follow - + Remote follow
{{ config.SUMMARY | safe }} diff --git a/templates/index.html b/templates/index.html index 285e306..79fcc96 100644 --- a/templates/index.html +++ b/templates/index.html @@ -25,12 +25,12 @@ {% if item | has_type('Announce') %} {% set boost_actor = item.activity.actor | get_actor %} -

{{ boost_actor.name }} boosted

+

{{ boost_actor.name }} boosted

{% if item.meta.object %} {{ utils.display_note(item.meta.object, ui=False) }} {% endif %} {% elif item | has_type('Create') %} - {{ utils.display_note(item.activity.object, meta=item.meta) }} + {{ utils.display_note(item.activity.object, meta=item.meta, no_color=True) }} {% endif %} {% endfor %} diff --git a/templates/layout.html b/templates/layout.html index 6d4190f..4c74129 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -15,7 +15,7 @@ {% if config.THEME_COLOR %}{% endif %} diff --git a/templates/stream.html b/templates/stream.html index 994e3d5..d900d3f 100644 --- a/templates/stream.html +++ b/templates/stream.html @@ -14,20 +14,20 @@ {% if item | has_type('Announce') %} {% set boost_actor = item.activity.actor | get_actor %} -

{{ boost_actor.name or boost_actor.preferredUsername }} boosted

+

{{ boost_actor.name or boost_actor.preferredUsername }} boosted

{% if item.meta.object %} {{ utils.display_note(item.meta.object, ui=True) }} {% endif %} {% endif %} {% if item | has_type('Follow') %} -

new follower +

new follower

{{ utils.display_actor_inline(item.activity.actor | get_actor, size=50) }}
{% elif item | has_type('Accept') %} -

you started following

+

you started following

{{ utils.display_actor_inline(item.activity.actor | get_actor, size=50) }}
diff --git a/templates/utils.html b/templates/utils.html index 9fd10c2..a0f2bec 100644 --- a/templates/utils.html +++ b/templates/utils.html @@ -15,7 +15,7 @@ -{% macro display_note(obj, perma=False, ui=False, likes=[], shares=[], meta={}) -%} +{% macro display_note(obj, perma=False, ui=False, likes=[], shares=[], meta={}, no_color=False) -%} {% set actor = obj.attributedTo | get_actor %}
@@ -26,7 +26,9 @@
- {{ actor.name or actor.preferredUsername }} @{{ actor.preferredUsername }}@{{ actor.url | domain }} + {{ actor.name or actor.preferredUsername }} + @{% if not no_color and obj.id | is_from_outbox %}{{ actor.preferredUsername }}{% else %}{{ actor.preferredUsername }}{% endif %}@ + {% if not no_color and obj.id | is_from_outbox %}{{ actor.url | domain }}{% else %}{{ actor.url | domain }}{% endif %} {% if not perma %}