diff --git a/owlplug-client/pom.xml b/owlplug-client/pom.xml index 994fe2c7..9b40f62d 100644 --- a/owlplug-client/pom.xml +++ b/owlplug-client/pom.xml @@ -6,6 +6,7 @@ 4.0.1 5.20.0 + 12.4.0 @@ -120,18 +121,21 @@ controlsfx 11.1.2 - - org.jfxtras - jmetro - 11.6.16 - - - - org.openjfx - javafx-base - - - + + io.github.mkpaz + atlantafx-base + 2.1.0 + + + org.kordamp.ikonli + ikonli-javafx + ${ikonli.version} + + + org.kordamp.ikonli + ikonli-materialdesign2-pack + ${ikonli.version} + com.googlecode.plist dd-plist diff --git a/owlplug-client/src/main/java/com/owlplug/OwlPlug.java b/owlplug-client/src/main/java/com/owlplug/OwlPlug.java index 1178913d..0dbe55a7 100644 --- a/owlplug-client/src/main/java/com/owlplug/OwlPlug.java +++ b/owlplug-client/src/main/java/com/owlplug/OwlPlug.java @@ -18,6 +18,7 @@ package com.owlplug; +import atlantafx.base.theme.PrimerDark; import com.owlplug.controls.OwlPlugControlsResources; import com.owlplug.core.components.ApplicationDefaults; import com.owlplug.core.controllers.MainController; @@ -30,8 +31,6 @@ import javafx.scene.Scene; import javafx.stage.Stage; import javax.sql.DataSource; -import jfxtras.styles.jmetro.JMetro; -import jfxtras.styles.jmetro.Style; import org.ehcache.CacheManager; import org.ehcache.config.builders.CacheConfigurationBuilder; import org.ehcache.config.builders.CacheManagerBuilder; @@ -121,13 +120,17 @@ public void start(Stage primaryStage) throws Exception { double width = 1050; double height = 800; + Application.setUserAgentStylesheet(new PrimerDark().getUserAgentStylesheet()); + + Scene scene = new Scene(rootNode, width, height); - JMetro metroTheme = new JMetro(Style.DARK); - metroTheme.setScene(scene); + String owlplugControlsCss = OwlPlugControlsResources.load("/css/owlplug-controls.css").toExternalForm(); - metroTheme.getOverridingStylesheets().add(owlplugControlsCss); String owlplugCss = OwlPlug.class.getResource("/owlplug.css").toExternalForm(); - metroTheme.getOverridingStylesheets().add(owlplugCss); + + scene.getStylesheets().add(owlplugCss); + scene.getStylesheets().add(owlplugControlsCss); + primaryStage.getIcons().add(ApplicationDefaults.owlplugLogo); primaryStage.setTitle(ApplicationDefaults.APPLICATION_NAME); diff --git a/owlplug-client/src/main/java/com/owlplug/OwlPlugPreloader.java b/owlplug-client/src/main/java/com/owlplug/OwlPlugPreloader.java index 05ce9640..5111db2c 100644 --- a/owlplug-client/src/main/java/com/owlplug/OwlPlugPreloader.java +++ b/owlplug-client/src/main/java/com/owlplug/OwlPlugPreloader.java @@ -18,7 +18,9 @@ package com.owlplug; +import atlantafx.base.theme.PrimerDark; import com.owlplug.core.components.ApplicationDefaults; +import javafx.application.Application; import javafx.application.Preloader; import javafx.application.Preloader.StateChangeNotification.Type; import javafx.fxml.FXMLLoader; @@ -28,8 +30,6 @@ import javafx.scene.control.Alert.AlertType; import javafx.stage.Stage; import javafx.stage.StageStyle; -import jfxtras.styles.jmetro.JMetro; -import jfxtras.styles.jmetro.Style; public class OwlPlugPreloader extends Preloader { @@ -42,9 +42,9 @@ public void start(Stage primaryStage) throws Exception { FXMLLoader loader = new FXMLLoader(getClass().getResource("/fxml/Preloader.fxml")); Parent root = loader.load(); + Application.setUserAgentStylesheet(new PrimerDark().getUserAgentStylesheet()); + Scene scene = new Scene(root); - JMetro jMetro = new JMetro(Style.DARK); - jMetro.setScene(scene); String owlplugCss = OwlPlugPreloader.class.getResource("/owlplug.css").toExternalForm(); scene.getStylesheets().add(owlplugCss); diff --git a/owlplug-client/src/main/java/com/owlplug/core/controllers/MainController.java b/owlplug-client/src/main/java/com/owlplug/core/controllers/MainController.java index 9ad7c367..4a2de393 100644 --- a/owlplug-client/src/main/java/com/owlplug/core/controllers/MainController.java +++ b/owlplug-client/src/main/java/com/owlplug/core/controllers/MainController.java @@ -39,9 +39,9 @@ import com.owlplug.core.utils.PlatformUtils; import com.owlplug.explore.components.ExploreTaskFactory; import com.owlplug.explore.controllers.ExploreController; -import com.owlplug.explore.services.ExploreService; import com.owlplug.plugin.services.PluginService; import com.owlplug.core.services.AppUpdateService; +import atlantafx.base.theme.Styles; import jakarta.annotation.PreDestroy; import java.util.ArrayList; import java.util.Optional; @@ -56,7 +56,6 @@ import javafx.scene.control.TabPane; import javafx.scene.layout.Pane; import javafx.scene.layout.StackPane; -import jfxtras.styles.jmetro.JMetroStyleClass; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -122,7 +121,7 @@ public void initialize() { viewRegistry.preload(); this.getDialogManager().setDialogContainer(this.getRootPane()); - this.tabPaneHeader.getStyleClass().add(JMetroStyleClass.UNDERLINE_TAB_PANE); + tabPaneHeader.getStyleClass().add(Styles.TABS_BORDER_TOP); this.tabPaneHeader.getSelectionModel().selectedIndexProperty().addListener((options, oldValue, newValue) -> { tabPaneContent.getSelectionModel().select(newValue.intValue()); leftDrawer.close(); diff --git a/owlplug-client/src/main/java/com/owlplug/core/controllers/fragments/PluginPathFragmentController.java b/owlplug-client/src/main/java/com/owlplug/core/controllers/fragments/PluginPathFragmentController.java index 11ee2ba1..db3ca0d2 100644 --- a/owlplug-client/src/main/java/com/owlplug/core/controllers/fragments/PluginPathFragmentController.java +++ b/owlplug-client/src/main/java/com/owlplug/core/controllers/fragments/PluginPathFragmentController.java @@ -18,6 +18,7 @@ package com.owlplug.core.controllers.fragments; +import atlantafx.base.controls.ToggleSwitch; import com.owlplug.core.components.ApplicationPreferences; import com.owlplug.core.ui.SVGPaths; import com.owlplug.core.utils.FileUtils; @@ -37,7 +38,6 @@ import javafx.scene.shape.SVGPath; import javafx.stage.DirectoryChooser; import javafx.stage.Window; -import org.controlsfx.control.ToggleSwitch; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/owlplug-client/src/main/java/com/owlplug/explore/controllers/SourceMenuController.java b/owlplug-client/src/main/java/com/owlplug/explore/controllers/SourceMenuController.java index 7a277ba0..07af6e93 100644 --- a/owlplug-client/src/main/java/com/owlplug/explore/controllers/SourceMenuController.java +++ b/owlplug-client/src/main/java/com/owlplug/explore/controllers/SourceMenuController.java @@ -18,6 +18,7 @@ package com.owlplug.explore.controllers; +import atlantafx.base.controls.ToggleSwitch; import com.owlplug.core.controllers.BaseController; import com.owlplug.core.controllers.MainController; import com.owlplug.core.utils.FX; @@ -34,7 +35,6 @@ import javafx.scene.layout.Pane; import javafx.scene.layout.Priority; import javafx.scene.layout.VBox; -import org.controlsfx.control.ToggleSwitch; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.context.event.EventListener; diff --git a/owlplug-client/src/main/java/com/owlplug/plugin/controllers/PluginInfoController.java b/owlplug-client/src/main/java/com/owlplug/plugin/controllers/PluginInfoController.java index b6590b73..ab29052e 100644 --- a/owlplug-client/src/main/java/com/owlplug/plugin/controllers/PluginInfoController.java +++ b/owlplug-client/src/main/java/com/owlplug/plugin/controllers/PluginInfoController.java @@ -18,6 +18,7 @@ package com.owlplug.plugin.controllers; +import atlantafx.base.controls.ToggleSwitch; import com.owlplug.controls.Dialog; import com.owlplug.controls.DialogLayout; import com.owlplug.core.components.ApplicationDefaults; @@ -56,7 +57,6 @@ import javafx.scene.layout.BackgroundRepeat; import javafx.scene.layout.BackgroundSize; import javafx.scene.layout.Pane; -import org.controlsfx.control.ToggleSwitch; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.event.EventListener; diff --git a/owlplug-client/src/main/java/com/owlplug/plugin/controllers/PluginsController.java b/owlplug-client/src/main/java/com/owlplug/plugin/controllers/PluginsController.java index 2a8ae9cf..45fcbb5b 100644 --- a/owlplug-client/src/main/java/com/owlplug/plugin/controllers/PluginsController.java +++ b/owlplug-client/src/main/java/com/owlplug/plugin/controllers/PluginsController.java @@ -27,18 +27,17 @@ import com.owlplug.plugin.events.PluginRefreshEvent; import com.owlplug.plugin.events.PluginScanEvent; import com.owlplug.plugin.events.PluginUpdateEvent; -import com.owlplug.plugin.model.Plugin; import com.owlplug.plugin.repositories.PluginRepository; import com.owlplug.plugin.services.PluginService; import com.owlplug.core.utils.Async; import javafx.fxml.FXML; import javafx.scene.control.Button; import javafx.scene.control.MenuItem; +import javafx.scene.control.SplitMenuButton; import javafx.scene.control.Tab; import javafx.scene.control.TabPane; import javafx.scene.control.TextField; import javafx.scene.layout.VBox; -import jfxtras.styles.jmetro.JMetroStyleClass; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Controller; @@ -64,7 +63,9 @@ public class PluginsController extends BaseController { protected PluginTableController tableController; @FXML - private Button scanButton; + private SplitMenuButton scanMenuButton; + @FXML + private MenuItem scanMenuItem; @FXML private MenuItem fullScanMenuItem; @FXML @@ -146,8 +147,6 @@ public void initialize() { * =================== */ - displaySwitchTabPane.getStyleClass().add(JMetroStyleClass.UNDERLINE_TAB_PANE); - // Set default display (flat plugin tree) treeViewController.setDisplayMode(PluginTreeViewController.Display.FlatTree); treeViewController.getTreeView().setVisible(true); @@ -186,7 +185,12 @@ public void initialize() { displaySwitchTabPane.getSelectionModel().select(displayListTab); } - scanButton.setOnAction(e -> { + scanMenuButton.setOnAction(e -> { + this.getTelemetryService().event("/Plugins/Scan"); + pluginService.scanPlugins(); + }); + + scanMenuItem.setOnAction(e -> { this.getTelemetryService().event("/Plugins/Scan"); pluginService.scanPlugins(); }); diff --git a/owlplug-client/src/main/java/com/owlplug/plugin/ui/RecoveredPluginView.java b/owlplug-client/src/main/java/com/owlplug/plugin/ui/RecoveredPluginView.java index 15ea87a3..b48f6c80 100644 --- a/owlplug-client/src/main/java/com/owlplug/plugin/ui/RecoveredPluginView.java +++ b/owlplug-client/src/main/java/com/owlplug/plugin/ui/RecoveredPluginView.java @@ -17,7 +17,8 @@ */ package com.owlplug.plugin.ui; - + +import atlantafx.base.controls.ToggleSwitch; import com.owlplug.core.components.ApplicationDefaults; import com.owlplug.plugin.model.Plugin; import com.owlplug.plugin.services.PluginService; @@ -28,7 +29,6 @@ import javafx.scene.layout.HBox; import javafx.scene.layout.Pane; import javafx.scene.layout.Priority; -import org.controlsfx.control.ToggleSwitch; public class RecoveredPluginView extends HBox { diff --git a/owlplug-client/src/main/java/com/owlplug/project/controllers/ProjectsController.java b/owlplug-client/src/main/java/com/owlplug/project/controllers/ProjectsController.java index 2cb8586f..c27ea2b9 100644 --- a/owlplug-client/src/main/java/com/owlplug/project/controllers/ProjectsController.java +++ b/owlplug-client/src/main/java/com/owlplug/project/controllers/ProjectsController.java @@ -36,7 +36,6 @@ import javafx.scene.control.TreeItem; import javafx.scene.control.TreeView; import javafx.util.Callback; -import jfxtras.styles.jmetro.JMetroStyleClass; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Controller; @@ -71,8 +70,6 @@ public void initialize() { projectService.syncProjects(); }); - projectTreeViewTabPane.getStyleClass().add(JMetroStyleClass.UNDERLINE_TAB_PANE); - projectTreeView.setCellFactory((Callback, TreeCell>) p -> new ProjectTreeCell(getApplicationDefaults())); diff --git a/owlplug-client/src/main/resources/fxml/MainView.fxml b/owlplug-client/src/main/resources/fxml/MainView.fxml index 0241347c..23c0fc38 100644 --- a/owlplug-client/src/main/resources/fxml/MainView.fxml +++ b/owlplug-client/src/main/resources/fxml/MainView.fxml @@ -16,6 +16,7 @@ + - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/owlplug-client/src/main/resources/fxml/Preloader.fxml b/owlplug-client/src/main/resources/fxml/Preloader.fxml index 0fb6e6f9..2970ee6f 100644 --- a/owlplug-client/src/main/resources/fxml/Preloader.fxml +++ b/owlplug-client/src/main/resources/fxml/Preloader.fxml @@ -5,7 +5,7 @@ diff --git a/owlplug-client/src/main/resources/fxml/TaskBarView.fxml b/owlplug-client/src/main/resources/fxml/TaskBarView.fxml index 62563f2b..2dca2248 100644 --- a/owlplug-client/src/main/resources/fxml/TaskBarView.fxml +++ b/owlplug-client/src/main/resources/fxml/TaskBarView.fxml @@ -3,19 +3,19 @@ - + + + + - - - - + diff --git a/owlplug-client/src/main/resources/fxml/dialogs/InstallStepView.fxml b/owlplug-client/src/main/resources/fxml/dialogs/InstallStepView.fxml index 99ec8a14..8e2d97c8 100644 --- a/owlplug-client/src/main/resources/fxml/dialogs/InstallStepView.fxml +++ b/owlplug-client/src/main/resources/fxml/dialogs/InstallStepView.fxml @@ -9,12 +9,14 @@
- + - - + + @@ -57,7 +59,7 @@ - + diff --git a/owlplug-client/src/main/resources/fxml/explore/ExploreView.fxml b/owlplug-client/src/main/resources/fxml/explore/ExploreView.fxml index 40a8b388..26b79828 100644 --- a/owlplug-client/src/main/resources/fxml/explore/ExploreView.fxml +++ b/owlplug-client/src/main/resources/fxml/explore/ExploreView.fxml @@ -13,6 +13,7 @@ + - + + + + diff --git a/owlplug-client/src/main/resources/fxml/fragments/PluginPathFragment.fxml b/owlplug-client/src/main/resources/fxml/fragments/PluginPathFragment.fxml index bff1c008..29dff3fe 100644 --- a/owlplug-client/src/main/resources/fxml/fragments/PluginPathFragment.fxml +++ b/owlplug-client/src/main/resources/fxml/fragments/PluginPathFragment.fxml @@ -9,14 +9,14 @@ - + @@ -50,9 +47,7 @@ - - - + diff --git a/owlplug-client/src/main/resources/fxml/plugins/PluginInfoView.fxml b/owlplug-client/src/main/resources/fxml/plugins/PluginInfoView.fxml index d4eb5c28..4ac8b00b 100644 --- a/owlplug-client/src/main/resources/fxml/plugins/PluginInfoView.fxml +++ b/owlplug-client/src/main/resources/fxml/plugins/PluginInfoView.fxml @@ -1,12 +1,10 @@ - - @@ -19,6 +17,8 @@ + + diff --git a/owlplug-client/src/main/resources/fxml/plugins/PluginsView.fxml b/owlplug-client/src/main/resources/fxml/plugins/PluginsView.fxml index d44967e3..400d0103 100644 --- a/owlplug-client/src/main/resources/fxml/plugins/PluginsView.fxml +++ b/owlplug-client/src/main/resources/fxml/plugins/PluginsView.fxml @@ -5,24 +5,22 @@ - - - - + + - - - + + + + + + + + + + - + @@ -59,14 +60,24 @@
- - - - - - - + + + + + + + + + + + + + + + + +
diff --git a/owlplug-client/src/main/resources/fxml/plugins/SymlinkInfoView.fxml b/owlplug-client/src/main/resources/fxml/plugins/SymlinkInfoView.fxml index 6fad8559..d587bd44 100644 --- a/owlplug-client/src/main/resources/fxml/plugins/SymlinkInfoView.fxml +++ b/owlplug-client/src/main/resources/fxml/plugins/SymlinkInfoView.fxml @@ -10,6 +10,7 @@ + @@ -46,9 +47,7 @@ diff --git a/owlplug-client/src/main/resources/fxml/projects/ProjectInfoView.fxml b/owlplug-client/src/main/resources/fxml/projects/ProjectInfoView.fxml index eb1d7e68..f7ad0b92 100644 --- a/owlplug-client/src/main/resources/fxml/projects/ProjectInfoView.fxml +++ b/owlplug-client/src/main/resources/fxml/projects/ProjectInfoView.fxml @@ -7,6 +7,7 @@ +
diff --git a/owlplug-client/src/main/resources/fxml/projects/ProjectsView.fxml b/owlplug-client/src/main/resources/fxml/projects/ProjectsView.fxml index ee0490e7..e48f5e8e 100644 --- a/owlplug-client/src/main/resources/fxml/projects/ProjectsView.fxml +++ b/owlplug-client/src/main/resources/fxml/projects/ProjectsView.fxml @@ -13,6 +13,7 @@ +
@@ -22,9 +23,13 @@
- - + + + + + + @@ -51,9 +56,7 @@ VBox.vgrow="NEVER" spacing="5.0">
diff --git a/owlplug-client/src/main/resources/icons/chart-white-16.png b/owlplug-client/src/main/resources/icons/chart-white-16.png deleted file mode 100644 index c73872b8..00000000 Binary files a/owlplug-client/src/main/resources/icons/chart-white-16.png and /dev/null differ diff --git a/owlplug-client/src/main/resources/icons/connect-white-16.png b/owlplug-client/src/main/resources/icons/connect-white-16.png deleted file mode 100644 index 3929eb0d..00000000 Binary files a/owlplug-client/src/main/resources/icons/connect-white-16.png and /dev/null differ diff --git a/owlplug-client/src/main/resources/icons/eye-white-16.png b/owlplug-client/src/main/resources/icons/eye-white-16.png deleted file mode 100644 index 97320fa4..00000000 Binary files a/owlplug-client/src/main/resources/icons/eye-white-16.png and /dev/null differ diff --git a/owlplug-client/src/main/resources/icons/eye2-white-16.png b/owlplug-client/src/main/resources/icons/eye2-white-16.png deleted file mode 100644 index b3991c1f..00000000 Binary files a/owlplug-client/src/main/resources/icons/eye2-white-16.png and /dev/null differ diff --git a/owlplug-client/src/main/resources/icons/menudot-white-64.png b/owlplug-client/src/main/resources/icons/menudot-white-64.png deleted file mode 100644 index b950683a..00000000 Binary files a/owlplug-client/src/main/resources/icons/menudot-white-64.png and /dev/null differ diff --git a/owlplug-client/src/main/resources/icons/share-white-16.png b/owlplug-client/src/main/resources/icons/share-white-16.png deleted file mode 100644 index 7ece773d..00000000 Binary files a/owlplug-client/src/main/resources/icons/share-white-16.png and /dev/null differ diff --git a/owlplug-client/src/main/resources/icons/trash-white-16.png b/owlplug-client/src/main/resources/icons/trash-white-16.png deleted file mode 100644 index b8dcf2d8..00000000 Binary files a/owlplug-client/src/main/resources/icons/trash-white-16.png and /dev/null differ diff --git a/owlplug-client/src/main/resources/media/plugin-placeholder.png b/owlplug-client/src/main/resources/media/plugin-placeholder.png index 5a8e2555..7c1a7167 100644 Binary files a/owlplug-client/src/main/resources/media/plugin-placeholder.png and b/owlplug-client/src/main/resources/media/plugin-placeholder.png differ diff --git a/owlplug-client/src/main/resources/media/plugin-placeholder.svg b/owlplug-client/src/main/resources/media/plugin-placeholder.svg new file mode 100644 index 00000000..81e21499 --- /dev/null +++ b/owlplug-client/src/main/resources/media/plugin-placeholder.svg @@ -0,0 +1,1312 @@ + + + + Audio Plugin + A stylized audio plugin interface with knobs, waveform display, faders, and I/O ports. + + + + + + + + + + + + + + + + + + + + + + AUDIO PLUGIN + VERSION 1 + + + + + + + OSCILLATOR + + + + + + + + + + + + + FREQ + + + + + + + + + + DETUNE + + + + + + + + + + MIX + + + + OCT + + + SYNC + + + LFO + + DISPLAY + + + + + + + + + WAVEFORM + + + + + + + + + ATK + + + + + + + + DEC + + + + + + + + SUS + + + + + + + + REL + + + + + + + + VEL + + MIXER + + + CH1 + + + CH2 + + + CH3 + + + CH4 + + + + + + + + + + + VU + + I / O + + + + MIDI IN + + + + MIDI OUT + + + + USB + + + OUT L + + + OUT R + + + PWR + + CLK + + ERR + diff --git a/owlplug-client/src/main/resources/owlplug.css b/owlplug-client/src/main/resources/owlplug.css index e13cb731..79790ee2 100644 --- a/owlplug-client/src/main/resources/owlplug.css +++ b/owlplug-client/src/main/resources/owlplug.css @@ -4,30 +4,69 @@ .root { + + /* Atlantafx colors mapping + + -color-fg-default; + -color-fg-muted; + -color-fg-subtle; + -color-fg-emphasis; + + -color-bg-default; + -color-bg-overlay; + -color-bg-subtle; + -color-bg-inset; + + -color-border-default; + -color-border-muted; + -color-border-subtle; + -color-shadow-default; + + -color-neutral-emphasis-plus; + -color-neutral-emphasis; + -color-neutral-muted; + -color-neutral-subtle; + + -color-accent-fg; + -color-accent-emphasis; + -color-accent-muted; + -color-accent-subtle; + + -color-success-fg; + -color-success-emphasis; + -color-success-muted; + -color-success-subtle; + + -color-warning-fg; + -color-warning-emphasis; + -color-warning-muted; + -color-warning-subtle; + + -color-danger-fg; + -color-danger-emphasis; + -color-danger-muted; + -color-danger-subtle; + + */ -fx-font-family: "Segoe UI"; - card-pane-darkshade-color: rgb(37, 37, 37); - card-pane-color: rgb(46, 46, 46); - card-pane-lightshade-color: rgb(96, 96, 96); - disabled-color: rgb(160, 160, 160); - danger-color: #d9534f; - warning-color: #ffc107; - success-color: rgb(40, 167, 69); - prompt-text-color: #4D4D4D; + disabled-color: -color-neutral-muted; + danger-color: -color-danger-subtle; + warning-color: -color-warning-fg; + success-color: -color-success-fg; - theme-primary-color: #e5dd92; - theme-secondary-color: #ebc8ae; + theme-primary-color: -color-accent-fg; - text-color: #F5F5F1; - text-emphase-color: lightgrey; + text-color: -color-fg-default; + text-emphase-color: -color-fg-emphasis; } #mainPane { - -fx-background-color: linear-gradient(to top, #c79081 0%, #dfa579 100%); + -fx-background-color: -color-bg-default; } .dialog-overlay-pane>StackPane { - -fx-background-color: card-pane-color; + -fx-background-color: -color-bg-default; } Label { @@ -78,19 +117,9 @@ Text { } .text-danger { - -fx-fill: disabled-color; -} - -TextArea { - -fx-text-fill: text-color; - -fx-background-color: rgb(55, 55, 55); - + -fx-fill: danger-color; } -TextArea .content { - -fx-background-color: rgb(55, 55, 55); - -} .table-view .cell-unknown-link, .table-view .cell-unknown-link:hover { @@ -108,13 +137,17 @@ TextArea .content { } .table-view { - -fx-background-color: card-pane-color; -fx-border-width: 0px; } +.search-bar-chip-view { + -fx-border-width: 1px; + -fx-border-radius: 4px; + -fx-border-color: -color-border-default; +} + .chip-view { -fx-max-height: 100px; - -fx-background-color: card-pane-color; } .chip-view .chips-pane .text-area { @@ -129,14 +162,6 @@ TextArea .content { -fx-border-width: 0px; } -.chip Button:pressed { - -fx-background-color: transparent; - -fx-max-height: 20px; - -fx-max-width: 20px; - -fx-text-fill: black; - -fx-border-width: 0px; -} - .chip-label { -fx-font-size: 12.0; -fx-background-color: #E0E0E0; @@ -226,7 +251,7 @@ TextArea .content { } .hyperlink-disabled { - -fx-text-fill: disabled-color; + -fx-text-fill: -color-fg-muted; } .hyperlink-disabled:focused { @@ -239,29 +264,20 @@ TextArea .content { -fx-text-fill: disabled-color; } -.list-view { - list_view_background_color: card-pane-color; -} - .combo-box .combo-box-popup .list-view, .combo-box .combo-box-popup .list-cell { - -fx-background-color: card-pane-color; -fx-text-fill: white; } .combo-box .combo-box-popup .list-cell:hover { -fx-text-fill: white; - -fx-background-color: card-pane-lightshade-color; + -fx-background-color: -color-bg-subtle; } .combo-box .list-cell { -fx-text-fill: white; } -#accountComboBox { - -fx-prompt-text-fill: transparent; -} - .no-header-tab-pane { -fx-tab-max-height: 0; } @@ -270,41 +286,23 @@ TextArea .content { visibility: hidden; } -.small-tab-pane-container { - -fx-background-color: card-pane-color; -} - -.small-tab-pane *.tab *.tab-label { - -fx-font-size: 15px; - -fx-font-weight: normal; -} - .drawer-side-pane { - -fx-background-color: card-pane-color; + -fx-background-color: -color-bg-default; } -.autocomplete-list { - -fx-background-color: card-pane-color; -} .autocomplete-list .list-cell { - -fx-background-color: card-pane-color; -fx-text-fill: text-color; } -/* ControlsFx Autocomplete Popup */ -.auto-complete-popup>.list-view { - -fx-background-color: card-pane-color; -} - .popup, .popup .popup-container, .popup .list-view { - -fx-background-color: card-pane-color; + -fx-background-color: -color-bg-default; } .progress-bar-error>.bar { - -fx-background-color: red; + -fx-background-color: -color-danger-fg; } .progress-bar-link { @@ -316,7 +314,7 @@ ProgressIndicator { } .context-menu { - -fx-background-color: card-pane-color; + -fx-background-color: -color-bg-default; -fx-text-fill: text-color; } @@ -329,26 +327,45 @@ ProgressIndicator { ****************************************************************/ .header { - -fx-background-color: card-pane-color; + -fx-background-color: -color-bg-subtle; } .header .combo-box-base { - -fx-background-color: card-pane-color; -fx-background-radius: 0; -fx-border-radius: 0; -fx-text-fill: text-color; } +/* Change the content area background */ +#tabPaneHeader .tab-content-area { + -fx-background-color: -color-bg-subtle; +} + +/* Change the tab header area background */ +#tabPaneHeader .tab-header-area .tab-header-background { + -fx-background-color: -color-bg-subtle; +} + +#accountComboBox { + -fx-prompt-text-fill: transparent; + -fx-background-color: -color-bg-subtle; +} + +.task-bar-footer { + -fx-background-color: -color-bg-inset; +} + + .pane-card { - -fx-effect: dropshadow(three-pass-box, rgba(0, 0, 0, 0.8), 10, 0, 0, 0); - -fx-background-color: card-pane-color; -fx-padding: 10, 10, 10, 10; + -fx-border-width: 1px; + -fx-border-color: -color-border-default; } .pane-card .card-title { -fx-height: 37; -fx-padding: 5, 5, 5, 5; - -fx-background-color: card-pane-darkshade-color; + -fx-background-color: -color-bg-subtle; -fx-margin: 0, 0, 10, 0; } @@ -438,7 +455,7 @@ ProgressIndicator { } .chart-legend { - -fx-background-color: card-pane-color; + -fx-background-color: -color-bg-default; } .chart-legend>.label { @@ -449,8 +466,13 @@ ProgressIndicator { -fx-fill: text-color; } +.chart-pie-label-line { + -fx-stroke: -color-fg-subtle; + -fx-fill: -color-fg-subtle; +} + .doughnut-inner-circle { - -fx-fill: card-pane-color; + -fx-fill: -color-bg-default; } .preloader .progress-bar {