cleanup, fixes

This commit is contained in:
Henry Jameson 2021-03-11 16:31:15 +02:00
parent 5d3bf43fdc
commit 3870a30aea
6 changed files with 33 additions and 40 deletions

View file

@ -222,19 +222,6 @@ input, textarea, .input {
opacity: 0.5; opacity: 0.5;
} }
.select-down-icon {
position: absolute;
top: 0;
bottom: 0;
right: 5px;
height: 100%;
color: $fallback--text;
color: var(--inputText, $fallback--text);
line-height: 28px;
z-index: 0;
pointer-events: none;
}
&[type=range] { &[type=range] {
background: none; background: none;
border: none; border: none;

View file

@ -55,7 +55,8 @@
min-width: 10em; min-width: 10em;
} }
&.custom { &.custom {
.select { /* TODO Should make proper joiners... */
.font-switcher {
border-top-right-radius: 0; border-top-right-radius: 0;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
} }

View file

@ -47,7 +47,8 @@
:title="$t('polls.type')" :title="$t('polls.type')"
> >
<Select <Select
kind="ghost" class="poll-type-select"
unstyled="true"
v-model="pollType" v-model="pollType"
@change="updatePollToParent" @change="updatePollToParent"
> >
@ -69,7 +70,7 @@
> >
<Select <Select
v-model="expiryUnit" v-model="expiryUnit"
kind="ghost" unstyled="true"
class="expiry-unit" class="expiry-unit"
@change="expiryAmountChange" @change="expiryAmountChange"
> >
@ -134,6 +135,10 @@
.poll-type { .poll-type {
margin-right: 0.75em; margin-right: 0.75em;
flex: 1 1 60%; flex: 1 1 60%;
.poll-type-select {
padding-right: 0.75em;
}
} }
.poll-expiry { .poll-expiry {

View file

@ -2,7 +2,7 @@
<template> <template>
<label <label
class="Select input" class="Select input"
:class="[ kindClass, { disabled } ]" :class="{ disabled, unstyled }"
> >
<select <select
:disabled="disabled" :disabled="disabled"
@ -26,14 +26,6 @@
.Select { .Select {
padding: 0; padding: 0;
/* Overriding input styles, probably should make proper Input component? */
&.-kind_ghost {
border: none;
box-shadow: none;
background-color: transparent;
padding-right: 0.75em;
}
select { select {
-webkit-appearance: none; -webkit-appearance: none;
-moz-appearance: none; -moz-appearance: none;
@ -52,5 +44,19 @@
height: 28px; height: 28px;
line-height: 16px; line-height: 16px;
} }
.select-down-icon {
position: absolute;
top: 0;
bottom: 0;
right: 5px;
height: 100%;
color: $fallback--text;
color: var(--inputText, $fallback--text);
line-height: 28px;
z-index: 0;
pointer-events: none;
}
} }
</style> </style>

View file

@ -306,20 +306,20 @@
.id-control { .id-control {
align-items: stretch; align-items: stretch;
.select, .btn {
.shadow-switcher {
flex: 1;
}
.shadow-switcher, .btn {
min-width: 1px; min-width: 1px;
margin-right: 5px; margin-right: 5px;
} }
.btn { .btn {
padding: 0 .4em; padding: 0 .4em;
margin: 0 .1em; margin: 0 .1em;
} }
.select {
flex: 1;
select {
align-self: initial;
}
}
} }
} }
} }

View file

@ -532,15 +532,11 @@
flex: 1 0 auto; flex: 1 0 auto;
} }
.userHighlightSel, .userHighlightSel {
.userHighlightSel.select {
padding-top: 0; padding-top: 0;
padding-bottom: 0; padding-bottom: 0;
flex: 1 0 auto; flex: 1 0 auto;
} }
.userHighlightSel.select svg {
line-height: 22px;
}
.userHighlightText { .userHighlightText {
width: 70px; width: 70px;
@ -549,9 +545,7 @@
.userHighlightCl, .userHighlightCl,
.userHighlightText, .userHighlightText,
.userHighlightSel, .userHighlightSel {
.userHighlightSel.select {
height: 22px;
vertical-align: top; vertical-align: top;
margin-right: .5em; margin-right: .5em;
margin-bottom: .25em; margin-bottom: .25em;