From e37f1f914b3cf61380e21af34bf958cb96b21ab9 Mon Sep 17 00:00:00 2001
From: Tobias Hagemann <tobias@hagemann.org>
Date: Tue, 26 May 2020 13:20:47 +0200
Subject: [PATCH] some layout adjustments in vault detail

---
 .../src/main/resources/fxml/vault_detail.fxml |  2 +-
 .../resources/fxml/vault_detail_locked.fxml   | 22 ++++++++++---------
 .../resources/fxml/vault_detail_missing.fxml  |  3 ---
 .../fxml/vault_detail_needsmigration.fxml     |  6 +----
 .../resources/fxml/vault_detail_unlocked.fxml |  8 +++----
 5 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/main/ui/src/main/resources/fxml/vault_detail.fxml b/main/ui/src/main/resources/fxml/vault_detail.fxml
index e171e0887..625ae1e1f 100644
--- a/main/ui/src/main/resources/fxml/vault_detail.fxml
+++ b/main/ui/src/main/resources/fxml/vault_detail.fxml
@@ -14,7 +14,7 @@
 	  xmlns:fx="http://javafx.com/fxml"
 	  fx:controller="org.cryptomator.ui.mainwindow.VaultDetailController"
 	  minWidth="300"
-	  spacing="36">
+	  spacing="60">
 	<padding>
 		<Insets topRightBottomLeft="24"/>
 	</padding>
diff --git a/main/ui/src/main/resources/fxml/vault_detail_locked.fxml b/main/ui/src/main/resources/fxml/vault_detail_locked.fxml
index ca0c9fdce..12c192db3 100644
--- a/main/ui/src/main/resources/fxml/vault_detail_locked.fxml
+++ b/main/ui/src/main/resources/fxml/vault_detail_locked.fxml
@@ -1,28 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Hyperlink?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.VBox?>
 <?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.layout.Region?>
 <VBox xmlns="http://javafx.com/javafx"
 	  xmlns:fx="http://javafx.com/fxml"
 	  fx:controller="org.cryptomator.ui.mainwindow.VaultDetailLockedController"
 	  alignment="TOP_CENTER"
 	  spacing="9">
-	<padding>
-		<Insets topRightBottomLeft="24"/>
-	</padding>
 	<children>
-		<Button styleClass="button-large" text="%main.vaultDetail.unlockBtn" minWidth="120" onAction="#unlock" defaultButton="${controller.vault.locked}"  visible="${!controller.passwordSaved}" managed="${!controller.passwordSaved}">
+		<Button styleClass="button-large" text="%main.vaultDetail.unlockBtn" minWidth="120" onAction="#unlock" defaultButton="${controller.vault.locked}" visible="${!controller.passwordSaved}"
+				managed="${!controller.passwordSaved}">
 			<graphic>
 				<FontAwesome5IconView glyph="KEY" glyphSize="15"/>
 			</graphic>
 		</Button>
-		<Button styleClass="button-large" text="%main.vaultDetail.unlockNowBtn" minWidth="120" onAction="#unlock" defaultButton="${controller.vault.locked}" visible="${controller.passwordSaved}" managed="${controller.passwordSaved}">
+		<Button styleClass="button-large" text="%main.vaultDetail.unlockNowBtn" minWidth="120" onAction="#unlock" defaultButton="${controller.vault.locked}" visible="${controller.passwordSaved}"
+				managed="${controller.passwordSaved}">
 			<graphic>
 				<FontAwesome5IconView glyph="KEY" glyphSize="15"/>
 			</graphic>
@@ -34,7 +32,11 @@
 		</Hyperlink>
 		<Region VBox.vgrow="ALWAYS"/>
 		<HBox alignment="CENTER_RIGHT" spacing="6">
-			<Label styleClass="label-small" text="%main.vaultDetail.passwordSavedInKeychain" visible="${controller.passwordSaved}"/>
+			<Label styleClass="label-small,label-muted" text="%main.vaultDetail.passwordSavedInKeychain" visible="${controller.passwordSaved}">
+				<graphic>
+					<FontAwesome5IconView styleClass="glyph-icon-muted" glyph="LOCK"/>
+				</graphic>
+			</Label>
 		</HBox>
 	</children>
 </VBox>
