From 8d5a38212dd51345174c56ccb931b5f3f6b6b55c Mon Sep 17 00:00:00 2001 From: "me@ow.nekobit.net" Date: Fri, 22 Apr 2022 19:40:18 +0000 Subject: [PATCH] Interactions styling FossilOrigin-Name: a2438b899b6f9b52dae1eb8a4f6436ee6aa03e977bb73184531f59e934d7482c --- Makefile | 2 -- dist/treebird20.css | 43 ++++++++++++++++++++++++++ src/status.c | 8 +++-- static/config.html | 0 static/status_interaction_profile.html | 2 +- 5 files changed, 50 insertions(+), 5 deletions(-) delete mode 100644 static/config.html diff --git a/Makefile b/Makefile index e961362..0f13d5b 100644 --- a/Makefile +++ b/Makefile @@ -30,8 +30,6 @@ $(PAGES_DIR)/index.chtml: $(PAGES_DIR)/index.html ./filec $< data_index_html > $@ $(PAGES_DIR)/status.chtml: $(PAGES_DIR)/status.html ./filec $< data_status_html > $@ -$(PAGES_DIR)/config.chtml: $(PAGES_DIR)/config.html - ./filec $< data_config_html > $@ $(PAGES_DIR)/account.chtml: $(PAGES_DIR)/account.html ./filec $< data_account_html > $@ $(PAGES_DIR)/login.chtml: $(PAGES_DIR)/login.html diff --git a/dist/treebird20.css b/dist/treebird20.css index 1570e2d..30a331f 100644 --- a/dist/treebird20.css +++ b/dist/treebird20.css @@ -703,6 +703,49 @@ svg.in-reply-to-icon padding-left: 15px; } +/********************* + * Interactions * + *********************/ +.status-interactions +{ + border-bottom: 1px solid #ddbfbf; +} + +.status-interactions-labels +{ + display: inline-block; + vertical-align: middle; + color: #cacaca; +} + +.status-interactions-labels .header-btn +{ + padding: 8px 12px; +} + +.status-interactions-labels .header-btn .btn-content +{ + text-align: left; + color: #606060; + font-weight: bold; +} + +.status-interactions .status-interactions-pfps +{ + display: inline-block; + vertical-align: middle; + margin: 2px; +} + +.status-interactions .pfp-interaction +{ + border-radius: 50%; + width: 24px; + height: 24px; + margin: 1px; + object-fit: cover; +} + /********************** * Profiles * **********************/ diff --git a/src/status.c b/src/status.c index 236ef8e..977fc16 100644 --- a/src/status.c +++ b/src/status.c @@ -43,7 +43,7 @@ #include "../static/status_interactions.chtml" #include "../static/status_interaction_profile.chtml" -#define ACCOUNT_INTERACTIONS_LIMIT 9 +#define ACCOUNT_INTERACTIONS_LIMIT 11 #define NUM_STR "%u" struct status_args @@ -224,6 +224,10 @@ char* construct_status_interaction_profiles(struct mstdnt_account* reblogs, size_t* ret_size) { size_t arr_size = reblogs_len + favourites_len; + // Set a limit to interactions + if (arr_size > ACCOUNT_INTERACTIONS_LIMIT) + arr_size = ACCOUNT_INTERACTIONS_LIMIT; + struct interact_profile_args args = { .reblogs = reblogs, .reblogs_len = reblogs_len, @@ -442,8 +446,8 @@ char* construct_status(mastodont_t* api, in_reply_to_str ? in_reply_to_str : "", parse_content, attachments ? attachments : "", - emoji_reactions ? emoji_reactions : "", interactions_html ? interactions_html : "", + emoji_reactions ? emoji_reactions : "", config_url_prefix, status->id, status->id, diff --git a/static/config.html b/static/config.html deleted file mode 100644 index e69de29..0000000 diff --git a/static/status_interaction_profile.html b/static/status_interaction_profile.html index e97634f..d441159 100644 --- a/static/status_interaction_profile.html +++ b/static/status_interaction_profile.html @@ -1 +1 @@ - +