Fix RaidCombobox placeholder and Select styles (#332)
* Fix server unavailable message Booleans are hard * Remove a log * Add characters from 2023-06 Flash Gala * Add "all battles" string * Fix placeholder for RaidCombobox in FilterBar * Fix select trigger styles
This commit is contained in:
parent
b94ff33d04
commit
2f572dc71c
6 changed files with 17 additions and 5 deletions
|
|
@ -78,7 +78,6 @@
|
||||||
// background-position-x: 95%;
|
// background-position-x: 95%;
|
||||||
// background-size: $unit * 1.5;
|
// background-size: $unit * 1.5;
|
||||||
background-color: var(--select-contained-bg);
|
background-color: var(--select-contained-bg);
|
||||||
color: $grey-55;
|
|
||||||
font-size: $font-small;
|
font-size: $font-small;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
max-width: 200px;
|
max-width: 200px;
|
||||||
|
|
|
||||||
|
|
@ -21,9 +21,9 @@
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
background-color: var(--input-bg-hover);
|
background-color: var(--input-bg-hover);
|
||||||
color: var(--text-primary);
|
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
|
||||||
|
span:not(.SelectIcon),
|
||||||
&[data-placeholder] > span:not(.SelectIcon) {
|
&[data-placeholder] > span:not(.SelectIcon) {
|
||||||
color: var(--text-primary);
|
color: var(--text-primary);
|
||||||
}
|
}
|
||||||
|
|
@ -70,6 +70,10 @@
|
||||||
fill: var(--icon-secondary);
|
fill: var(--icon-secondary);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
span:not(.SelectIcon) {
|
||||||
|
color: var(--text-secondary);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.Select {
|
.Select {
|
||||||
|
|
|
||||||
|
|
@ -185,7 +185,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.SelectTrigger.Raid .Value.Empty {
|
.SelectTrigger.Raid:not(.Highlighted) .Value.Empty {
|
||||||
color: var(--text-tertiary);
|
color: var(--text-tertiary);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -542,8 +542,15 @@ const RaidCombobox = (props: Props) => {
|
||||||
className="Flush"
|
className="Flush"
|
||||||
open={open}
|
open={open}
|
||||||
onOpenChange={toggleOpen}
|
onOpenChange={toggleOpen}
|
||||||
placeholder={t('raids.placeholder')}
|
placeholder={
|
||||||
trigger={{ className: 'Raid' }}
|
props.showAllRaidsOption ? t('raids.all') : t('raids.placeholder')
|
||||||
|
}
|
||||||
|
trigger={{
|
||||||
|
className: classNames({
|
||||||
|
Raid: true,
|
||||||
|
Highlighted: props.showAllRaidsOption,
|
||||||
|
}),
|
||||||
|
}}
|
||||||
triggerTabIndex={props.tabIndex}
|
triggerTabIndex={props.tabIndex}
|
||||||
value={renderTriggerContent()}
|
value={renderTriggerContent()}
|
||||||
>
|
>
|
||||||
|
|
|
||||||
|
|
@ -419,6 +419,7 @@
|
||||||
"katana": "Katana"
|
"katana": "Katana"
|
||||||
},
|
},
|
||||||
"raids": {
|
"raids": {
|
||||||
|
"all": "All battles",
|
||||||
"placeholder": "Select a raid...",
|
"placeholder": "Select a raid...",
|
||||||
"sections": {
|
"sections": {
|
||||||
"raids": "Raids",
|
"raids": "Raids",
|
||||||
|
|
|
||||||
|
|
@ -416,6 +416,7 @@
|
||||||
"katana": "刀"
|
"katana": "刀"
|
||||||
},
|
},
|
||||||
"raids": {
|
"raids": {
|
||||||
|
"all": "すべてのバトル",
|
||||||
"placeholder": "バトルを選択...",
|
"placeholder": "バトルを選択...",
|
||||||
"sections": {
|
"sections": {
|
||||||
"raids": "マルチ",
|
"raids": "マルチ",
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue