ivan-igorevich/mdm-ordinis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix/topbar-right-align-toolbar-h8' into 'main'

Browse Source 
fix(ui): TopBar right align + catalog toolbar h-8

See merge request 2-6/2-6-4/terravault/ordinis!93
This commit is contained in:
Александр Зимин
2026-05-11 19:21:05 +00:00
parent 89c66b0aa0 24f04ef3ef
commit 399efb48b1
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ordinis-admin-ui/src/components/layout/TopBar.tsx
+1 -1
View File
@@ -80,7 +80,7 @@ export function TopBar({ onMenuClick }: { onMenuClick?: () => void }) {
* оставить в топбар чтобы подсвечивать новинки. туда же и сообщения".
* Docs + VersionBadge + Notifications. ThemeSwitch / Lang / Auth
* переехали в Sidebar footer. */}
<div className="md:ml-0 ml-auto flex items-center gap-2 shrink-0">
<div className="ml-auto flex items-center gap-2 shrink-0">
<a
href="/docs/"
target="_blank"
ordinis-admin-ui/src/routes/dictionaries.index.tsx
+3 -3
View File
@@ -279,7 +279,7 @@ function DictionariesPage() {
// Scope chips всегда покрашены в свой scope-color (filled bg
// + colored text) per user feedback ("плашки то покрась").
// Selected state — ring-1 ring-{scope} + slightly opaque bg.
className={`text-cap tracking-[0.14em] uppercase font-semibold px-2.5 py-1 rounded-md border transition-all focus:outline-none focus:ring-2 focus:ring-accent/40 ${SCOPE_BG_TINT[scope]} ${SCOPE_TEXT[scope]} ${
className={`h-8 text-cap tracking-[0.14em] uppercase font-semibold px-2.5 rounded-md border inline-flex items-center transition-all focus:outline-none focus:ring-2 focus:ring-accent/40 ${SCOPE_BG_TINT[scope]} ${SCOPE_TEXT[scope]} ${
selected
? `border-current shadow-sm`
: 'border-transparent opacity-70 hover:opacity-100'
@@ -304,7 +304,7 @@ function DictionariesPage() {
type="button"
onClick={() => setBundle(undefined)}
aria-pressed={!bundleFilter}
className={`text-cell px-2.5 py-1 rounded-md border transition-colors focus:outline-none focus:ring-2 focus:ring-accent/40 ${
className={`h-8 text-cell px-2.5 rounded-md border inline-flex items-center transition-colors focus:outline-none focus:ring-2 focus:ring-accent/40 ${
!bundleFilter
? 'border-ink bg-surface text-ink ring-1 ring-ink font-medium'
: 'border-line bg-surface text-ink-2 hover:border-ink-2 hover:bg-surface-2'
@@ -322,7 +322,7 @@ function DictionariesPage() {
type="button"
onClick={() => setBundle(selected ? undefined : bundle)}
aria-pressed={selected}
className={`text-mono text-cell px-2.5 py-1 rounded-md border transition-colors focus:outline-none focus:ring-2 focus:ring-accent/40 ${
className={`h-8 text-mono text-cell px-2.5 rounded-md border inline-flex items-center transition-colors focus:outline-none focus:ring-2 focus:ring-accent/40 ${
selected
? 'border-ink bg-surface text-ink ring-1 ring-ink font-medium'
: 'border-line bg-surface text-ink-2 hover:border-ink-2 hover:bg-surface-2'