moon
/
bloat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use png icons instead of font icons

This commit is contained in:
r 2020-01-01 09:40:47 +00:00
parent ecf284453a
commit 2f4cd260fd
6 changed files with 48 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
static/main.css
View File

@ -90,24 +90,19 @@
display: inline-block; display: inline-block;
text-decoration: none; text-decoration: none;
color: #333333; color: #333333;
vertical-align: middle;
} }
.status-action a:hover, .status-action a:hover,
.status-action a:hover i { .status-action a:hover i {
color: #777777; opacity: 0.8;
} }
.status-action a.status-time { .status-action a.status-time {
width: auto; width: auto;
} }
.fa.liked { .status-action-count span {
color: yellow; vertical-align: middle;
}
.fa.retweeted {
color: green;
} }
.page-title { .page-title {
@ -175,6 +170,10 @@
display: flex; display: flex;
} }
.notification-info-text span {
vertical-align: middle;
}
.notification-follow-uname { .notification-follow-uname {
margin-top: 8px; margin-top: 8px;
} }
@ -334,19 +333,18 @@
display: inline-block; display: inline-block;
} }
.fa {
font-size: 11pt !important;
color: #444444;
}
.post-form-emoji-link { .post-form-emoji-link {
margin-left: 8px; margin-left: 4px;
} }
.post-form-emoji-link i { .post-form-emoji-link i {
font-size: 14pt !important; font-size: 14pt !important;
} }
.post-form-title {
vertical-align: middle;
}
.user-info { .user-info {
margin-bottom: 8px; margin-bottom: 8px;
display: flex; display: flex;
@ -401,3 +399,12 @@
#settings-form button[type=submit] { #settings-form button[type=submit] {
margin-top: 8px; margin-top: 8px;
} }
.icon {
height: 16px;
vertical-align: middle;
}
.icon.post-emoji {
height: 20px;
}

1
templates/header.tmpl
View File

@ -8,6 +8,5 @@
{{if .CustomCSS}} {{if .CustomCSS}}
<link rel="stylesheet" href="{{.CustomCSS}}"> <link rel="stylesheet" href="{{.CustomCSS}}">
{{end}} {{end}}
<link rel="stylesheet" href="/static/fonts/fork-awesome.css">
</head> </head>
<body> <body>

18
templates/notification.tmpl
View File

@ -12,10 +12,10 @@
</a> </a>
</div> </div>
<div> <div>
<div> <div class="notification-info-text">
<span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span> <span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span>
<i class="fa fa-user-plus"></i> <img class="icon" src="/static/icons/user-plus.png" alt="followed" />
followed you <span> followed you </span>
</div> </div>
<div class="notification-follow-uname"> <div class="notification-follow-uname">
@{{.Account.Acct}} @{{.Account.Acct}}
@ -34,10 +34,10 @@
</a> </a>
</div> </div>
<div> <div>
<div> <div class="notification-info-text">
<span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span> <span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span>
<i class="fa fa-retweet retweeted"></i> <img class="icon" src="/static/icons/retweeted.png" alt="retweeted" />
retweeted your post <span> retweeted your post </span>
</div> </div>
{{template "status" .Status}} {{template "status" .Status}}
</div> </div>
@ -51,10 +51,10 @@
</a> </a>
</div> </div>
<div> <div>
<div> <div class="notification-info-text">
<span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span> <span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span>
<i class="fa fa-star liked"></i> <img class="icon" src="/static/icons/liked.png" alt="liked" />
liked your post <span> liked your post </span>
</div> </div>
{{template "status" .Status}} {{template "status" .Status}}
</div> </div>

8
templates/postform.tmpl
View File

