From bc5ed101ed98943bc7eeaa36a102a9b29c1736d2 Mon Sep 17 00:00:00 2001 From: crschnick Date: Fri, 19 Jul 2024 17:16:39 +0000 Subject: [PATCH] Style fixes --- .../java/io/xpipe/app/prefs/AppPrefsComp.java | 6 +++--- .../io/xpipe/app/resources/style/browser.css | 3 ++- .../io/xpipe/app/resources/style/prefs.css | 19 +++++++------------ 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/prefs/AppPrefsComp.java b/app/src/main/java/io/xpipe/app/prefs/AppPrefsComp.java index bd8ea3c1f..26332908a 100644 --- a/app/src/main/java/io/xpipe/app/prefs/AppPrefsComp.java +++ b/app/src/main/java/io/xpipe/app/prefs/AppPrefsComp.java @@ -41,9 +41,9 @@ public class AppPrefsComp extends SimpleComp { pfxLimit.setAlignment(Pos.TOP_LEFT); var sidebar = new AppPrefsSidebarComp().createRegion(); - sidebar.setMinWidth(350); - sidebar.setPrefWidth(350); - sidebar.setMaxWidth(350); + sidebar.setMinWidth(280); + sidebar.setPrefWidth(280); + sidebar.setMaxWidth(280); var split = new HBox(sidebar, pfxLimit); HBox.setHgrow(pfxLimit, Priority.ALWAYS); diff --git a/app/src/main/resources/io/xpipe/app/resources/style/browser.css b/app/src/main/resources/io/xpipe/app/resources/style/browser.css index 2ce8822af..1d6b3dc19 100644 --- a/app/src/main/resources/io/xpipe/app/resources/style/browser.css +++ b/app/src/main/resources/io/xpipe/app/resources/style/browser.css @@ -207,7 +207,8 @@ -fx-max-height: 2.65em; } -.browser .tab-header-area { + +.browser .tab-pane.floating > .tab-header-area { -fx-border-width: 0 0 0.05em 0; -fx-border-color: -color-border-default; } diff --git a/app/src/main/resources/io/xpipe/app/resources/style/prefs.css b/app/src/main/resources/io/xpipe/app/resources/style/prefs.css index d6ceeff26..9aa7e844b 100644 --- a/app/src/main/resources/io/xpipe/app/resources/style/prefs.css +++ b/app/src/main/resources/io/xpipe/app/resources/style/prefs.css @@ -35,31 +35,26 @@ -fx-background-color: -color-bg-subtle; -fx-border-width: 0 1 0 0; -fx-border-color: -color-border-default; - -fx-padding: 0.7em 0 0 0; + -fx-padding: 0.2em 0 0 0; } .prefs .sidebar .button { -fx-background-color: transparent; - -fx-padding: 0.5em 1em 0.5em 1.2em; - -fx-border-radius: 0; - -fx-background-radius: 0; - -fx-border-width: 1; - -fx-background-insets: 0; - -fx-border-insets: 0; + -fx-padding: 0.6em 1em 0.6em 1em; + -fx-background-radius: 0, 4, 4; + -fx-background-insets: 0, 2 4 2 4, 3 5 3 5; } .prefs .sidebar .button:selected { - -fx-background-color: -color-accent-subtle; - -fx-border-color: -color-accent-emphasis; - -fx-border-width: 1 0 1 0; + -fx-background-color: transparent, -color-accent-emphasis, -color-bg-default; } .prefs .sidebar .button:armed { - -fx-background-color: derive(-color-neutral-muted, 25%); + -fx-background-color: transparent, -color-accent-muted, derive(-color-neutral-muted, 25%); } .prefs .sidebar .button:hover, .root:key-navigation .prefs .sidebar .button:focused { - -fx-background-color: -color-neutral-muted; + -fx-background-color: transparent, -color-bg-overlay; } .prefs .theme-switcher .combo-box-popup .list-view {