Compare commits

..

No commits in common. "44f8a72a76fd8f0f5634c667d6c6ebb34e965fe2" and "6b3240dd9a5a853cd110347127864c7fd6c9ec73" have entirely different histories.

4 changed files with 11 additions and 23 deletions

View file

@ -123,17 +123,8 @@ frame, body {
display: inline-block; display: inline-block;
} }
.pleroma-reactions #emoj {
display: inline-block;
}
.pleroma-reactions form { .pleroma-reactions form {
display: block; display: inline-block;
}
.scrollable-emoji {
max-height: 240px;
overflow: scroll;
} }
.status-action a { .status-action a {
@ -642,7 +633,6 @@ kbd {
.profile-banner { .profile-banner {
width: 100%; width: 100%;
max-height: 500px;
} }
.block-label, .block-label,

View file

@ -3,26 +3,24 @@
<div class="page-title"> Reactions </div> <div class="page-title"> Reactions </div>
{{$st_id := .ID}} {{$st_id := .ID}}
<div class="page-title"> Add reaction </div> <div class="page-title"> Add reaction </div>
<div class="scrollable-emoji"> <div class="scrollable-emoji" style="overflow-y: scroll; height:200px;">
<div class="pleroma-reactions"> <div class="pleroma-reactions">
<form action="/react-with/{{$st_id}}" method="post" target="_self" title="Custom akkoma reactions (ex. :blobemoji:)">
<input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
<input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}">
<input type="text" placeholder=":blobfoxexample: or 🤗" id="akkoma-reaction" cols=30 name="akkoma-reaction" autofocus autocomplete="on">
<input type="submit" value="Send custom reaction" class="pleroma-emoji">
<a href="/emojis">emoji list</a>
</form>
{{$emoji_filter := $.Ctx.AddReactionsFilter}} {{$emoji_filter := $.Ctx.AddReactionsFilter}}
{{range $shortcode, $code := .ReactionEmojis}} {{range $shortcode, $code := .ReactionEmojis}}
{{if Allowed_emoji_page $shortcode $emoji_filter}} {{if Allowed_emoji_page $shortcode $emoji_filter}}
<form action="/react-with/{{$st_id}}?emoji={{$code}}" method="post" target="_self" > <form action="/react-with/{{$st_id}}?emoji={{$code}}" method="post" target="_self" title="{{$shortcode}}">
<input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}"> <input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
<input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}"> <input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}">
<input type="submit" value="{{$code}}" class="pleroma-emoji"> <input type="submit" value="{{$code}}" class="pleroma-emoji">
{{$shortcode}}
</form> </form>
{{end}} {{end}}
{{end}} {{end}}
<form action="/react-with/{{$st_id}}" method="post" target="_self" title="Custom akkoma reactions (ex. :blobemoji:)">
<input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
<input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}">
<input type="text" label="ex. :pleromaemoji:" id="akkoma-reaction" cols=30 name="akkoma-reaction">
<input type="submit" value="Send custom reaction" class="pleroma-emoji">
</form>
</div> </div>
</div> </div>

View file

@ -121,7 +121,7 @@
<div class="pleroma-reactions"> <div class="pleroma-reactions">
{{range .Pleroma.Reactions}} {{range .Pleroma.Reactions}}
{{$react := "react"}} {{if .Me}} {{$react = "unreact"}} {{end}} {{$react := "react"}} {{if .Me}} {{$react = "unreact"}} {{end}}
<form id="emoj" action="/{{$react}}-with/{{$st_id}}?emoji={{.Name}}" method="post" target="_self"> <form action="/{{$react}}-with/{{$st_id}}?emoji={{.Name}}" method="post" target="_self">
<input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}"> <input type="hidden" name="csrf_token" value="{{$.Ctx.CSRFToken}}">
<input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}"> <input type="hidden" name="referrer" value="{{$.Ctx.Referrer}}">
{{if .Url}} {{if .Url}}

View file

@ -135,7 +135,7 @@
<summary>Banner</summary> <summary>Banner</summary>
<div class="user-profile-img-container"> <div class="user-profile-img-container">
<a class="img-link" href="{{.User.Header}}" target="_blank"> <a class="img-link" href="{{.User.Header}}" target="_blank">
<img class="profile-banner" src="{{.User.Header}}" alt="profile-header" loading="lazy" /> <img class="profile-banner" src="{{.User.Header}}" alt="profile-header" height="500" loading="lazy" />
</a> </a>
</div> </div>
</details> </details>