@ -1,12 +1,12 @@
<form class="post-form" action="/post" method="POST" enctype="multipart/form-data"> <form class="post-form" action="/post" method="POST" enctype="multipart/form-data">
{{if .ReplyContext}} {{if .ReplyContext}}
<input type="hidden" name="reply_to_id" value="{{.ReplyContext.InReplyToID}}" /> <input type="hidden" name="reply_to_id" value="{{.ReplyContext.InReplyToID}}" />
<label for="post-content"> Reply to {{.ReplyContext.InReplyToName}} </label> <label for="post-content" class="post-form-title"> Reply to {{.ReplyContext.InReplyToName}} </label>
{{else}} {{else}}
<label for="post-content"> New post </label> <label for="post-content" class="post-form-title"> New post </label>
{{end}} {{end}}
<a class="post-form-emoji-link" href="/emojis" target="_blank"> <a class="post-form-emoji-link" href="/emojis" target="_blank" title="emoji reference">
<i class="fa fa-smile-o" title="emoji reference"></i> <img class="icon post-emoji" src="/static/icons/smile-o.png" alt="emojis" />
</a> </a>
<div class="post-form-content-container"> <div class="post-form-content-container">
<textarea id="post-content" name="content" class="post-content" cols="50" rows="5">{{if .ReplyContext}}{{.ReplyContext.ReplyContent}}{{end}}</textarea> <textarea id="post-content" name="content" class="post-content" cols="50" rows="5">{{if .ReplyContext}}{{.ReplyContext.ReplyContent}}{{end}}</textarea>

26
templates/status.tmpl
View File

