Skip to content

ServerKit is a lightweight, modern server control panel for managing web applications, databases, and services on your VPS or dedicated server. Built with Python/Flask backend and React frontend.

Replace the last native selects with the shared dropdown

Juan Denisd1c310bb94c6
diff --git a/frontend/src/components/EnvironmentVariables.jsx b/frontend/src/components/EnvironmentVariables.jsx
index aa4f5c01..96125fd8 100644
--- a/frontend/src/components/EnvironmentVariables.jsx
+++ b/frontend/src/components/EnvironmentVariables.jsx
@@ -374,17 +374,24 @@ const EnvironmentVariables = ({ appId }) => {
}}
/>
{composeServices.length > 0 && (
- <select
- className="env-target-select__control"
- value={editTargetService}
- onChange={(e) => setEditTargetService(e.target.value)}
- title={t('app.environmentVariables.injectThisVariableIntoASingle', 'Inject this variable into a single compose service')}
+ <Select
+ value={editTargetService || EVERY_SERVICE}
+ onValueChange={(v) => setEditTargetService(v === EVERY_SERVICE ? '' : v)}
>
- <option value="">{t('app.environmentVariables.allServices', 'All services')}</option>
- {composeServices.map((svc) => (
- <option key={svc} value={svc}>{svc}</option>
- ))}
- </select>
+ <SelectTrigger
+ size="sm"
+ title={t('app.environmentVariables.injectThisVariableIntoASingle', 'Inject this variable into a single compose service')}
+ aria-label={t('app.environmentVariables.appliesTo', 'Applies to')}
+ >
+ <SelectValue />
+ </SelectTrigger>
+ <SelectContent>
+ <SelectItem value={EVERY_SERVICE}>{t('app.environmentVariables.allServices', 'All services')}</SelectItem>
+ {composeServices.map((svc) => (
+ <SelectItem key={svc} value={svc}>{svc}</SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
)}
<Button size="sm" onClick={() => handleUpdate(ev.key)}>{t('common.actions.save', 'Save')}</Button>
<Button variant="outline" size="sm" onClick={cancelEditing}>{t('common.actions.cancel', 'Cancel')}</Button>
diff --git a/frontend/src/components/LogViewer.jsx b/frontend/src/components/LogViewer.jsx
index fad6f299..56c8d86f 100644
--- a/frontend/src/components/LogViewer.jsx
+++ b/frontend/src/components/LogViewer.jsx
@@ -2,6 +2,7 @@ import { Search, RefreshCw, FileText } from 'lucide-react';
import { Input } from '@/components/ui/input';
import { Button } from '@/components/ui/button';
import { Switch } from '@/components/ui/switch';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
import { useTranslation } from 'react-i18next';
export function LogViewer({
@@ -76,15 +77,22 @@ export function LogViewer({
/>
</div>
{onLineCountChange && (
- <select
- value={lineCount}
- onChange={(e) => onLineCountChange(parseInt(e.target.value, 10))}
- className="form-select lines-select"
+ <Select
+ value={String(lineCount)}
+ onValueChange={(v) => onLineCountChange(parseInt(v, 10))}
>
- {lineCountOptions.map(n => (
- <option key={n} value={n}>{n} lines</option>
- ))}
- </select>
+ <SelectTrigger
+ className="lines-select"
+ aria-label={t('app.logViewer.linesToShow', 'Lines to show')}
+ >
+ <SelectValue />
+ </SelectTrigger>
+ <SelectContent>
+ {lineCountOptions.map(n => (
+ <SelectItem key={n} value={String(n)}>{n} lines</SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
)}
</div>
<div className="toolbar-right">
diff --git a/frontend/src/components/SchedulePicker.jsx b/frontend/src/components/SchedulePicker.jsx
index b2472167..394fd6f5 100644
--- a/frontend/src/components/SchedulePicker.jsx
+++ b/frontend/src/components/SchedulePicker.jsx
@@ -2,6 +2,7 @@ import { useMemo, useState } from 'react';
import { Check, AlertTriangle } from 'lucide-react';
import { SegControl } from '@/components/ds';
import { Input } from '@/components/ui/input';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
import { useTranslation } from 'react-i18next';
import { Button as SharedButton } from '@/components/ui/button';
@@ -292,40 +293,52 @@ export default function SchedulePicker({ value = '', onChange, compact = false,
{builder.frequency !== 'hourly' && (
<div className="schedule-picker__row">
<label htmlFor="sp-hour">{t('app.schedulePicker.atHour', 'At hour')}</label>
- <select
- id="sp-hour"
- value={builder.hour}
- onChange={(e) => patchBuilder({ hour: Number(e.target.value) })}
+ <Select
+ value={String(builder.hour)}
+ onValueChange={(v) => patchBuilder({ hour: Number(v) })}
>
- {Array.from({ length: 24 }).map((_, h) => (
- <option key={h} value={h}>{pad2(h)}</option>
- ))}
- </select>
+ <SelectTrigger id="sp-hour" size="sm">
+ <SelectValue />
+ </SelectTrigger>
+ <SelectContent>
+ {Array.from({ length: 24 }).map((_, h) => (
+ <SelectItem key={h} value={String(h)}>{pad2(h)}</SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
<label htmlFor="sp-minute">minute</label>
- <select
- id="sp-minute"
- value={builder.minute}
- onChange={(e) => patchBuilder({ minute: Number(e.target.value) })}
+ <Select
+ value={String(builder.minute)}
+ onValueChange={(v) => patchBuilder({ minute: Number(v) })}
>
- {Array.from({ length: 60 }).map((_, m) => (
- <option key={m} value={m}>{pad2(m)}</option>
- ))}
- </select>
+ <SelectTrigger id="sp-minute" size="sm">
+ <SelectValue />
+ </SelectTrigger>
+ <SelectContent>
+ {Array.from({ length: 60 }).map((_, m) => (
+ <SelectItem key={m} value={String(m)}>{pad2(m)}</SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
</div>
)}
{builder.frequency === 'hourly' && (
<div className="schedule-picker__row">
<label htmlFor="sp-minute-h">{t('app.schedulePicker.atMinute', 'At minute')}</label>
- <select
- id="sp-minute-h"
- value={builder.minute}
- onChange={(e) => patchBuilder({ minute: Number(e.target.value) })}
+ <Select
+ value={String(builder.minute)}
+ onValueChange={(v) => patchBuilder({ minute: Number(v) })}
>
- {Array.from({ length: 60 }).map((_, m) => (
- <option key={m} value={m}>{pad2(m)}</option>
- ))}
- </select>
+ <SelectTrigger id="sp-minute-h" size="sm">
+ <SelectValue />
+ </SelectTrigger>
+ <SelectContent>
+ {Array.from({ length: 60 }).map((_, m) => (
+ <SelectItem key={m} value={String(m)}>{pad2(m)}</SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
</div>
)}
diff --git a/frontend/src/components/dashboard/grid/WidgetEditor.jsx b/frontend/src/components/dashboard/grid/WidgetEditor.jsx
index 4a44c56c..289ce3ad 100644
--- a/frontend/src/components/dashboard/grid/WidgetEditor.jsx
+++ b/frontend/src/components/dashboard/grid/WidgetEditor.jsx
@@ -5,6 +5,9 @@ import {
import { Drawer, SegControl } from '@/components/ds';
import { Switch } from '@/components/ui/switch';
import { Popover, PopoverTrigger, PopoverContent } from '@/components/ui/popover';
+import {
+ Select as UiSelect, SelectContent, SelectItem, SelectTrigger, SelectValue,
+} from '@/components/ui/select';
import {
AGGREGATIONS, LINE_STYLES, SERIES_COLORS, getMetric,
metricsForResource, metricsForSource,
@@ -115,18 +118,27 @@ function Group({ title, children }) {
);
}
+// Radix reserves '' for "no selection", so an empty option value rides this
+// sentinel inside the control and is handed back as '' (what the native
+// <select> used to emit). Values are strings either way, as before.
+const EMPTY_OPTION = '__none';
+const toItemValue = (value) => (value === '' || value == null ? EMPTY_OPTION : String(value));
+
function Select({ value, onChange, options, label }) {
return (
- <select
- className="skwe-edit__select"
- value={value ?? ''}
- aria-label={label}
- onChange={(event) => onChange(event.target.value)}
+ <UiSelect
+ value={toItemValue(value)}
+ onValueChange={(next) => onChange(next === EMPTY_OPTION ? '' : next)}
>
- {options.map(([optionValue, optionLabel]) => (
- <option key={optionValue} value={optionValue}>{optionLabel}</option>
- ))}
- </select>
+ <SelectTrigger size="sm" className="skwe-edit__select" aria-label={label}>
+ <SelectValue />
+ </SelectTrigger>
+ <SelectContent>
+ {options.map(([optionValue, optionLabel]) => (
+ <SelectItem key={optionValue} value={toItemValue(optionValue)}>{optionLabel}</SelectItem>
+ ))}
+ </SelectContent>
+ </UiSelect>
);
}
diff --git a/frontend/src/components/ds/FilterDrawer.jsx b/frontend/src/components/ds/FilterDrawer.jsx
index c16d6815..6a2cd3f5 100644
--- a/frontend/src/components/ds/FilterDrawer.jsx
+++ b/frontend/src/components/ds/FilterDrawer.jsx
@@ -15,9 +15,10 @@ import { useTranslation } from 'react-i18next';
//
// <= 4 mutually-exclusive options, one dimension -> <SegControl/>, inline
// more options, or more than one dimension -> this drawer
-// an unbounded list (servers, groups, versions) -> a plain <select>
+// an unbounded list (servers, groups, versions) -> the shared Select
+// (@/components/ui/select)
//
-// A raw <select> is never right for a fixed set of states, and a segmented
+// A dropdown is never right for a fixed set of states, and a segmented
// control is never right for two dimensions at once.
//
// groups = [
diff --git a/frontend/src/components/ds/grid/ColumnMenu.jsx b/frontend/src/components/ds/grid/ColumnMenu.jsx
index 9b39bcf0..f3c21d8b 100644
--- a/frontend/src/components/ds/grid/ColumnMenu.jsx
+++ b/frontend/src/components/ds/grid/ColumnMenu.jsx
@@ -11,6 +11,7 @@ import {
optionsFor, ruleId, valueCounts,
} from './fields';
import { Button as SharedButton } from '@/components/ui/button';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
// The per-column header menu — one popover that owns everything you can do to
// a column, so a toolbar stops being a parking lot of Sort/Columns/Group
@@ -159,17 +160,23 @@ export function ColumnMenu({
{isEnumish ? (
<div className="sk-gridmenu__scroll">
{type === 'enum' && (
- <div className="sk-gridmenu__mini">
- <select
- value={rule?.op || 'any'}
- onChange={(e) => rule && writeRule({ ...rule, op: e.target.value })}
+ <Select
+ value={rule?.op || 'any'}
+ onValueChange={(op) => rule && writeRule({ ...rule, op })}
+ >
+ <SelectTrigger
+ size="sm"
+ className="sk-gridmenu__op"
aria-label={t('app.columnMenu.filterOperator', '{{label}} filter operator', { label: label })}
>
+ <SelectValue />
+ </SelectTrigger>
+ <SelectContent>
{OPS.enum.map(([op, text]) => (
- <option key={op} value={op}>{text}</option>
+ <SelectItem key={op} value={op}>{text}</SelectItem>
))}
- </select>
- </div>
+ </SelectContent>
+ </Select>
)}
{options.map((option) => {
const on = type === 'bool'
@@ -193,17 +200,23 @@ export function ColumnMenu({
</div>
) : (
<>
- <div className="sk-gridmenu__mini">
- <select
- value={rule?.op || OPS[type][0][0]}
- onChange={(e) => writeValue(draft, e.target.value)}
+ <Select
+ value={rule?.op || OPS[type][0][0]}
+ onValueChange={(op) => writeValue(draft, op)}
+ >
+ <SelectTrigger
+ size="sm"
+ className="sk-gridmenu__op"
aria-label={t('app.columnMenu.filterOperator', '{{label}} filter operator', { label: label })}
>
+ <SelectValue />
+ </SelectTrigger>
+ <SelectContent>
{OPS[type].map(([op, text]) => (
- <option key={op} value={op}>{text}</option>
+ <SelectItem key={op} value={op}>{text}</SelectItem>
))}
- </select>
- </div>
+ </SelectContent>
+ </Select>
<div className="sk-gridmenu__mini sk-gridmenu__mini--input">
{type === 'num' ? <Filter size={13} /> : <Search size={13} />}
<input
diff --git a/frontend/src/components/ds/grid/GridFilterDrawer.jsx b/frontend/src/components/ds/grid/GridFilterDrawer.jsx
index f8bfa1f0..00ffbdfd 100644
--- a/frontend/src/components/ds/grid/GridFilterDrawer.jsx
+++ b/frontend/src/components/ds/grid/GridFilterDrawer.jsx
@@ -1,8 +1,9 @@
import { useState } from 'react';
-import { Filter, Layers, X, Plus, History, ChevronDown, GripVertical } from 'lucide-react';
+import { Filter, Layers, X, Plus, History, GripVertical } from 'lucide-react';
import { Drawer } from '../Drawer';
import { Button } from '@/components/ui/button';
import { Switch } from '@/components/ui/switch';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
import { cn } from '@/lib/utils';
import { useTranslation } from 'react-i18next';
import {
@@ -51,17 +52,18 @@ export function GridFilterDrawer({
if (!column) return null;
if (column.type === 'bool') {
return (
- <div className="sk-gridrule__sel">
- <select
- value={String(rule.value)}
- onChange={(e) => patchRule(rule.id, { value: e.target.value === 'true' })}
- aria-label={t('common.labels.value', 'Value')}
- >
- <option value="true">On</option>
- <option value="false">{t('app.gridFilterDrawer.off', 'Off')}</option>
- </select>
- <ChevronDown size={13} />
- </div>
+ <Select
+ value={String(rule.value)}
+ onValueChange={(v) => patchRule(rule.id, { value: v === 'true' })}
+ >
+ <SelectTrigger size="sm" className="sk-gridrule__sel" aria-label={t('common.labels.value', 'Value')}>
+ <SelectValue />
+ </SelectTrigger>
+ <SelectContent>
+ <SelectItem value="true">On</SelectItem>
+ <SelectItem value="false">{t('app.gridFilterDrawer.off', 'Off')}</SelectItem>
+ </SelectContent>
+ </Select>
);
}
if (column.type === 'enum') {
@@ -171,37 +173,39 @@ export function GridFilterDrawer({
</div>
)}
<div className="sk-gridrule">
- <div className="sk-gridrule__sel">
- <select
- value={rule.field}
- aria-label={t('app.gridFilterDrawer.field', 'Field')}
- onChange={(e) => {
- const next = map.get(e.target.value);
- patchRule(rule.id, {
- field: next.key,
- op: OPS[next.type][0][0],
- value: emptyValueFor(next.type),
- });
- }}
- >
+ <Select
+ value={rule.field}
+ onValueChange={(key) => {
+ const next = map.get(key);
+ patchRule(rule.id, {
+ field: next.key,
+ op: OPS[next.type][0][0],
+ value: emptyValueFor(next.type),
+ });
+ }}
+ >
+ <SelectTrigger size="sm" className="sk-gridrule__sel" aria-label={t('app.gridFilterDrawer.field', 'Field')}>
+ <SelectValue />
+ </SelectTrigger>
+ <SelectContent>
{filterable.map((c) => (
- <option key={c.key} value={c.key}>{columnLabel(c)}</option>
+ <SelectItem key={c.key} value={c.key}>{columnLabel(c)}</SelectItem>
))}
- </select>
- <ChevronDown size={13} />
- </div>
- <div className="sk-gridrule__sel">
- <select
- value={rule.op}
- aria-label={t('app.gridFilterDrawer.operator', 'Operator')}
- onChange={(e) => patchRule(rule.id, { op: e.target.value })}
- >
+ </SelectContent>
+ </Select>
+ <Select
+ value={rule.op}
+ onValueChange={(op) => patchRule(rule.id, { op })}
+ >
+ <SelectTrigger size="sm" className="sk-gridrule__sel" aria-label={t('app.gridFilterDrawer.operator', 'Operator')}>
+ <SelectValue />
+ </SelectTrigger>
+ <SelectContent>
{OPS[column.type].map(([op, text]) => (
- <option key={op} value={op}>{text}</option>
+ <SelectItem key={op} value={op}>{text}</SelectItem>
))}
- </select>
- <ChevronDown size={13} />
- </div>
+ </SelectContent>
+ </Select>
<Button variant="unstyled"
type="button"
className="sk-gridrule__del"
diff --git a/frontend/src/components/ds/grid/GridFooter.jsx b/frontend/src/components/ds/grid/GridFooter.jsx
index 79b94add..1bfe1a32 100644
--- a/frontend/src/components/ds/grid/GridFooter.jsx
+++ b/frontend/src/components/ds/grid/GridFooter.jsx
@@ -1,7 +1,8 @@
-import { ChevronDown, ChevronsLeft, ChevronsRight, ChevronLeft, ChevronRight } from 'lucide-react';
+import { ChevronsLeft, ChevronsRight, ChevronLeft, ChevronRight } from 'lucide-react';
import { byKey, columnLabel } from './fields';
import { useTranslation } from 'react-i18next';
import { Button as SharedButton } from '@/components/ui/button';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
// Footer: what you are looking at on the left, how to page through it on the
// right. The sort/group summary is here rather than in a toolbar chip because
@@ -33,17 +34,23 @@ export function GridFooter({
<span className="sk-gridfoot__sp" />
<div className="sk-gridpager">
<span className="sk-gridpager__label">{t('app.gridFooter.rows', 'Rows')}</span>
- <div className="sk-gridpager__sel">
- <select
- value={perPage}
- onChange={(e) => onPerPage(e.target.value === 'all' ? 'all' : Number(e.target.value))}
+ {/* Radix values are strings: 'all' stays 'all', page sizes go back to numbers. */}
+ <Select
+ value={String(perPage)}
+ onValueChange={(v) => onPerPage(v === 'all' ? 'all' : Number(v))}
+ >
+ <SelectTrigger
+ size="sm"
+ className="sk-gridpager__sel"
aria-label={t('app.gridFooter.rowsPerPage', 'Rows per page')}
>
- {[10, 25, 50, 100].map((n) => <option key={n} value={n}>{n}</option>)}
- <option value="all">{t('common.labels.all', 'All')}</option>
- </select>
- <ChevronDown size={12} />
- </div>
+ <SelectValue />
+ </SelectTrigger>
+ <SelectContent>
+ {[10, 25, 50, 100].map((n) => <SelectItem key={n} value={String(n)}>{n}</SelectItem>)}
+ <SelectItem value="all">{t('common.labels.all', 'All')}</SelectItem>
+ </SelectContent>
+ </Select>
<SharedButton variant="unstyled" type="button" disabled={page <= 1} onClick={() => onPage(1)} aria-label={t('app.gridFooter.firstPage', 'First page')}>
<ChevronsLeft size={13} />
</SharedButton>
diff --git a/frontend/src/pages/Monitoring.jsx b/frontend/src/pages/Monitoring.jsx
index dc978e0c..041c4403 100644
--- a/frontend/src/pages/Monitoring.jsx
+++ b/frontend/src/pages/Monitoring.jsx
@@ -366,7 +366,7 @@ const Monitoring = () => {
</form>
{servers.length > 0 && (
- <FleetThresholdsPanel servers={servers} refreshKey={refreshKey} />
+ <FleetThresholdsPanel refreshKey={refreshKey} />
)}
<div className="monitoring-delivery-layout">
diff --git a/frontend/src/styles/components/_ai-assistant.scss b/frontend/src/styles/components/_ai-assistant.scss
index e31abc6a..5bae8ed3 100644
--- a/frontend/src/styles/components/_ai-assistant.scss
+++ b/frontend/src/styles/components/_ai-assistant.scss
@@ -16,11 +16,6 @@ $sk-ai-z: 1100;
min-inline-size: 0;
margin-block-end: 0;
}
-
- input, select {
- inline-size: 100%;
- min-inline-size: 0;
- }
}
%sk-ai-tokens {
diff --git a/frontend/src/styles/components/_api-settings.scss b/frontend/src/styles/components/_api-settings.scss
index 745972c8..0bd682aa 100644
--- a/frontend/src/styles/components/_api-settings.scss
+++ b/frontend/src/styles/components/_api-settings.scss
@@ -314,23 +314,6 @@
margin-bottom: $space-4;
}
- .api-key-modal__key-display {
- display: flex;
- align-items: center;
- gap: $space-2;
- padding: $space-3;
- background: $bg-elevated;
- border-radius: $radius-md;
- overflow-x: auto;
-
- code {
- flex: 1;
- font-family: $font-mono;
- font-size: $font-size-sm;
- word-break: break-all;
- }
- }
-
.api-key-modal__tiers {
display: grid;
grid-template-columns: repeat(3, 1fr);
diff --git a/frontend/src/styles/components/_dashboard-widgets.scss b/frontend/src/styles/components/_dashboard-widgets.scss
index 480bf532..3b7542f5 100644
--- a/frontend/src/styles/components/_dashboard-widgets.scss
+++ b/frontend/src/styles/components/_dashboard-widgets.scss
@@ -243,63 +243,6 @@ $skw-z-tv: 200;
}
}
-// Refresh-interval select. Sizing only — the select chrome comes from the
-// shared form styles.
-.skw-refresh {
- position: relative;
- display: inline-flex;
- align-items: center;
-
- select {
- // `appearance: none` matters: without it the browser paints its own
- // control, which on a dark panel arrives as a light box with a
- // system chevron and ignores every rule below.
- appearance: none;
- height: 32px;
- padding: 0 26px 0 10px;
- border: 1px solid var(--border);
- border-radius: 8px;
- background: var(--surface-2);
- color: var(--text-dim);
- font-family: var(--mono);
- font-size: 11.5px;
- cursor: pointer;
- outline: none;
- transition: 0.13s;
-
- &:hover {
- color: var(--text);
- border-color: var(--border-strong);
- background: var(--surface-3);
- }
-
- &:focus-visible {
- border-color: var(--accent);
- box-shadow: 0 0 0 3px var(--accent-bg);
- }
-
- // Native popups are drawn by the OS; name the colours or a dark theme
- // gets white-on-white options.
- option {
- background: var(--surface-2);
- color: var(--text);
- }
- }
-
- // Our own chevron, since the native one is gone.
- &::after {
- content: '';
- position: absolute;
- right: 10px;
- width: 6px;
- height: 6px;
- border-right: 1.5px solid var(--text-faint);
- border-bottom: 1.5px solid var(--text-faint);
- transform: translateY(-2px) rotate(45deg);
- pointer-events: none;
- }
-}
-
// Square icon button used across the bar and the widget head.
.skw-iconbtn {
width: 32px;
diff --git a/frontend/src/styles/components/_datagrid.scss b/frontend/src/styles/components/_datagrid.scss
index 2afc6ce7..a3f75d3a 100644
--- a/frontend/src/styles/components/_datagrid.scss
+++ b/frontend/src/styles/components/_datagrid.scss
@@ -597,36 +597,18 @@
color: var(--text-ghost);
}
- &__sel {
- position: relative;
- display: flex;
- align-items: center;
+ // The shared compact Select trigger, sized down to the pager's mono scale.
+ &__sel.ui-select-trigger {
+ height: 24px;
margin-right: 6px;
-
- select {
- appearance: none;
- padding: 4px 20px 4px 8px;
- border-radius: 7px;
- border: 1px solid var(--border);
- background: var(--surface-2);
- color: var(--text-dim);
- font-family: var(--mono);
- font-size: 11px;
- outline: none;
- cursor: pointer;
-
- &:hover { border-color: var(--border-strong); color: var(--text); }
- }
-
- svg {
- position: absolute;
- right: 5px;
- pointer-events: none;
- color: var(--text-ghost);
- }
+ border-radius: 7px;
+ font-family: var(--mono);
+ font-size: 11px;
+ color: var(--text-dim);
}
- button {
+ // Page arrows only: the rows-per-page trigger is a <button> too.
+ > button:not(.ui-select-trigger) {
width: 26px;
height: 24px;
display: grid;
@@ -758,8 +740,7 @@
svg { color: var(--text-ghost); flex-shrink: 0; }
- input,
- select {
+ input {
width: 100%;
min-width: 0;
background: none;
@@ -770,11 +751,18 @@
font-family: var(--mono);
}
- select { color: var(--text-dim); font-family: var(--sans); cursor: pointer; }
-
input::placeholder { color: var(--text-ghost); font-family: var(--sans); }
}
+ // Filter operator: the shared compact Select, stretched to the menu width.
+ // Block-level flex fills the row both in the menu's flex column and in
+ // the plain-block `__scroll` list.
+ &__op.ui-select-trigger {
+ display: flex;
+ margin: 2px 4px 6px;
+ font-size: 12.5px;
+ }
+
&__quick {
display: flex;
flex-wrap: wrap;
@@ -1002,34 +990,12 @@
&__value { grid-column: 1 / -1; }
- &__sel {
- position: relative;
-
- select {
- appearance: none;
- width: 100%;
- padding: 8px 22px 8px 10px;
- border-radius: 8px;
- border: 1px solid var(--border);
- background: var(--surface-2);
- color: var(--text);
- font-size: 12.5px;
- font-family: inherit;
- outline: none;
- cursor: pointer;
- text-overflow: ellipsis;
-
- &:focus { border-color: var(--accent-dim); }
- }
-
- svg {
- position: absolute;
- right: 7px;
- top: 50%;
- transform: translateY(-50%);
- pointer-events: none;
- color: var(--text-ghost);
- }
+ // Field / operator / on-off pickers: the shared compact Select, filling
+ // its grid cell instead of sizing to content.
+ &__sel.ui-select-trigger {
+ width: 100%;
+ min-width: 0;
+ font-size: 12.5px;
}
input[type='text'],
diff --git a/frontend/src/styles/components/_env-vars.scss b/frontend/src/styles/components/_env-vars.scss
index 19893618..d159a9e5 100644
--- a/frontend/src/styles/components/_env-vars.scss
+++ b/frontend/src/styles/components/_env-vars.scss
@@ -38,26 +38,6 @@
text-transform: uppercase;
}
-// "Applies to" compose-service select — used in the Add modal and the inline
-// edit row. Full-width inside a modal .form-group; intrinsic in the edit row.
-.env-target-select__control {
- padding: $space-2 $space-3;
- background: $bg-body;
- border: 1px solid $border-subtle;
- border-radius: $radius-sm;
- color: $text-primary;
- font-size: $font-size-sm;
- flex-shrink: 0;
-
- &:hover {
- border-color: $border-active;
- }
-}
-
-.form-group .env-target-select__control {
- width: 100%;
-}
-
// Small "(optional)" tag + reassurance hint inside the Add Variable modal
.env-optional {
color: $text-tertiary;
diff --git a/frontend/src/styles/components/_logs.scss b/frontend/src/styles/components/_logs.scss
index ac4880a5..0f1ce68a 100644
--- a/frontend/src/styles/components/_logs.scss
+++ b/frontend/src/styles/components/_logs.scss
@@ -260,14 +260,12 @@
}
}
+ // Shared Select trigger, kept at the search box's 36px and sized to content
+ // so it sits in the toolbar instead of claiming a form-field row.
.lines-select {
+ width: auto;
height: 36px;
min-width: 120px;
- padding: 0 $space-3;
- border: 1px solid $border-subtle;
- border-radius: $radius-md;
- background: $bg-body;
- color: $text-primary;
font-size: $font-size-sm;
}
}
diff --git a/frontend/src/styles/components/_private-url.scss b/frontend/src/styles/components/_private-url.scss
index 267402c6..10b70777 100644
--- a/frontend/src/styles/components/_private-url.scss
+++ b/frontend/src/styles/components/_private-url.scss
@@ -95,22 +95,6 @@
margin-bottom: $space-3;
}
- .url-label {
- color: $text-secondary;
- font-size: $font-size-sm;
- }
-
- .url-value {
- background: $bg-secondary;
- padding: $space-2 $space-3;
- border-radius: $radius-sm;
- font-family: $font-mono;
- font-size: $font-size-sm;
- color: $text-primary;
- word-break: break-all;
- user-select: all;
- }
-
.url-actions {
display: flex;
gap: $space-2;
diff --git a/frontend/src/styles/components/_resource-picker.scss b/frontend/src/styles/components/_resource-picker.scss
index 35bf736b..452d2ae6 100644
--- a/frontend/src/styles/components/_resource-picker.scss
+++ b/frontend/src/styles/components/_resource-picker.scss
@@ -73,9 +73,3 @@
}
}
}
-
-.target-picker {
- display: inline-flex;
- align-items: center;
- min-width: 0;
-}
diff --git a/frontend/src/styles/components/_schedule-picker.scss b/frontend/src/styles/components/_schedule-picker.scss
index 2e977fef..7a409dcd 100644
--- a/frontend/src/styles/components/_schedule-picker.scss
+++ b/frontend/src/styles/components/_schedule-picker.scss
@@ -64,15 +64,6 @@
color: var(--text-faint);
}
- select {
- background: var(--surface-2);
- border: 1px solid var(--border);
- border-radius: 7px;
- color: var(--text);
- padding: 6px 10px;
- font-size: 12.5px;
- }
-
input { max-width: 160px; }
}
diff --git a/frontend/src/styles/components/_two-factor.scss b/frontend/src/styles/components/_two-factor.scss
index 7f9a716c..a35aca24 100644
--- a/frontend/src/styles/components/_two-factor.scss
+++ b/frontend/src/styles/components/_two-factor.scss
@@ -191,16 +191,6 @@
padding: $space-4;
border-radius: $radius-md;
text-align: center;
-
- .secret-key {
- display: block;
- font-size: $font-size-lg;
- padding: $space-2;
- margin-top: $space-2;
- background: $bg-body;
- border-radius: $radius-sm;
- word-break: break-all;
- }
}
.manual-entry {
@@ -266,24 +256,6 @@
margin-top: $space-1;
}
-// Backup Codes Grid
-.backup-codes-grid {
- display: grid;
- grid-template-columns: repeat(2, 1fr);
- gap: $space-2;
- margin-bottom: $space-6;
-}
-
-.backup-code {
- display: block;
- padding: $space-2 $space-4;
- background: $bg-hover;
- border-radius: $radius-sm;
- text-align: center;
- font-size: $font-size-md;
- font-family: $font-mono;
-}
-
.backup-codes-actions {
display: flex;
justify-content: center;
diff --git a/frontend/src/styles/components/_users.scss b/frontend/src/styles/components/_users.scss
index e61315bb..d4654193 100644
--- a/frontend/src/styles/components/_users.scss
+++ b/frontend/src/styles/components/_users.scss
@@ -437,25 +437,6 @@
}
}
-.invite-link-display {
- display: flex;
- align-items: center;
- gap: $space-2;
- padding: $space-3;
- background: $bg-hover;
- border: 1px solid $border-default;
- border-radius: $radius-md;
- margin-top: $space-2;
-
- code {
- flex: 1;
- font-family: $font-mono;
- font-size: $font-size-sm;
- word-break: break-all;
- color: $text-primary;
- }
-}
-
.invitation-status {
display: inline-flex;
align-items: center;
@@ -810,12 +791,14 @@
flex-direction: column;
gap: $space-1;
- span {
+ // The caption only: a bare `span` also matched the Select's value.
+ > span {
font-size: $font-size-xs;
color: $text-secondary;
}
- select,
+ > .ui-select-trigger { min-width: 160px; }
+
input {
min-width: 160px;
padding: $space-2 $space-3;
@@ -855,19 +838,6 @@
font-size: $font-size-sm;
font-weight: 600;
}
-
- &-row {
- display: flex;
- align-items: center;
- gap: $space-3;
-
- code {
- flex: 1;
- overflow-x: auto;
- white-space: nowrap;
- font-size: $font-size-xs;
- }
- }
}
&__list {
diff --git a/frontend/src/styles/components/_widget-editor.scss b/frontend/src/styles/components/_widget-editor.scss
index b5fec348..77780fa5 100644
--- a/frontend/src/styles/components/_widget-editor.scss
+++ b/frontend/src/styles/components/_widget-editor.scss
@@ -165,7 +165,6 @@ $skwe-pane-w: 340px;
// input kept its user-agent default and rendered as a white box on the dark
// panel. Adding a wrapper here is fine; leaving the control unnamed is not.
&__field,
- &__select,
&__textarea {
width: 100%;
padding: 7px 9px;
@@ -187,16 +186,19 @@ $skwe-pane-w: 340px;
}
}
- &__select {
- padding-right: 24px;
- cursor: pointer;
+ // The shared compact Select trigger, filling its column and wearing the
+ // inspector's field skin so it lines up with the inputs around it.
+ &__select.ui-select-trigger {
+ width: 100%;
+ min-width: 0;
+ border-color: var(--border);
+ border-radius: 7px;
+ background: var(--surface-2);
+ color: var(--text);
+ font-size: 12.5px;
- // Most engines inherit the control's colours into the popup list, but
- // not all of them — name it so the options are never white-on-white.
- option {
- background: var(--surface-2);
- color: var(--text);
- }
+ &:focus,
+ &:focus-visible { border-color: var(--accent); }
}
// Numeric fields (thresholds) read as values, not prose.
@@ -279,8 +281,8 @@ $skwe-pane-w: 340px;
// select takes the rest of the row.
&--solo { grid-template-columns: 18px 1fr 26px; }
- .skwe-edit__select {
- padding: 6px 22px 6px 8px;
+ .skwe-edit__select.ui-select-trigger {
+ padding-inline: 8px;
font-size: 11.5px;
}
}
diff --git a/frontend/src/styles/pages/_settings.scss b/frontend/src/styles/pages/_settings.scss
index ded0708c..efc2f04c 100644
--- a/frontend/src/styles/pages/_settings.scss
+++ b/frontend/src/styles/pages/_settings.scss
@@ -800,18 +800,6 @@
margin-left: $space-1;
}
-// One-time login link form (Settings -> Users). The field's caption rule in
-// _users.scss targets every descendant span, which includes the Select's
-// value; give the trigger back its own type and the old select's width.
-.login-links__field .ui-select-trigger {
- min-width: 160px;
-
- span {
- font-size: inherit;
- color: inherit;
- }
-}
-
// IconReferenceTab: leading magnifier inside the search field
.search-input-wrapper {
position: relative;
@@ -2604,9 +2592,7 @@
}
&__name { flex: 1; overflow-wrap: anywhere; font-family: $font-mono; }
&__name small { display: block; margin-top: $space-1; color: $text-secondary; font-size: $font-size-xs; }
- &__filters { padding: $space-3; display: flex; align-items: center; gap: $space-3;
- select { @include input-base; min-width: 0; }
- }
+ &__filters { padding: $space-3; display: flex; align-items: center; gap: $space-3; }
@media (max-width: $breakpoint-sm) {
flex-direction: column;
align-items: stretch;