supernets/hardlounge
supernets/hardlounge
4
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3088 from thelounge/astorije/vue-network-status

Browse Source 
Use Vue to show/hide insecure/disconnected icons instead of CSS
This commit is contained in:
Jérémie Astori 2019-02-27 03:15:37 -05:00 committed by GitHub
commit 67effc59dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/components/Channel.vue
View File

@ -14,7 +14,8 @@
<span <span
v-if="channel.state === 0" v-if="channel.state === 0"
class="parted-channel-tooltip tooltipped tooltipped-w" class="parted-channel-tooltip tooltipped tooltipped-w"
aria-label="Not currently joined"> aria-label="Not currently joined"
>
<span class="parted-channel-icon" /> <span class="parted-channel-icon" />
</span> </span>
<span <span

2
client/components/NetworkLobby.vue
View File

@ -22,12 +22,14 @@
class="name" class="name"
>{{ channel.name }}</span> >{{ channel.name }}</span>
<span <span
v-if="network.status.connected && !network.status.secure"
class="not-secure-tooltip tooltipped tooltipped-w" class="not-secure-tooltip tooltipped tooltipped-w"
aria-label="Insecure connection" aria-label="Insecure connection"
> >
<span class="not-secure-icon" /> <span class="not-secure-icon" />
</span> </span>
<span <span
v-if="!network.status.connected"
class="not-connected-tooltip tooltipped tooltipped-w" class="not-connected-tooltip tooltipped tooltipped-w"
aria-label="Disconnected" aria-label="Disconnected"
> >

15
client/css/style.css
View File

@ -661,21 +661,6 @@ background on hover (unless active) */
color: #c0f8c3; color: #c0f8c3;
} }
#sidebar .not-connected-tooltip,
#sidebar .not-secure-tooltip {
display: none;
}
#sidebar .not-connected .not-connected-tooltip,
#sidebar .not-secure .not-secure-tooltip {
display: inline-block;
}
#sidebar .not-connected .not-secure-tooltip {
/* Do not display insecure icon if disconnected */
display: none;
}
#sidebar .not-connected-tooltip, #sidebar .not-connected-tooltip,
#sidebar .not-secure-tooltip, #sidebar .not-secure-tooltip,
#sidebar .parted-channel-tooltip { #sidebar .parted-channel-tooltip {