@ -5,7 +5,7 @@
<img class="status-profile-img" src="{{.Account.AvatarStatic}}" alt="avatar" /> <img class="status-profile-img" src="{{.Account.AvatarStatic}}" alt="avatar" />
</a> </a>
<span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span> <span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span>
<i class="fa fa-retweet retweeted"></i> <img class="icon" src="/static/icons/retweeted.png" alt="retweeted" />
retweeted retweeted
</div> </div>
{{template "status" .Reblog}} {{template "status" .Reblog}}
@ -28,23 +28,23 @@
</a> </a>
<a class="status-visibility"> <a class="status-visibility">
{{if eq .Visibility "public"}} {{if eq .Visibility "public"}}
<i class="fa fa-globe" title="Public"></i> <img class="icon" src="/static/icons/globe.png" alt="Public" title="Public" />
{{else if eq .Visibility "unlisted"}} {{else if eq .Visibility "unlisted"}}
<i class="fa fa-unlock-alt" title="Unlisted"></i> <img class="icon" src="/static/icons/unlock-alt.png" alt="Unlisted" title="Unlisted" />
{{else if eq .Visibility "private"}} {{else if eq .Visibility "private"}}
<i class="fa fa-lock" title="Private"></i> <img class="icon" src="/static/icons/lock.png" alt="Private" title="Private" />
{{else if eq .Visibility "direct"}} {{else if eq .Visibility "direct"}}
<i class="fa fa-envelope" title="Direct"></i> <img class="icon" src="/static/icons/envelope.png" alt="Direct" title="Direct" />
{{end}} {{end}}
</a> </a>
<a class="remote-link" href="{{.URL}}" target="_blank" title="source"> <a class="remote-link" href="{{.URL}}" target="_blank" title="source">
<i class="fa fa-link"></i> <img class="icon" src="/static/icons/link.png" alt="source" />
</a> </a>
</div> </div>
{{end}} {{end}}
<div class="status-reply-container"> <div class="status-reply-container">
{{if .InReplyToID}} {{if .InReplyToID}}
<i class="fa fa-mail-forward"></i> <img class="icon" src="/static/icons/mail-forward.png" alt="reply to" />
<a class="status-reply-to" href="{{if not .ShowReplies}}/thread/{{.InReplyToID}}{{end}}#status-{{.InReplyToID}}"> reply to {{.Pleroma.InReplyToAccountAcct}} </a> <a class="status-reply-to" href="{{if not .ShowReplies}}/thread/{{.InReplyToID}}{{end}}#status-{{.InReplyToID}}"> reply to {{.Pleroma.InReplyToAccountAcct}} </a>
{{if index .ReplyMap .ID}} <span class="status-reply-info-divider"> - </span> {{end}} {{if index .ReplyMap .ID}} <span class="status-reply-info-divider"> - </span> {{end}}
{{end}} {{end}}
@ -88,7 +88,7 @@
<div class="status-action-container"> <div class="status-action-container">
<div class="status-action"> <div class="status-action">
<a class="status-you" href="/thread/{{.ID}}?reply=true#status-{{.ID}}" title="reply"> <a class="status-you" href="/thread/{{.ID}}?reply=true#status-{{.ID}}" title="reply">
<i class="fa fa-reply"></i> <img class="icon" src="/static/icons/reply.png" alt="reply" />
</a> </a>
<a class="status-action-count" href="/thread/{{.ID}}#status-{{.ID}}" {{if .ThreadInNewTab}}target="_blank"{{end}}> <a class="status-action-count" href="/thread/{{.ID}}#status-{{.ID}}" {{if .ThreadInNewTab}}target="_blank"{{end}}>
<span> {{DisplayInteractionCount .RepliesCount}} </span> <span> {{DisplayInteractionCount .RepliesCount}} </span>
@ -97,16 +97,16 @@
<div class="status-action"> <div class="status-action">
{{if or (eq .Visibility "private") (eq .Visibility "direct")}} {{if or (eq .Visibility "private") (eq .Visibility "direct")}}
<a class="status-retweet" title="this status cannot be retweeted"> <a class="status-retweet" title="this status cannot be retweeted">
<i class="fa fa-retweet"></i> <img class="icon" src="/static/icons/retweet.png" alt="retweet" />
</a> </a>
{{else}} {{else}}
{{if .Reblogged}} {{if .Reblogged}}
<a class="status-retweet" href="/unretweet/{{.ID}}" title="undo retweet"> <a class="status-retweet" href="/unretweet/{{.ID}}" title="undo retweet">
<i class="fa fa-retweet retweeted"></i> <img class="icon" src="/static/icons/retweeted.png" alt="undo retweet" />
</a> </a>
{{else}} {{else}}
<a class="status-retweet" href="/retweet/{{.ID}}" title="retweet"> <a class="status-retweet" href="/retweet/{{.ID}}" title="retweet">
<i class="fa fa-retweet"></i> <img class="icon" src="/static/icons/retweet.png" alt="retweet" />
</a> </a>
{{end}} {{end}}
{{end}} {{end}}
@ -117,11 +117,11 @@
<div class="status-action"> <div class="status-action">
{{if .Favourited}} {{if .Favourited}}
<a class="status-like" href="/unlike/{{.ID}}" title="unlike"> <a class="status-like" href="/unlike/{{.ID}}" title="unlike">
<i class="fa fa-star liked"></i> <img class="icon" src="/static/icons/liked.png" alt="unlike" />
</a> </a>
{{else}} {{else}}
<a class="status-like" href="/like/{{.ID}}" title="like"> <a class="status-like" href="/like/{{.ID}}" title="like">
<i class="fa fa-star-o"></i> <img class="icon" src="/static/icons/star-o.png" alt="like" />
</a> </a>
{{end}} {{end}}
<a class="status-action-count" href="/likedby/{{.ID}}" title="click to see the the list"> <a class="status-action-count" href="/likedby/{{.ID}}" title="click to see the the list">

2
templates/user.tmpl
View File

@ -14,7 +14,7 @@
<span class="status-dname"> {{EmojiFilter .User.DisplayName .User.Emojis}} </span> <span class="status-dname"> {{EmojiFilter .User.DisplayName .User.Emojis}} </span>
<span class="status-uname"> {{.User.Acct}} </span> <span class="status-uname"> {{.User.Acct}} </span>
<a class="remote-link" href="{{.User.URL}}" target="_blank" title="remote profile"> <a class="remote-link" href="{{.User.URL}}" target="_blank" title="remote profile">
<i class="fa fa-link"></i> <img class="icon" src="/static/icons/link.png" alt="link" />
</a> </a>
</div> </div>
<div> <div>