Browse Source

updated update indicator styling [ci skip]

Tobias Hagemann 5 years ago
parent
commit
012c7cede9

+ 9 - 1
main/ui/src/main/resources/css/dark_theme.css

@@ -6,7 +6,7 @@
 
 .root {
 	PRIMARY: #79B01A;
-	PRIMARY_BG: #70A11B;
+	PRIMARY_BG: #598016;
 	MAIN_BG: #3B3B3B;
 	TEXT_FILL: #F7F7F7;
 	TEXT_FILL_LIGHT: #9E9E9E;
@@ -17,6 +17,7 @@
 	CONTROL_WHITE_BG_ARMED: #E1E1E1;
 	SCROLL_BAR_THUMB_NORMAL: #626262;
 	SCROLL_BAR_THUMB_HOVER: #7E7E7E;
+	INDICATOR_BG: #C74234;
 
 	-fx-background-color: MAIN_BG;
     -fx-text-fill: TEXT_FILL;
@@ -80,6 +81,13 @@
 	-fx-cursor: nw_resize;
 }
 
+.main-window .update-indicator {
+	-fx-background-color: PRIMARY_BG, INDICATOR_BG;
+	-fx-background-insets: 0, 1px;
+	-fx-background-radius: 5px, 4px;
+	-fx-translate-x: 4px;
+}
+
 /*******************************************************************************
  *                                                                             *
  * Preferences Window                                                          *

+ 8 - 0
main/ui/src/main/resources/css/light_theme.css

@@ -17,6 +17,7 @@
 	CONTROL_WHITE_BG_ARMED: #E1E1E1;
 	SCROLL_BAR_THUMB_NORMAL: #CFCFCF;
 	SCROLL_BAR_THUMB_HOVER: #B1B1B1;
+	INDICATOR_BG: #E74C3C;
 
 	-fx-background-color: MAIN_BG;
 	-fx-text-fill: TEXT_FILL;
@@ -80,6 +81,13 @@
 	-fx-cursor: nw_resize;
 }
 
+.main-window .update-indicator {
+	-fx-background-color: PRIMARY_BG, INDICATOR_BG;
+	-fx-background-insets: 0, 1px;
+	-fx-background-radius: 5px, 4px;
+	-fx-translate-x: 4px;
+}
+
 /*******************************************************************************
  *                                                                             *
  * Preferences Window                                                          *

+ 1 - 3
main/ui/src/main/resources/fxml/main_window.fxml

@@ -10,7 +10,6 @@
 <?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
-<?import javafx.scene.shape.Circle?>
 <VBox xmlns="http://javafx.com/javafx"
 	  xmlns:fx="http://javafx.com/fxml"
 	  fx:controller="org.cryptomator.ui.mainwindow.MainWindowController"
@@ -26,8 +25,7 @@
 				<graphic>
 					<StackPane>
 						<FontAwesomeIconView styleClass="fa-icon" glyphName="COGS"/>
-						<!-- TODO style: -->
-						<Circle visible="${controller.updateAvailable}" StackPane.alignment="TOP_RIGHT" styleClass="update-indicator" fill="red" radius="4"/>
+						<Region styleClass="update-indicator" visible="${controller.updateAvailable}" StackPane.alignment="TOP_RIGHT" prefWidth="10" prefHeight="10" maxWidth="-Infinity" maxHeight="-Infinity"/>
 					</StackPane>
 				</graphic>
 				<tooltip>