projects / bloat / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 08cc2a6)
Switch to fork-awesome font
authorr <r@freesoftwareextremist.com>
Sun, 22 Dec 2019 19:43:03 +0000 (19:43 +0000)
committerr <r@freesoftwareextremist.com>
Sun, 22 Dec 2019 19:44:09 +0000 (19:44 +0000)
static/main.css patch | blob | history
templates/header.tmpl patch | blob | history
templates/notification.tmpl patch | blob | history
templates/postform.tmpl patch | blob | history
templates/status.tmpl patch | blob | history
templates/user.tmpl patch | blob | history

diff --git a/static/main.css b/static/main.css
index f09f5178fac3ae898a41cf0c25349a9023da7550..a4a069d9aaf5d6a0d44469ef563410918be68db9 100644 (file)
--- a/static/main.css
+++ b/static/main.css
@@ -76,7 +76,7 @@
        color: #777777;
 }
 
-.status-action .icon {
+.status-action .fa {
        margin: 0 4px 0 0;
 }
 
@@ -84,11 +84,11 @@
        width: auto;
 }
 
-.icon.dripicons-star.liked {
+.fa.liked {
        color: yellow;
 }
 
-.icon.dripicons-retweet.retweeted {
+.fa.retweeted {
        color: green;
 }
 
@@ -135,18 +135,13 @@
 .retweet-info .status-profile-img {
        height: 24px;
        width: 24px;
-       margin-bottom: -8px;
-       vertical-align: baseline;
+       vertical-align: middle;
 }
 
 .retweet-info .status-dname{
        margin-left: 4px
 }
 
-.retweet-info .icon.dripicons-retweet.retweeted {
-       vertical-align: sub;
-}
-
 .post-content {
        padding: 4px;
        font-size: 11pt;
@@ -187,7 +182,7 @@
        font-size: 10pt
 }
 
-.status-reply-container .icon {
+.status-reply-container .fa {
        font-size: 10pt;
        vertical-align: sub;
        margin-right: -2px;
@@ -335,3 +330,16 @@
        vertical-align: middle;
        display: inline-block;
 }
+
+.fa {
+       font-size: 11pt !important;
+       color: #444444;
+}
+
+.post-form-emoji-link {
+       margin-left: 8px;
+}
+
+.post-form-emoji-link i {
+       font-size: 14pt !important;
+}
diff --git a/templates/header.tmpl b/templates/header.tmpl
index 970aca4e6f1f14cd543d32b7c245896966c60693..9334e816311406f43727aa64f89265a8f7557a93 100644 (file)
--- a/templates/header.tmpl
+++ b/templates/header.tmpl
@@ -5,6 +5,6 @@
        <meta content='width=device-width, initial-scale=1' name='viewport'>
        <title> Web </title>
        <link rel="stylesheet" href="/static/main.css" />
-       <link rel="stylesheet" href="/static/fonts/fonts.css">
+       <link rel="stylesheet" href="/static/fonts/fork-awesome.css">
 </head>
 <body>
diff --git a/templates/notification.tmpl b/templates/notification.tmpl
index e46ce8abd1279dd73986cc374cf57cd9e1507410..259328a6afed0374310def26366b3424fd828b35 100644 (file)
--- a/templates/notification.tmpl
+++ b/templates/notification.tmpl
@@ -14,7 +14,7 @@
                <div>
                        <div>
                                <span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span>  
-                               <span class="icon dripicons-user-group"></span> 
+                               <i class="fa fa-user-plus"></i>
                                followed you
                        </div>
                        <div class="notification-follow-uname">
@@ -36,7 +36,7 @@
                <div>
                        <div>
                                <span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span>  
-                               <span class="icon dripicons-retweet retweeted"></span> 
+                               <i class="fa fa-retweet retweeted"></i>
                                retweeted your post
                        </div>
                        {{template "status" .Status}}
@@ -53,7 +53,7 @@
                <div>
                        <div>
                                <span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span>  
-                               <span class="icon dripicons-star liked"></span> 
+                               <i class="fa fa-star liked"></i>
                                liked your post
                        </div>
                        {{template "status" .Status}}
diff --git a/templates/postform.tmpl b/templates/postform.tmpl
index ea93efad9cce655e44d1ef56ede80e23e9a130ed..54024f08221d805d647d32d64e2672ec2a6896f1 100644 (file)
--- a/templates/postform.tmpl
+++ b/templates/postform.tmpl
@@ -5,6 +5,9 @@
        {{else}}
        <label for="post-content"> New post </label>
        {{end}}
+       <a class="post-form-emoji-link" href="/emojis" target="_blank">
+               <i class="fa fa-smile-o" title="emoji reference"></i>
+       </a>
        <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>
        </div>
@@ -22,6 +25,8 @@
                        <input type="checkbox" id="nsfw-checkbox" name="is_nsfw" value="on">
                        <label for="nsfw-checkbox"> Is NSFW </label>
                </span>
+               <span class="post-form-field">
+               </span>
        </div>
        <div>
                <span class="post-form-field">
diff --git a/templates/status.tmpl b/templates/status.tmpl
index c27a67434eaefef276b2d9aaa8077c20d3c5b614..26912b7c5223ece74ae185318cbf2afec3a0d841 100644 (file)
--- a/templates/status.tmpl
+++ b/templates/status.tmpl
@@ -5,7 +5,7 @@
                        <img class="status-profile-img" src="{{.Account.AvatarStatic}}" alt="avatar" />
                </a>
                <span class="status-dname"> {{EmojiFilter .Account.DisplayName .Account.Emojis}} </span>  
-               <span class="icon dripicons-retweet retweeted"></span> 
+               <i class="fa fa-retweet retweeted"></i>
                retweeted
        </div>
        {{template "status" .Reblog}}
@@ -28,23 +28,23 @@
                                </a>
                                <a class="status-visibility">
                                        {{if eq .Visibility "public"}}
-                                       <span class="icon dripicons-web" title="Public"></span> 
+                                       <i class="fa fa-globe" title="Public"></i>
                                        {{else if eq .Visibility "unlisted"}}
-                                       <span class="icon dripicons-lock-open" title="Unlisted"></span> 
+                                       <i class="fa fa-unlock-alt" title="Unlisted"></i>
                                        {{else if eq .Visibility "private"}}
-                                       <span class="icon dripicons-lock" title="Private"></span> 
+                                       <i class="fa fa-lock" title="Private"></i>
                                        {{else if eq .Visibility "direct"}}
-                                       <span class="icon dripicons-mail" title="Direct"></span> 
+                                       <i class="fa fa-envelop" title="Direct"></i>
                                        {{end}}
                                </a>
                                <a class="remote-link" href="{{.URL}}" target="_blank" title="source">
-                                       <span class="icon dripicons-link"></span> 
+                                       <i class="fa fa-link"></i>
                                </a>
                        </div>
                        {{end}}
                        <div class="status-reply-container">
                                {{if .InReplyToID}}
-                               <span class="icon dripicons-forward"></span> 
+                               <i class="fa fa-mail-forward"></i>
                                <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}}
                                {{end}}
@@ -87,35 +87,35 @@
                        </div>
                        <div class="status-action"> 
                                <a class="status-you" href="/thread/{{.ID}}?reply=true#status-{{.ID}}" title="reply"> 
-                                       <span class="icon dripicons-reply"></span> 
+                                       <i class="fa fa-reply"></i>
                                        <span> {{DisplayInteractionCount .RepliesCount}} </span>
                                </a>
                                {{if or (eq .Visibility "private") (eq .Visibility "direct")}}
                                <a class="status-retweet" title="this status cannot be retweeted"> 
-                                       <span class="icon dripicons-retweet"></span> 
+                                       <i class="fa fa-retweet"></i>
                                        <span> {{DisplayInteractionCount .ReblogsCount}} </span>
                                </a>
                                {{else}}
                                        {{if .Reblogged}}
                                        <a class="status-retweet" href="/unretweet/{{.ID}}" title="undo retweet"> 
-                                               <span class="icon dripicons-retweet retweeted"></span> 
+                                               <i class="fa fa-retweet retweeted"></i>
                                                <span> {{DisplayInteractionCount .ReblogsCount}} </span>
                                        </a>
                                        {{else}}
                                        <a class="status-retweet" href="/retweet/{{.ID}}" title="retweet"> 
-                                               <span class="icon dripicons-retweet"></span> 
+                                               <i class="fa fa-retweet"></i>
                                                <span> {{DisplayInteractionCount .ReblogsCount}} </span>
                                        </a>
                                        {{end}}
                                {{end}}
                                {{if .Favourited}}
                                <a class="status-like" href="/unlike/{{.ID}}" title="unlike"> 
-                                       <span class="icon dripicons-star liked"></span> 
+                                       <i class="fa fa-star liked"></i>
                                        <span> {{DisplayInteractionCount .FavouritesCount}} </span>
                                </a>
                                {{else}}
                                <a class="status-like" href="/like/{{.ID}}" title="like"> 
-                                       <span class="icon dripicons-star"></span> 
+                                       <i class="fa fa-star-o"></i>
                                        <span> {{DisplayInteractionCount .FavouritesCount}} </span>
                                </a>
                                {{end}}
diff --git a/templates/user.tmpl b/templates/user.tmpl
index ccb0e4a7f93c40adae9dab354453f11e2e6f2cb6..c7aa1e8148aa09bf4a073f8b6b3f24ed0aee11c2 100644 (file)
--- a/templates/user.tmpl
+++ b/templates/user.tmpl
@@ -14,7 +14,7 @@
                        <span class="status-dname"> {{EmojiFilter .User.DisplayName .User.Emojis}} </span>  
                        <span class="status-uname"> {{.User.Acct}} </span>
                        <a class="remote-link" href="{{.User.URL}}" target="_blank" title="remote profile">
-                               <span class="icon dripicons-link"></span> 
+                               <i class="fa fa-link"></i>
                        </a>
                </div>
                <div>
The BloatFE, from https://git.freesoftwareextremist.com/bloat .