diff --git a/src/script/component/Ban.vue b/src/script/component/Ban.vue index 26feada..7d66e36 100644 --- a/src/script/component/Ban.vue +++ b/src/script/component/Ban.vue @@ -2,7 +2,7 @@ .ban.list-item .stamps .noactive.stamp(title='Expired', v-if='expired') - i.fa.fa-fw.fa-ban + i.fas.fa-fw.fa-ban .info .row .col-3 User @@ -22,7 +22,7 @@ .col(v-else='v-else') b This ban is permanent. .btn.btn-success.remove.mt-3(@click='$parent.$emit("pardon", id)') - i.fa.fa-fw.fa-check + i.fas.fa-fw.fa-check | Pardon diff --git a/src/script/component/OAuthClient.vue b/src/script/component/OAuthClient.vue index 6d76485..b82f4d4 100644 --- a/src/script/component/OAuthClient.vue +++ b/src/script/component/OAuthClient.vue @@ -4,22 +4,22 @@ .picture img(v-if="icon" :src="'/usercontent/images/' + icon") .noicon(v-else) - i.fa.fa-fw.fa-gears + i.fas.fa-fw.fa-cogs .info .stamps .verified.stamp(v-if="verified") - i.fa.fa-fw.fa-check + i.fas.fa-fw.fa-check .dropdown-wrapper.stamp(@click="dropdown = !dropdown" v-on-clickaway='away') - i.fa.fa-fw.fa-ellipsis-v + i.fas.fa-fw.fa-ellipsis-v transition(name="pop") .dropdown(v-show="dropdown") .title Actions .action(@click="$parent.$emit('edit', id)") - i.fa.fa-fw.fa-pencil + i.fas.fa-fw.fa-edit | Edit .action(@click="$parent.$emit('delete', id)") - i.fa.fa-fw.fa-trash + i.fas.fa-fw.fa-trash | Delete .name {{ title }} diff --git a/src/script/component/User.vue b/src/script/component/User.vue index 71c1256..eace907 100644 --- a/src/script/component/User.vue +++ b/src/script/component/User.vue @@ -11,41 +11,41 @@ .col-sm.info .stamps .stamp(title="Used an external login" v-if="!password") - i.fa.fa-fw.fa-sign-out + i.fas.fa-fw.fa-sign-out .noactive.stamp(v-if='activated == false' title='Not activated.') - i.fa.fa-fw.fa-envelope + i.fas.fa-fw.fa-envelope .totp.stamp(v-if='totp_enabled' title="Two-Factor Authentication Enabled") - i.fa.fa-fw.fa-shield + i.fas.fa-fw.fa-shield .dropdown-wrapper.stamp(@click="dropdown = !dropdown" v-on-clickaway='away') - i.fa.fa-fw.fa-ellipsis-v + i.fas.fa-fw.fa-ellipsis-v transition(name="pop") .dropdown(v-show="dropdown") .title Actions .action(v-on:click='$parent.$emit("edit", id)') - i.fa.fa-fw.fa-pencil + i.fas.fa-fw.fa-edit | Edit User .action(v-if='bannable' v-on:click='$parent.$emit("ban", id)') - i.fa.fa-fw.fa-ban + i.fas.fa-fw.fa-ban | Ban User .separator .action(v-if='!activated' v-on:click='activationToken') - i.fa.fa-fw.fa-envelope + i.fas.fa-fw.fa-envelope | Activation Email .action(v-if="totp_enabled" v-on:click='totpRevoke') - i.fa.fa-fw.fa-shield + i.fas.fa-fw.fa-shield | Revoke 2FA .action(v-on:click='resetPassword') - i.fa.fa-fw.fa-envelope + i.fas.fa-fw.fa-envelope | Password Email .action(v-on:click='$parent.$emit("email", email)') - i.fa.fa-fw.fa-envelope + i.fas.fa-fw.fa-envelope | Compose Email .separator .action(v-on:click='$parent.$emit("lock", id)' v-if="id != 1 && nw_privilege < 2") - i.fa.fa-fw.fa-lock + i.fas.fa-fw.fa-lock | Lock Account .display_name {{ display_name }} diff --git a/src/script/component/UserLockModal.vue b/src/script/component/UserLockModal.vue index ece2c9f..e1f31cf 100644 --- a/src/script/component/UserLockModal.vue +++ b/src/script/component/UserLockModal.vue @@ -9,7 +9,7 @@ p This action cannot be reverted (user records will be overwritten). .modal-footer.text-right button.btn.btn-danger(@click='submit') - i.fa.fa-fw.fa-lock + i.fas.fa-fw.fa-lock | Yes button.btn.btn-secondary(@click='close') No diff --git a/src/script/main.js b/src/script/main.js index 83717dc..4dec96a 100644 --- a/src/script/main.js +++ b/src/script/main.js @@ -50,7 +50,7 @@ $(document).ready(function () { } function loadAuthorizations () { - $('#clientlist').html('Loading list') + $('#clientlist').html('Loading list') $.get({ url: '/api/oauth2/authorized-clients', dataType: 'json', @@ -70,7 +70,7 @@ $(document).ready(function () { if (client.icon) { html += '' } else { - html += '
' + html += '
' } html += '' @@ -81,7 +81,7 @@ $(document).ready(function () { html += '
Authorized ' + new Date(client.created_at) + '
' html += '' - html += '
' + html += '
' html += '' $('#clientlist').append(html) @@ -193,7 +193,7 @@ $(document).ready(function () { } if ($('.newsfeed').length) { - $('.newsfeed').html('Loading feed') + $('.newsfeed').html('Loading feed') $.ajax({ type: 'get', url: '/api/news', diff --git a/src/style/main.styl b/src/style/main.styl index 05334b3..f70341e 100644 --- a/src/style/main.styl +++ b/src/style/main.styl @@ -400,6 +400,8 @@ noscript &#gitlab background-color: #292961 font-size: 115% + &#mastodon + background-color: #2b90d9 &:hover color: #ddd diff --git a/static/image/discord.svg b/static/image/discord.svg deleted file mode 100644 index 4613aa9..0000000 --- a/static/image/discord.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/views/admin/layout.pug b/views/admin/layout.pug index 2796a61..412a495 100644 --- a/views/admin/layout.pug +++ b/views/admin/layout.pug @@ -5,7 +5,7 @@ html meta(name="viewport", content="width=device-width, initial-scale=1, shrink-to-fit=no") block links link(rel="stylesheet", type="text/css", href="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css") - link(rel="stylesheet", type="text/css", href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css") + link(rel="stylesheet", type="text/css", href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/5.11.2/css/all.min.css") link(rel="stylesheet", type="text/css", href="/style/main.css") link(rel="stylesheet", type="text/css", href="/style/admin.css") script. diff --git a/views/authorization.pug b/views/authorization.pug index 73acc38..3a17eb2 100644 --- a/views/authorization.pug +++ b/views/authorization.pug @@ -18,7 +18,7 @@ block body img(src=client.icon) else .noicon - i.fa.fa-fw.fa-gears + i.fas.fa-fw.fa-cogs .info .name= client.title .description= client.description @@ -38,23 +38,23 @@ block body ul.nobulletin if scope.indexOf('email') !== -1 li - i.fa.fa-fw.fa-envelope + i.fas.fa-fw.fa-envelope |See your Email address li - i.fa.fa-fw.fa-user + i.fas.fa-fw.fa-user |See your Display Name .noaccess span This application cannot ul.nobulletin if scope.indexOf('email') === -1 li - i.fa.fa-fw.fa-envelope + i.fas.fa-fw.fa-envelope |See your Email address li - i.fa.fa-fw.fa-lock + i.fas.fa-fw.fa-lock |See your Password li - i.fa.fa-fw.fa-gears + i.fas.fa-fw.fa-gears |Change your Account Settings .alert.alert-info b Note! diff --git a/views/includes/avatar.pug b/views/includes/avatar.pug index 66191a6..3c33655 100644 --- a/views/includes/avatar.pug +++ b/views/includes/avatar.pug @@ -3,4 +3,4 @@ img#userAvatarFile(src="/usercontent/images/" + user.avatar_file) else .noavatar - i.fa.fa-fw.fa-user + i.fas.fa-fw.fa-user diff --git a/views/includes/external.pug b/views/includes/external.pug index f1be21e..6f58474 100644 --- a/views/includes/external.pug +++ b/views/includes/external.pug @@ -23,7 +23,7 @@ if auth.google script(src="https://apis.google.com/js/api:client.js") a.login-btn.google-login.float-lg-right - i.fa.fa-fw.fa-google + i.fab.fa-fw.fa-google span Log in With Google script. var googleUser = {}; @@ -61,9 +61,9 @@ startApp() if auth.twitter a.login-btn.twitter-login.login-dialog-pop.float-lg-right(href="/api/external/twitter/login") - i.fa.fa-fw.fa-twitter + i.fab.fa-fw.fa-twitter span Log in With Twitter if auth.discord a.login-btn.discord-login.login-dialog-pop.float-lg-right(href="/api/external/discord/login") - img(src="/static/image/discord.svg") + i.fab.fa-fw.fa-discord span Log in With Discord diff --git a/views/index.pug b/views/index.pug index 734bb7f..7baea97 100644 --- a/views/index.pug +++ b/views/index.pug @@ -31,18 +31,18 @@ block body .row .col-lg-4 span.circular-header.bg-warning - i.fa.fa-fw.fa-lock + i.fas.fa-fw.fa-lock h2 Secure Login p We have a secure login system with the possibility to even further secure your account with Two-Factor Authentication. .col-lg-4 span.circular-header.bg-success - i.fa.fa-fw.fa-git + i.fab.fa-fw.fa-git h2 Open Source p All of our services are Free and Open Source Software (FOSS) hosted on our own GitLab instance. p a.btn.btn-secondary(href="https://gitlab.icynet.eu/IcyNetwork", target="_blank") Browse Repositories .col-lg-4 span.circular-header.bg-info - i.fa.fa-fw.fa-users + i.fas.fa-fw.fa-users h2 Community-oriented p Our services are made to serve communities. We unite them all with a single login system with support for multiple authentication protocols. diff --git a/views/layout.pug b/views/layout.pug index a56d379..f5a0ea0 100644 --- a/views/layout.pug +++ b/views/layout.pug @@ -29,7 +29,7 @@ html block links link(rel="stylesheet", type="text/css", href="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css") link(rel="stylesheet", type="text/css", href="/style/main.css") - link(rel="stylesheet", type="text/css", href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css") + link(rel="stylesheet", type="text/css", href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/5.11.2/css/all.min.css") script(src="/script/main.js") block cookieconsent link(rel="stylesheet", type="text/css", href="//cdnjs.cloudflare.com/ajax/libs/cookieconsent2/3.0.4/cookieconsent.min.css") @@ -101,5 +101,7 @@ html | ยท a(href="/donate") Donate .d-flex.justify-content-center - a.btn-social#gitlab(href="https://gitlab.icynet.eu/IcyNetwork/" target="_blank") - i.fa.fa-fw.fa-gitlab + a.btn-social#gitlab(href="https://gitlab.icynet.eu/IcyNetwork/" rel="me" target="_blank") + i.fab.fa-fw.fa-gitlab + a.btn-social#mastodon(href="https://fosstodon.org/@icynet" rel="me" target="_blank") + i.fab.fa-fw.fa-mastodon diff --git a/views/user/settings.pug b/views/user/settings.pug index ec5d149..0d6555e 100644 --- a/views/user/settings.pug +++ b/views/user/settings.pug @@ -67,19 +67,19 @@ block body include ../includes/external.pug if google_auth == false a.option.disconnect.login-btn.float-lg-right(href="/api/external/google/remove") - i.fa.fa-fw.fa-times + i.fas.fa-fw.fa-times |Unlink Google if twitter_auth == false a.option.disconnect.login-btn.float-lg-right(href="/api/external/twitter/remove") - i.fa.fa-fw.fa-times + i.fas.fa-fw.fa-times |Unlink Twitter if facebook_auth == false a.option.disconnect.login-btn.float-lg-right(href="/api/external/facebook/remove") - i.fa.fa-fw.fa-times + i.fas.fa-fw.fa-times |Unlink Facebook if discord_auth == false a.option.disconnect.login-btn.float-lg-right(href="/api/external/discord/remove") - i.fa.fa-fw.fa-times + i.fas.fa-fw.fa-times |Unlink Discord .tab-pane.fade#v-pills-oauth2(role="tabpanel", aria-labelledby="v-pills-oauth2") h2 Authorized Applications @@ -90,16 +90,16 @@ block body h3 Account Actions if password a.option(href="/user/manage/password") - i.fa.fa-fw.fa-lock + i.fas.fa-fw.fa-lock |Change Password if totp a.option(href="/user/two-factor/disable") - i.fa.fa-fw.fa-lock + i.fas.fa-fw.fa-lock |Disable Two-Factor Authentication else a.option(href="/user/two-factor") - i.fa.fa-fw.fa-lock + i.fas.fa-fw.fa-lock |Enable Two-Factor Authentication a.option(href="/user/manage/email") - i.fa.fa-fw.fa-envelope + i.fas.fa-fw.fa-envelope |Change Email Address