diff --git a/CREDITS b/CREDITS index 6ed6d11..79546ac 100644 --- a/CREDITS +++ b/CREDITS @@ -14,9 +14,17 @@ [ Camera support ] * SamTherapy <@sam@froth.zone> - Documentation and cleanup, bugs + Documentation and cleanup, fixed bugs [ Support ] * Khan <@Khan@sleepy.cafe> Helped with the old Treebird Husky fork (history lesson required) - [ Executive producer ] \ No newline at end of file + [ Executive producer ] + + OTHER + + * libcurl developers + * ICONSVG Project + * cJSON developers + * Pleroma developers + * You! :) \ No newline at end of file diff --git a/dist/treebird20.css b/dist/treebird20.css index e399b4d..ac8595c 100644 --- a/dist/treebird20.css +++ b/dist/treebird20.css @@ -13,6 +13,16 @@ body background-color: #f6f6f6; } +.hidden +{ + display: none; +} + +.pointer +{ + cursor: pointer; +} + /* Cleans up most of the tables */ table.ui-table td { @@ -536,39 +546,47 @@ ul li:first-child a.sidebarbtn flex: 1; } - -/* Special cases */ -.nobutton +.status-interact label +{ + display: block; + padding: 3px 8px; +} + +.status-interact svg.repeat.active +{ + stroke: #08d345; +} + +.status-interact svg.like.active +{ + fill: #fcd202; + stroke: #fcd202; +} + +.status-interact svg.like:hover, +.status-interact svg.like:active, +.statis-interact svg.like:focus +{ + stroke: #fcd202; + pointer: select; +} + +.status-interact svg.repeat:hover, +.status-interact svg.repeat:active, +.statis-interact svg.repeat:focus +{ + stroke: #08d345; +} + +.status-interact .count { - display: block !important; - background: none !important; - background-color: transparent !important; - color: #aa0000 !important; - padding: 4px 9px !important; - margin: 0 !important; - text-decoration: none; - cursor: pointer !important; - outline: inherit !important; font-size: 14px; - border: 0 !important; -} + padding-bottom: 3px; -.status-interact tr td:not(:last-child) .nobutton -{ - border-right: 1px solid #cacaca !important; - -} - -.status-interact .nobutton-active, -.nobutton:hover, -.nobutton:active, -.nobutton:focus -{ - background: linear-gradient(#fff, #aa3333, #aa2222, #aa0000) !important; - border: 0 !important; - border-right: 1px solid #cacaca !important; - color: #fff !important; - text-shadow: 0px 0px 5px #cc4444cc !important; + /* Move up */ + position: relative; + top: -5px; + margin-bottom: -5px; } /* Emoji reacts */ diff --git a/docs/sample/treebird.apache.conf b/docs/sample/treebird.apache.conf index a7ca70d..ffb2124 100644 --- a/docs/sample/treebird.apache.conf +++ b/docs/sample/treebird.apache.conf @@ -11,8 +11,9 @@ # Intercept meta files to be loaded before proxy RewriteEngine on - RewriteRule ^/(.*).css /$1.css [L] - RewriteRule ^/(treebird\_logo|favicon).png /$1.png [L] + RewriteRule ^/(.*).css$ /$1.css [L] + RewriteRule ^/svg/(.*).svg$ /svg/$1.svg [L] + RewriteRule ^/(treebird\_logo|favicon).png$ /$1.png [L] # Set PATH_INFO variable SetEnvIf Request_URI . proxy-fcgi-pathinfo=1 diff --git a/scripts/fcgistarter.sh b/scripts/fcgistarter.sh new file mode 100755 index 0000000..4a0702a --- /dev/null +++ b/scripts/fcgistarter.sh @@ -0,0 +1,3 @@ +#!/bin/bash +kill -9 $(pgrep treebird.cgi) > /dev/null 2>&1 +fcgistarter -c $PWD/../dist/treebird.cgi -p 4000 -N 1 diff --git a/src/status.c b/src/status.c index e0708de..34a219c 100644 --- a/src/status.c +++ b/src/status.c @@ -32,7 +32,7 @@ // Pages #include "../static/status.chtml" -#define NUM_STR " (%u)" +#define NUM_STR "%u" int try_post_status(mastodont_t* api) { @@ -121,11 +121,11 @@ char* construct_status(struct mstdnt_status* status, int* size) reply_count ? reply_count : "", config_url_prefix, status->id, - status->reblogged ? "nobutton-active" : "", + status->reblogged ? "active" : "", repeat_count ? repeat_count : "", config_url_prefix, status->id, - status->favourited ? "nobutton-active" : "", + status->favourited ? "active" : "", favourites_count ? favourites_count : "", config_url_prefix, status->id, diff --git a/static/status.html b/static/status.html index 95c44fa..2cdb6ce 100644 --- a/static/status.html +++ b/static/status.html @@ -24,32 +24,41 @@
- +
- +
- +
-
- + +
- - View - - - Emoji -