IcyNetwork/IcyNet.eu
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade font awesome

Browse Source
This commit is contained in:
Evert Prants 2019-10-26 12:54:51 +03:00
parent 7048ee3f45
commit 78398ebaf3
Signed by: evert
GPG Key ID: 1688DA83D222D0B5
14 changed files with 52 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/script/component/Ban.vue
View File

@ -2,7 +2,7 @@
.ban.list-item .ban.list-item
.stamps .stamps
.noactive.stamp(title='Expired', v-if='expired') .noactive.stamp(title='Expired', v-if='expired')
i.fa.fa-fw.fa-ban i.fas.fa-fw.fa-ban
.info .info
.row .row
.col-3 User .col-3 User
@ -22,7 +22,7 @@
.col(v-else='v-else') .col(v-else='v-else')
b This ban is permanent. b This ban is permanent.
.btn.btn-success.remove.mt-3(@click='$parent.$emit("pardon", id)') .btn.btn-success.remove.mt-3(@click='$parent.$emit("pardon", id)')
i.fa.fa-fw.fa-check i.fas.fa-fw.fa-check
| Pardon | Pardon
</template> </template>

10
src/script/component/OAuthClient.vue
View File

@ -4,22 +4,22 @@
.picture .picture
img(v-if="icon" :src="'/usercontent/images/' + icon") img(v-if="icon" :src="'/usercontent/images/' + icon")
.noicon(v-else) .noicon(v-else)
i.fa.fa-fw.fa-gears i.fas.fa-fw.fa-cogs
.info .info
.stamps .stamps
.verified.stamp(v-if="verified") .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') .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") transition(name="pop")
.dropdown(v-show="dropdown") .dropdown(v-show="dropdown")
.title Actions .title Actions
.action(@click="$parent.$emit('edit', id)") .action(@click="$parent.$emit('edit', id)")
i.fa.fa-fw.fa-pencil i.fas.fa-fw.fa-edit
|&nbsp;Edit |&nbsp;Edit
.action(@click="$parent.$emit('delete', id)") .action(@click="$parent.$emit('delete', id)")
i.fa.fa-fw.fa-trash i.fas.fa-fw.fa-trash
|&nbsp;Delete |&nbsp;Delete
.name {{ title }} .name {{ title }}

22
src/script/component/User.vue
View File

@ -11,41 +11,41 @@
.col-sm.info .col-sm.info
.stamps .stamps
.stamp(title="Used an external login" v-if="!password") .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.') .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") .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') .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") transition(name="pop")
.dropdown(v-show="dropdown") .dropdown(v-show="dropdown")
.title Actions .title Actions
.action(v-on:click='$parent.$emit("edit", id)') .action(v-on:click='$parent.$emit("edit", id)')
i.fa.fa-fw.fa-pencil i.fas.fa-fw.fa-edit
|&nbsp;Edit User |&nbsp;Edit User
.action(v-if='bannable' v-on:click='$parent.$emit("ban", id)') .action(v-if='bannable' v-on:click='$parent.$emit("ban", id)')
i.fa.fa-fw.fa-ban i.fas.fa-fw.fa-ban
|&nbsp;Ban User |&nbsp;Ban User
.separator .separator
.action(v-if='!activated' v-on:click='activationToken') .action(v-if='!activated' v-on:click='activationToken')
i.fa.fa-fw.fa-envelope i.fas.fa-fw.fa-envelope
|&nbsp;Activation Email |&nbsp;Activation Email
.action(v-if="totp_enabled" v-on:click='totpRevoke') .action(v-if="totp_enabled" v-on:click='totpRevoke')
i.fa.fa-fw.fa-shield i.fas.fa-fw.fa-shield
|&nbsp;Revoke 2FA |&nbsp;Revoke 2FA
.action(v-on:click='resetPassword') .action(v-on:click='resetPassword')
i.fa.fa-fw.fa-envelope i.fas.fa-fw.fa-envelope
|&nbsp;Password Email |&nbsp;Password Email
.action(v-on:click='$parent.$emit("email", email)') .action(v-on:click='$parent.$emit("email", email)')
i.fa.fa-fw.fa-envelope i.fas.fa-fw.fa-envelope
|&nbsp;Compose Email |&nbsp;Compose Email
.separator .separator
.action(v-on:click='$parent.$emit("lock", id)' v-if="id != 1 && nw_privilege < 2") .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
|&nbsp;Lock Account |&nbsp;Lock Account
.display_name {{ display_name }} .display_name {{ display_name }}

