Merge branch 'themes3' into shigusegubu-themes3
This commit is contained in:
commit
dd082208aa
8 changed files with 28 additions and 7 deletions
10
src/App.scss
10
src/App.scss
|
@ -411,6 +411,10 @@ nav {
|
||||||
--__horizontal-gap: 0.75em;
|
--__horizontal-gap: 0.75em;
|
||||||
--__vertical-gap: 0.5em;
|
--__vertical-gap: 0.5em;
|
||||||
|
|
||||||
|
&.-non-interactive {
|
||||||
|
cursor: auto;
|
||||||
|
}
|
||||||
|
|
||||||
&.-active,
|
&.-active,
|
||||||
&:hover {
|
&:hover {
|
||||||
border-top-width: 1px;
|
border-top-width: 1px;
|
||||||
|
@ -488,7 +492,8 @@ textarea {
|
||||||
.input {
|
.input {
|
||||||
&.unstyled {
|
&.unstyled {
|
||||||
border-radius: 0;
|
border-radius: 0;
|
||||||
background: none;
|
/* stylelint-disable-next-line declaration-no-important */
|
||||||
|
background: none !important;
|
||||||
box-shadow: none;
|
box-shadow: none;
|
||||||
height: unset;
|
height: unset;
|
||||||
}
|
}
|
||||||
|
@ -528,6 +533,7 @@ textarea {
|
||||||
&:checked + label::before {
|
&:checked + label::before {
|
||||||
box-shadow: var(--shadow);
|
box-shadow: var(--shadow);
|
||||||
background-color: var(--background);
|
background-color: var(--background);
|
||||||
|
color: var(--text);
|
||||||
}
|
}
|
||||||
|
|
||||||
&:disabled {
|
&:disabled {
|
||||||
|
@ -541,7 +547,7 @@ textarea {
|
||||||
+ label::before {
|
+ label::before {
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
content: "";
|
content: "•";
|
||||||
transition: box-shadow 200ms;
|
transition: box-shadow 200ms;
|
||||||
width: 1.1em;
|
width: 1.1em;
|
||||||
height: 1.1em;
|
height: 1.1em;
|
||||||
|
|
|
@ -82,6 +82,13 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.video-container {
|
||||||
|
border: none;
|
||||||
|
outline: none;
|
||||||
|
color: inherit;
|
||||||
|
background: transparent;
|
||||||
|
}
|
||||||
|
|
||||||
.audio-container {
|
.audio-container {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: flex-end;
|
align-items: flex-end;
|
||||||
|
|
|
@ -4,7 +4,8 @@ export default {
|
||||||
states: {
|
states: {
|
||||||
disabled: ':disabled',
|
disabled: ':disabled',
|
||||||
hover: ':hover:not(:disabled)',
|
hover: ':hover:not(:disabled)',
|
||||||
focused: ':focus-within'
|
focused: ':focus-within',
|
||||||
|
toggled: '.toggled'
|
||||||
},
|
},
|
||||||
validInnerComponents: [
|
validInnerComponents: [
|
||||||
'Text',
|
'Text',
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
v-for="item in items"
|
v-for="item in items"
|
||||||
:key="getKey(item)"
|
:key="getKey(item)"
|
||||||
class="list-item"
|
class="list-item"
|
||||||
:class="getClass(item)"
|
:class="[getClass(item), nonInteractive ? '-non-interactive' : '']"
|
||||||
role="listitem"
|
role="listitem"
|
||||||
>
|
>
|
||||||
<slot
|
<slot
|
||||||
|
@ -38,6 +38,10 @@ export default {
|
||||||
getClass: {
|
getClass: {
|
||||||
type: Function,
|
type: Function,
|
||||||
default: item => ''
|
default: item => ''
|
||||||
|
},
|
||||||
|
nonInteractive: {
|
||||||
|
type: Boolean,
|
||||||
|
default: false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,7 @@ export default {
|
||||||
selector: '.list-item',
|
selector: '.list-item',
|
||||||
states: {
|
states: {
|
||||||
active: '.-active',
|
active: '.-active',
|
||||||
hover: ':hover'
|
hover: ':hover:not(.-non-interactive)'
|
||||||
},
|
},
|
||||||
validInnerComponents: [
|
validInnerComponents: [
|
||||||
'Text',
|
'Text',
|
||||||
|
|
|
@ -38,6 +38,7 @@
|
||||||
:aria-labelledby="`option-vote-${randomSeed}-${index}`"
|
:aria-labelledby="`option-vote-${randomSeed}-${index}`"
|
||||||
:aria-checked="choices[index]"
|
:aria-checked="choices[index]"
|
||||||
@click="activateOption(index)"
|
@click="activateOption(index)"
|
||||||
|
class="input unstyled"
|
||||||
>
|
>
|
||||||
<!-- TODO: USE CHECKBOX -->
|
<!-- TODO: USE CHECKBOX -->
|
||||||
<input
|
<input
|
||||||
|
|
|
@ -29,11 +29,13 @@
|
||||||
<div
|
<div
|
||||||
class="selectable-list-item-inner"
|
class="selectable-list-item-inner"
|
||||||
:class="{ 'selectable-list-item-selected-inner': isSelected(item) }"
|
:class="{ 'selectable-list-item-selected-inner': isSelected(item) }"
|
||||||
|
@click.stop="toggle(!isSelected(item), item)"
|
||||||
>
|
>
|
||||||
<div class="selectable-list-checkbox-wrapper">
|
<div class="selectable-list-checkbox-wrapper">
|
||||||
<Checkbox
|
<Checkbox
|
||||||
:model-value="isSelected(item)"
|
:model-value="isSelected(item)"
|
||||||
@update:model-value="checked => toggle(checked, item)"
|
@update:model-value="checked => toggle(checked, item)"
|
||||||
|
@click.stop
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<slot
|
<slot
|
||||||
|
|
|
@ -75,7 +75,7 @@
|
||||||
:label="$t('user_card.followees')"
|
:label="$t('user_card.followees')"
|
||||||
:disabled="!user.friends_count"
|
:disabled="!user.friends_count"
|
||||||
>
|
>
|
||||||
<FriendList :user-id="userId">
|
<FriendList :user-id="userId" :non-interactive="true">
|
||||||
<template #item="{item}">
|
<template #item="{item}">
|
||||||
<FollowCard :user="item" />
|
<FollowCard :user="item" />
|
||||||
</template>
|
</template>
|
||||||
|
@ -87,7 +87,7 @@
|
||||||
:label="$t('user_card.followers')"
|
:label="$t('user_card.followers')"
|
||||||
:disabled="!user.followers_count"
|
:disabled="!user.followers_count"
|
||||||
>
|
>
|
||||||
<FollowerList :user-id="userId">
|
<FollowerList :user-id="userId" :non-interactive="true">
|
||||||
<template #item="{item}">
|
<template #item="{item}">
|
||||||
<FollowCard
|
<FollowCard
|
||||||
:user="item"
|
:user="item"
|
||||||
|
|
Loading…
Add table
Reference in a new issue