Browse Source

Fix spacing issues and remove 'register' link in particpate message for registration disabled pods.

Phil S. 1 week ago
parent
commit
1a9e0aa861
  1. 3
      internal/langs/active.en.toml
  2. 28
      internal/theme/static/css/99-yarn.css
  3. 7
      internal/theme/templates/conversation.html

3
internal/langs/active.en.toml

@ -29,7 +29,8 @@ ComposeMessageReplyFormBody = "Your reply"
ComposeMessageReplyFormSend = "Send"
ComposeMessageReplyTitle = "Compose Reply"
ComposeMessageTitle = "Compose Message"
ConversationJoinSummary = "<a href=\"/login\">Login</a> or <a href=\"/register\">Register</a> to participate in this yarn."
ConversationJoinSummaryLogin = "<a href=\"/login\">Login</a> [[ regallow ]] to join in on this yarn."
ConversationJoinSummaryRegister = "or <a href=\"/register\">Register</a>"
ConversationJoinTitle = "Participate"
ConversationSummary = "Recent twts in reply to"
ConversationTitle = "Yarn"

28
internal/theme/static/css/99-yarn.css

@ -344,6 +344,10 @@ div .p-summary:not(.image-gallery)>.caption-wrap .caption {
margin-bottom: 1.5rem;
}
.container article.container-fluid:last-child {
margin: 0 0 -2.75rem 0;
}
audio,
video {
max-width: 100%;
@ -575,6 +579,10 @@ article .p-summary blockquote {
padding: 0.75rem 0.75rem 0.5rem 0.75rem;
}
.h-feed article:first-child {
margin-top: 0;
}
.h-feed .p-summary a em,
em.twt-hash {
color: darkgray;
@ -869,11 +877,19 @@ pre {
margin: -0.5rem 1rem -1rem 1rem;
}
.h-feed article:first-child {
margin-top: 1rem;
}
div .h-feed:last-child,
div .h-entry:last-child {
margin-bottom: 2.5rem;
}
.container article.container-fluid:last-child {
margin: -1.5rem 0 -0.35rem 0;
}
.caption {
display: none;
}
@ -965,6 +981,10 @@ pre {
margin-bottom: -0.25rem;
}
.container article.container-fluid:last-child {
margin: 0 0 -1rem 0;
}
#convJoinSummary {
margin: 0 0 -1rem 0;
}
@ -993,6 +1013,10 @@ pre {
margin: -1rem 1rem -1.5rem 1rem;
}
.container article.container-fluid:last-child {
margin: 0 0 -1.4rem 0;
}
#convJoinSummary {
margin: 0.25rem 0 -0.25rem 0;
}
@ -1018,6 +1042,10 @@ pre {
margin: -1rem 1rem -2rem 1rem;
}
.container article.container-fluid:last-child {
margin: 0 0 -2.4rem 0;
}
#convJoinSummary {
margin: 0.5rem 0 -0.5rem 0;
}

7
internal/theme/templates/conversation.html

@ -13,7 +13,12 @@
<article class="container-fluid">
<hgroup>
<h2>{{ tr . "ConversationJoinTitle" }}</h2>
<h3>{{ (tr . "ConversationJoinSummary") | html }}</h3>
<h3>{{ if .RegisterDisabled }}
{{ (tr . "ConversationJoinSummaryLogin") | replace "[[ regallow ]]" "" | html }}
{{ else }}
{{ (tr . "ConversationJoinSummaryLogin") | replace "[[ regallow ]]" (tr . "ConversationJoinSummaryRegister") | html }}
{{ end }}
</h3>
</hgroup>
</article>
{{ end }}

Loading…
Cancel
Save