2
src/script/component/UserLockModal.vue
View File

@ -9,7 +9,7 @@
p This action cannot be reverted (user records will be overwritten). p This action cannot be reverted (user records will be overwritten).
.modal-footer.text-right .modal-footer.text-right
button.btn.btn-danger(@click='submit') button.btn.btn-danger(@click='submit')
i.fa.fa-fw.fa-lock i.fas.fa-fw.fa-lock
|&nbsp;Yes |&nbsp;Yes
button.btn.btn-secondary(@click='close') No button.btn.btn-secondary(@click='close') No
</template> </template>

8
src/script/main.js
View File

@ -50,7 +50,7 @@ $(document).ready(function () {
} }
function loadAuthorizations () { function loadAuthorizations () {
$('#clientlist').html('<span class="load"><i class="fa fa-spin fa-spinner fa-2x"></i><span>Loading list</span></span>') $('#clientlist').html('<span class="load"><i class="fas fa-spin fa-spinner fa-2x"></i><span>Loading list</span></span>')
$.get({ $.get({
url: '/api/oauth2/authorized-clients', url: '/api/oauth2/authorized-clients',
dataType: 'json', dataType: 'json',
@ -70,7 +70,7 @@ $(document).ready(function () {
if (client.icon) { if (client.icon) {
html += '<img src="' + client.icon + '">' html += '<img src="' + client.icon + '">'
} else { } else {
html += '<div class="noicon"><i class="fa fa-fw fa-gears"></i></div>' html += '<div class="noicon"><i class="fas fa-fw fa-cogs"></i></div>'
} }
html += '</div>' html += '</div>'
@ -81,7 +81,7 @@ $(document).ready(function () {
html += '<div class="timestamp">Authorized ' + new Date(client.created_at) + '</div>' html += '<div class="timestamp">Authorized ' + new Date(client.created_at) + '</div>'
html += '</div>' html += '</div>'
html += '<div class="remove" id="deleteclient"><i class="fa fa-fw fa-ban"></i></div>' html += '<div class="remove" id="deleteclient"><i class="fas fa-fw fa-ban"></i></div>'
html += '</div>' html += '</div>'
$('#clientlist').append(html) $('#clientlist').append(html)
@ -193,7 +193,7 @@ $(document).ready(function () {
} }
if ($('.newsfeed').length) { if ($('.newsfeed').length) {
$('.newsfeed').html('<span class="load"><i class="fa fa-spin fa-spinner fa-2x"></i><span>Loading feed</span></span>') $('.newsfeed').html('<span class="load"><i class="fas fa-spin fa-spinner fa-2x"></i><span>Loading feed</span></span>')
$.ajax({ $.ajax({
type: 'get', type: 'get',
url: '/api/news', url: '/api/news',

2
src/style/main.styl
View File

@ -400,6 +400,8 @@ noscript
&#gitlab &#gitlab
background-color: #292961 background-color: #292961
font-size: 115% font-size: 115%
&#mastodon
background-color: #2b90d9
&:hover &:hover
color: #ddd color: #ddd

1
static/image/discord.svg
View File

@ -1 +0,0 @@
<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 245 240"><style>.st0{fill:#FFFFFF;}</style><path class="st0" d="M104.4 103.9c-5.7 0-10.2 5-10.2 11.1s4.6 11.1 10.2 11.1c5.7 0 10.2-5 10.2-11.1.1-6.1-4.5-11.1-10.2-11.1zM140.9 103.9c-5.7 0-10.2 5-10.2 11.1s4.6 11.1 10.2 11.1c5.7 0 10.2-5 10.2-11.1s-4.5-11.1-10.2-11.1z"/><path class="st0" d="M189.5 20h-134C44.2 20 35 29.2 35 40.6v135.2c0 11.4 9.2 20.6 20.5 20.6h113.4l-5.3-18.5 12.8 11.9 12.1 11.2 21.5 19V40.6c0-11.4-9.2-20.6-20.5-20.6zm-38.6 130.6s-3.6-4.3-6.6-8.1c13.1-3.7 18.1-11.9 18.1-11.9-4.1 2.7-8 4.6-11.5 5.9-5 2.1-9.8 3.5-14.5 4.3-9.6 1.8-18.4 1.3-25.9-.1-5.7-1.1-10.6-2.7-14.7-4.3-2.3-.9-4.8-2-7.3-3.4-.3-.2-.6-.3-.9-.5-.2-.1-.3-.2-.4-.3-1.8-1-2.8-1.7-2.8-1.7s4.8 8 17.5 11.8c-3 3.8-6.7 8.3-6.7 8.3-22.1-.7-30.5-15.2-30.5-15.2 0-32.2 14.4-58.3 14.4-58.3 14.4-10.8 28.1-10.5 28.1-10.5l1 1.2c-18 5.2-26.3 13.1-26.3 13.1s2.2-1.2 5.9-2.9c10.7-4.7 19.2-6 22.7-6.3.6-.1 1.1-.2 1.7-.2 6.1-.8 13-1 20.2-.2 9.5 1.1 19.7 3.9 30.1 9.6 0 0-7.9-7.5-24.9-12.7l1.4-1.6s13.7-.3 28.1 10.5c0 0 14.4 26.1 14.4 58.3 0 0-8.5 14.5-30.6 15.2z"/></svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

2
views/admin/layout.pug
View File

@ -5,7 +5,7 @@ html
meta(name="viewport", content="width=device-width, initial-scale=1, shrink-to-fit=no") meta(name="viewport", content="width=device-width, initial-scale=1, shrink-to-fit=no")
block links 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="//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/main.css")
link(rel="stylesheet", type="text/css", href="/style/admin.css") link(rel="stylesheet", type="text/css", href="/style/admin.css")
script. script.

12
views/authorization.pug
View File

@ -18,7 +18,7 @@ block body
img(src=client.icon) img(src=client.icon)
else else
.noicon .noicon
i.fa.fa-fw.fa-gears i.fas.fa-fw.fa-cogs
.info .info
.name= client.title .name= client.title
.description= client.description .description= client.description
@ -38,23 +38,23 @@ block body
ul.nobulletin ul.nobulletin
if scope.indexOf('email') !== -1 if scope.indexOf('email') !== -1
li li
i.fa.fa-fw.fa-envelope i.fas.fa-fw.fa-envelope
|See your Email address |See your Email address
li li
i.fa.fa-fw.fa-user i.fas.fa-fw.fa-user
|See your Display Name |See your Display Name
.noaccess .noaccess
span This application cannot span This application cannot
ul.nobulletin ul.nobulletin
if scope.indexOf('email') === -1 if scope.indexOf('email') === -1
li li
i.fa.fa-fw.fa-envelope i.fas.fa-fw.fa-envelope
|See your Email address |See your Email address
li li
i.fa.fa-fw.fa-lock i.fas.fa-fw.fa-lock
|See your Password |See your Password
li li
i.fa.fa-fw.fa-gears i.fas.fa-fw.fa-gears
|Change your Account Settings |Change your Account Settings
.alert.alert-info .alert.alert-info
b Note! b Note!

2
views/includes/avatar.pug
View File

@ -3,4 +3,4 @@
img#userAvatarFile(src="/usercontent/images/" + user.avatar_file) img#userAvatarFile(src="/usercontent/images/" + user.avatar_file)
else else
.noavatar .noavatar
i.fa.fa-fw.fa-user i.fas.fa-fw.fa-user

6
views/includes/external.pug
View File

@ -23,7 +23,7 @@
if auth.google if auth.google
script(src="https://apis.google.com/js/api:client.js") script(src="https://apis.google.com/js/api:client.js")
a.login-btn.google-login.float-lg-right 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 span Log in With Google
script. script.
var googleUser = {}; var googleUser = {};
@ -61,9 +61,9 @@
startApp() startApp()
if auth.twitter if auth.twitter
a.login-btn.twitter-login.login-dialog-pop.float-lg-right(href="/api/external/twitter/login") 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 span Log in With Twitter
if auth.discord if auth.discord
a.login-btn.discord-login.login-dialog-pop.float-lg-right(href="/api/external/discord/login") 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 span Log in With Discord

6
views/index.pug
View File

@ -31,18 +31,18 @@ block body
.row .row
.col-lg-4 .col-lg-4
span.circular-header.bg-warning span.circular-header.bg-warning
i.fa.fa-fw.fa-lock i.fas.fa-fw.fa-lock
h2 Secure Login h2 Secure Login
p We have a secure login system with the possibility to even further secure your account with Two-Factor Authentication. p We have a secure login system with the possibility to even further secure your account with Two-Factor Authentication.
.col-lg-4 .col-lg-4
span.circular-header.bg-success span.circular-header.bg-success
i.fa.fa-fw.fa-git i.fab.fa-fw.fa-git
h2 Open Source h2 Open Source
p All of our services are Free and Open Source Software (FOSS) hosted on our own GitLab instance. p All of our services are Free and Open Source Software (FOSS) hosted on our own GitLab instance.
p p
a.btn.btn-secondary(href="https://gitlab.icynet.eu/IcyNetwork", target="_blank") Browse Repositories a.btn.btn-secondary(href="https://gitlab.icynet.eu/IcyNetwork", target="_blank") Browse Repositories
.col-lg-4 .col-lg-4
span.circular-header.bg-info span.circular-header.bg-info
i.fa.fa-fw.fa-users i.fas.fa-fw.fa-users
h2 Community-oriented 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. p Our services are made to serve communities. We unite them all with a single login system with support for multiple authentication protocols.

8
views/layout.pug
View File

@ -29,7 +29,7 @@ html
block links 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="//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="/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") script(src="/script/main.js")
block cookieconsent block cookieconsent
link(rel="stylesheet", type="text/css", href="//cdnjs.cloudflare.com/ajax/libs/cookieconsent2/3.0.4/cookieconsent.min.css") 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 a(href="/donate") Donate
.d-flex.justify-content-center .d-flex.justify-content-center
a.btn-social#gitlab(href="https://gitlab.icynet.eu/IcyNetwork/" target="_blank") a.btn-social#gitlab(href="https://gitlab.icynet.eu/IcyNetwork/" rel="me" target="_blank")
i.fa.fa-fw.fa-gitlab 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

16
views/user/settings.pug
View File

@ -67,19 +67,19 @@ block body
include ../includes/external.pug include ../includes/external.pug
if google_auth == false if google_auth == false
a.option.disconnect.login-btn.float-lg-right(href="/api/external/google/remove") 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 |Unlink Google
if twitter_auth == false if twitter_auth == false
a.option.disconnect.login-btn.float-lg-right(href="/api/external/twitter/remove") 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 |Unlink Twitter
if facebook_auth == false if facebook_auth == false
a.option.disconnect.login-btn.float-lg-right(href="/api/external/facebook/remove") 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 |Unlink Facebook
if discord_auth == false if discord_auth == false
a.option.disconnect.login-btn.float-lg-right(href="/api/external/discord/remove") 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 |Unlink Discord
.tab-pane.fade#v-pills-oauth2(role="tabpanel", aria-labelledby="v-pills-oauth2") .tab-pane.fade#v-pills-oauth2(role="tabpanel", aria-labelledby="v-pills-oauth2")
h2 Authorized Applications h2 Authorized Applications
@ -90,16 +90,16 @@ block body
h3 Account Actions h3 Account Actions
if password if password
a.option(href="/user/manage/password") a.option(href="/user/manage/password")
i.fa.fa-fw.fa-lock i.fas.fa-fw.fa-lock
|Change Password |Change Password
if totp if totp
a.option(href="/user/two-factor/disable") a.option(href="/user/two-factor/disable")
i.fa.fa-fw.fa-lock i.fas.fa-fw.fa-lock
|Disable Two-Factor Authentication |Disable Two-Factor Authentication
else else
a.option(href="/user/two-factor") a.option(href="/user/two-factor")
i.fa.fa-fw.fa-lock i.fas.fa-fw.fa-lock
|Enable Two-Factor Authentication |Enable Two-Factor Authentication
a.option(href="/user/manage/email") a.option(href="/user/manage/email")
i.fa.fa-fw.fa-envelope i.fas.fa-fw.fa-envelope
|Change Email Address |Change Email Address