diff --git a/main/ui/src/main/resources/fxml/vault_detail_missing.fxml b/main/ui/src/main/resources/fxml/vault_detail_missing.fxml
index cc94063f5..cf3b66276 100644
--- a/main/ui/src/main/resources/fxml/vault_detail_missing.fxml
+++ b/main/ui/src/main/resources/fxml/vault_detail_missing.fxml
@@ -9,9 +9,6 @@
 	  fx:controller="org.cryptomator.ui.mainwindow.VaultDetailMissingVaultController"
 	  alignment="TOP_CENTER"
 	  spacing="9">
-	<padding>
-		<Insets topRightBottomLeft="24"/>
-	</padding>
 	<children>
 		<StackPane alignment="CENTER">
 			<Circle styleClass="glyph-icon-primary" radius="48"/>
diff --git a/main/ui/src/main/resources/fxml/vault_detail_needsmigration.fxml b/main/ui/src/main/resources/fxml/vault_detail_needsmigration.fxml
index bc74bc03a..adb89b29f 100644
--- a/main/ui/src/main/resources/fxml/vault_detail_needsmigration.fxml
+++ b/main/ui/src/main/resources/fxml/vault_detail_needsmigration.fxml
@@ -1,16 +1,12 @@
-<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.VBox?>
 <?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<?import javafx.scene.control.Label?>
 <VBox xmlns="http://javafx.com/javafx"
 	  xmlns:fx="http://javafx.com/fxml"
 	  fx:controller="org.cryptomator.ui.mainwindow.VaultDetailNeedsMigrationController"
 	  alignment="TOP_CENTER"
 	  spacing="9">
-	<padding>
-		<Insets topRightBottomLeft="24"/>
-	</padding>
 	<children>
 		<Label text="%main.vaultDetail.migratePrompt" wrapText="true"/>
 		<Button styleClass="button-large" text="%main.vaultDetail.migrateButton" minWidth="120" onAction="#showVaultMigrator">
diff --git a/main/ui/src/main/resources/fxml/vault_detail_unlocked.fxml b/main/ui/src/main/resources/fxml/vault_detail_unlocked.fxml
index 5bc69b1fd..492c0336b 100644
--- a/main/ui/src/main/resources/fxml/vault_detail_unlocked.fxml
+++ b/main/ui/src/main/resources/fxml/vault_detail_unlocked.fxml
@@ -36,13 +36,13 @@
 	<Region VBox.vgrow="ALWAYS"/>
 
 	<HBox alignment="CENTER_RIGHT" spacing="6">
-		<Label styleClass="label-small" text="%main.vaultDetail.bytesPerSecondRead"/>
-		<ThrougputLabel styleClass="label-small" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps"
+		<Label styleClass="label-small,label-muted" text="%main.vaultDetail.bytesPerSecondRead"/>
+		<ThrougputLabel styleClass="label-small,label-muted" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps"
 						mibsFormat="%main.vaultDetail.throughput.mbps" bytesPerSecond="${controller.vault.stats.bytesPerSecondRead}"/>
 	</HBox>
 	<HBox alignment="CENTER_RIGHT" spacing="6">
-		<Label styleClass="label-small" text="%main.vaultDetail.bytesPerSecondWritten"/>
-		<ThrougputLabel styleClass="label-small" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps"
+		<Label styleClass="label-small,label-muted" text="%main.vaultDetail.bytesPerSecondWritten"/>
+		<ThrougputLabel styleClass="label-small,label-muted" alignment="CENTER_RIGHT" minWidth="60" idleFormat="%main.vaultDetail.throughput.idle" kibsFormat="%main.vaultDetail.throughput.kbps"
 						mibsFormat="%main.vaultDetail.throughput.mbps" bytesPerSecond="${controller.vault.stats.bytesPerSecondWritten}"/>
 	</HBox>
 </VBox>
\ No newline at end of file