From 39c358c00fd359c64c917c31f02ba04fb90da7f9 Mon Sep 17 00:00:00 2001 From: Seil0 Date: Sat, 8 Jun 2019 13:48:16 +0200 Subject: [PATCH] update to JFoenix 8.0.9 * added a promptText to the search ChipView --- client/build.gradle | 2 +- .../view/mainView/DetailView.kt | 1 - .../texturesyncclient/view/mainView/MainView.kt | 1 + client/src/main/resources/css/Styles.css | 17 +++++++++++++++++ 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/client/build.gradle b/client/build.gradle index e3b66ee..8c6bad7 100644 --- a/client/build.gradle +++ b/client/build.gradle @@ -27,7 +27,7 @@ repositories { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "no.tornado:tornadofx:$tornadofx_version" - implementation "com.jfoenix:jfoenix:8.0.8" + implementation "com.jfoenix:jfoenix:8.0.9" implementation 'com.google.code.gson:gson:2.8.5' } diff --git a/client/src/main/kotlin/org/hso/texturesyncclient/view/mainView/DetailView.kt b/client/src/main/kotlin/org/hso/texturesyncclient/view/mainView/DetailView.kt index cef4592..bdc27b5 100644 --- a/client/src/main/kotlin/org/hso/texturesyncclient/view/mainView/DetailView.kt +++ b/client/src/main/kotlin/org/hso/texturesyncclient/view/mainView/DetailView.kt @@ -55,7 +55,6 @@ class DetailView: View() { } } - // TODO add "Import" Btn } style { diff --git a/client/src/main/kotlin/org/hso/texturesyncclient/view/mainView/MainView.kt b/client/src/main/kotlin/org/hso/texturesyncclient/view/mainView/MainView.kt index 1a7c170..bb001ac 100644 --- a/client/src/main/kotlin/org/hso/texturesyncclient/view/mainView/MainView.kt +++ b/client/src/main/kotlin/org/hso/texturesyncclient/view/mainView/MainView.kt @@ -47,6 +47,7 @@ class MainView : View() { right = detailView.root style { + cvSearch.promptText = "Suche" cvSearch.paddingAll = 5.0 cvSearch.minHeight = 70.0 cvSearch.style = "-fx-background-color: #53585b; -fx-text-inner-color: #b15b2e;" diff --git a/client/src/main/resources/css/Styles.css b/client/src/main/resources/css/Styles.css index 19d3dc1..1c258bc 100644 --- a/client/src/main/resources/css/Styles.css +++ b/client/src/main/resources/css/Styles.css @@ -90,3 +90,20 @@ -jfx-button-type: RAISED; -fx-font-size: 25px } + +/******************************************************************************* + * * + * ChipView * + * * + ******************************************************************************/ + +.jfx-chip-view .jfx-chip > HBox { + -fx-font-family: "Roboto Medium"; + -fx-font-size: 14.0; + -fx-background-color: #E0E0E0; + -fx-background-radius: 40px; + -fx-padding: 5px 8px 5px 12px; + -fx-pref-height: 32px; + -fx-alignment: center-left; + -fx-spacing: 8; +}