oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-10-14 23:11:58 +00:00
Code Wiki Activity

4.22.6

Browse source 
First round of fixes, more to follow.

* Fixed: Appearance of tool-tip and balloon page elements.
This commit is contained in:
SirStendec 2021-05-17 17:02:23 -04:00
parent f0d68527b8
commit 89941d2ee5
47 changed files with 580 additions and 256 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/std-components/balloon.vue
View file

@ -34,9 +34,9 @@ export default {
if ( this.dir ) {
dir = this.dir.split('-').map(d => {
if ( d === 'up' || d === 'down' )
return `tw-tooltip--${d}`;
return `ffz-il-tooltip--${d}`;
if ( d === 'left' || d === 'right' )
return `tw-tooltip--align-${d}`;
return `ffz-il-tooltip--align-${d}`;
return '';
}).join(' ');
}

6
src/std-components/color-picker.vue
View file

@ -33,7 +33,7 @@
</div>
<div
v-else
:class="{'tw-tooltip__container': hasTooltip}"
:class="{'ffz-il-tooltip__container': hasTooltip}"
class="tw-relative"
>
<button
@ -51,13 +51,13 @@
v-if="open"
v-on-clickaway="closePicker"
:class="{'ffz-bottom-100': openUp}"
class="tw-absolute tw-z-above tw-tooltip--down tw-tooltip--align-right"
class="tw-absolute tw-z-above ffz-il-tooltip--down ffz-il-tooltip--align-right"
>
<chrome-picker :disable-alpha="! alpha" :value="colors" @input="onPick" />
</div>
<div
v-if="! open && hasTooltip"
class="tw-tooltip tw-tooltip--down tw-tooltip--align-right"
class="ffz-il-tooltip ffz-il-tooltip--down ffz-il-tooltip--align-right"
>
{{ tooltip }}
<div v-if="nullable" class="tw-regular">

4
src/std-components/icon-picker.vue
View file

@ -25,14 +25,14 @@
>
<button
v-if="clearable"
class="tw-absolute tw-right-0 tw-top-0 tw-button tw-button--text tw-tooltip__container"
class="tw-absolute tw-right-0 tw-top-0 tw-button tw-button--text ffz-il-tooltip__container"
@click="change('', false)"
@keydown.escape="open = false"
@focus="onFocus(false)"
@blur="onBlur"
>
<span class="tw-button__text ffz-i-trash" />
<div class="tw-tooltip tw-tooltip--up tw-tooltip--align-right">
<div class="ffz-il-tooltip ffz-il-tooltip--up ffz-il-tooltip--align-right">
{{ t('setting.icon.clear', 'Clear') }}
</div>
</button>

4
src/std-components/key-picker.vue
View file

@ -23,11 +23,11 @@
</div>
<button
class="ffz-button--hollow ffz-clear-key tw-absolute tw-top-0 tw-bottom-0 tw-right-0 tw-border-l tw-z-default tw-pd-x-1 tw-tooltip__container"
class="ffz-button--hollow ffz-clear-key tw-absolute tw-top-0 tw-bottom-0 tw-right-0 tw-border-l tw-z-default tw-pd-x-1 ffz-il-tooltip__container"
@click="clear"
>
<figure class="ffz-i-trash" />
<div class="tw-tooltip tw-tooltip--down tw-tooltip--align-right">
<div class="ffz-il-tooltip ffz-il-tooltip--down ffz-il-tooltip--align-right">
{{ t('setting.clear', 'Clear') }}
</div>
</button>

6
src/std-components/tooltip.vue
View file

@ -1,9 +1,9 @@
<template functional>
<div class="tw-relative tw-tooltip__container">
<div class="tw-relative ffz-il-tooltip__container">
<slot />
<div
:class="`tw-tooltip--align-${props.align||'center'} tw-tooltip--${props.above ? 'up' : 'down'}`"
class="tw-tooltip"
:class="`ffz-il-tooltip--align-${props.align||'center'} ffz-il-tooltip--${props.above ? 'up' : 'down'}`"
class="ffz-il-tooltip"
>
<slot name="tooltip" />
</div>