~exprez135/cryptomator-libre

09b6b0da28e935f71c9401b6be76fd71e10e742c — Tobias Hagemann 1 year, 8 months ago 10d39f6
renamed secondary css classes to muted, made "locked" badge muted
M main/ui/src/main/resources/css/dark_theme.css => main/ui/src/main/resources/css/dark_theme.css +5 -4
@@ 51,6 51,7 @@
	YELLOW_5: #F1C40F;

	MAIN_BG: GRAY_1;
	MUTED_BG: GRAY_3;
	TEXT_FILL: GRAY_9;
	TEXT_FILL_HIGHLIGHTED: PRIMARY;
	TEXT_FILL_MUTED: GRAY_5;


@@ 95,7 96,7 @@
	-fx-text-fill: TEXT_FILL;
}

.label-secondary {
.label-muted {
	-fx-text-fill: TEXT_FILL_MUTED;
}



@@ 374,9 375,9 @@
	-fx-background-color: PRIMARY;
}

.badge-secondary {
.badge-muted {
	-fx-text-fill: white;
	-fx-background-color: SECONDARY;
	-fx-background-color: MUTED_BG;
}

/*******************************************************************************


@@ 571,7 572,7 @@
	-fx-underline: true;
}

.hyperlink.hyperlink-secondary {
.hyperlink.hyperlink-muted {
	-fx-text-fill: TEXT_FILL_MUTED;
}


M main/ui/src/main/resources/css/light_theme.css => main/ui/src/main/resources/css/light_theme.css +5 -4
@@ 51,6 51,7 @@
	YELLOW_5: #F1C40F;

	MAIN_BG: GRAY_9;
	MUTED_BG: GRAY_5;
	TEXT_FILL: GRAY_0;
	TEXT_FILL_HIGHLIGHTED: PRIMARY;
	TEXT_FILL_MUTED: GRAY_5;


@@ 95,7 96,7 @@
	-fx-text-fill: TEXT_FILL;
}

.label-secondary {
.label-muted {
	-fx-text-fill: TEXT_FILL_MUTED;
}



@@ 373,9 374,9 @@
	-fx-background-color: PRIMARY;
}

.badge-secondary {
.badge-muted {
	-fx-text-fill: white;
	-fx-background-color: SECONDARY;
	-fx-background-color: MUTED_BG;
}

/*******************************************************************************


@@ 570,7 571,7 @@
	-fx-underline: true;
}

.hyperlink.hyperlink-secondary {
.hyperlink.hyperlink-muted {
	-fx-text-fill: TEXT_FILL_MUTED;
}


M main/ui/src/main/resources/fxml/new_password.fxml => main/ui/src/main/resources/fxml/new_password.fxml +2 -2
@@ 19,12 19,12 @@
		<Label text="%newPassword.promptText" labelFor="$passwordField"/>
		<NiceSecurePasswordField fx:id="passwordField"/>
		<PasswordStrengthIndicator spacing="6" prefHeight="6" strength="${controller.passwordStrength}"/>
		<Label fx:id="passwordStrengthLabel" styleClass="label-secondary" alignment="CENTER_RIGHT" maxWidth="Infinity"/>
		<Label fx:id="passwordStrengthLabel" styleClass="label-muted" alignment="CENTER_RIGHT" maxWidth="Infinity"/>
	
		<Region/>

		<Label text="%newPassword.reenterPassword" labelFor="$reenterField"/>
		<NiceSecurePasswordField fx:id="reenterField"/>
		<Label fx:id="passwordMatchLabel" styleClass="label-secondary" alignment="CENTER_RIGHT" maxWidth="Infinity" graphicTextGap="6" contentDisplay="LEFT" />
		<Label fx:id="passwordMatchLabel" styleClass="label-muted" alignment="CENTER_RIGHT" maxWidth="Infinity" graphicTextGap="6" contentDisplay="LEFT" />
	</children>
</VBox>

M main/ui/src/main/resources/fxml/preferences_general.fxml => main/ui/src/main/resources/fxml/preferences_general.fxml +1 -1
@@ 23,7 23,7 @@
		<HBox spacing="6" alignment="CENTER_LEFT">
			<Label text="%preferences.general.theme"/>
			<ChoiceBox fx:id="themeChoiceBox" disable="${!controller.licenseHolder.validLicense}"/>
			<Hyperlink styleClass="hyperlink-underline,hyperlink-secondary" text="%preferences.general.unlockThemes" onAction="#showDonationTab" visible="${!controller.licenseHolder.validLicense}" managed="${!controller.licenseHolder.validLicense}"/>
			<Hyperlink styleClass="hyperlink-underline,hyperlink-muted" text="%preferences.general.unlockThemes" onAction="#showDonationTab" visible="${!controller.licenseHolder.validLicense}" managed="${!controller.licenseHolder.validLicense}"/>
		</HBox>

		<HBox spacing="6" alignment="CENTER_LEFT">

M main/ui/src/main/resources/fxml/vault_detail.fxml => main/ui/src/main/resources/fxml/vault_detail.fxml +3 -3
@@ 32,11 32,11 @@
						</tooltip>
					</Label>
					<Region HBox.hgrow="ALWAYS"/>
					<Label styleClass="badge,badge-pill,badge-secondary" text="%main.vaultDetail.lockedStatus" minWidth="-Infinity" visible="${controller.vault.locked}" managed="${controller.vault.locked}"/>
					<Label styleClass="badge,badge-pill,badge-secondary" text="…" minWidth="-Infinity" visible="${controller.vault.processing}" managed="${controller.vault.processing}"/>
					<Label styleClass="badge,badge-pill,badge-muted" text="%main.vaultDetail.lockedStatus" minWidth="-Infinity" visible="${controller.vault.locked}" managed="${controller.vault.locked}"/>
					<Label styleClass="badge,badge-pill,badge-muted" text="…" minWidth="-Infinity" visible="${controller.vault.processing}" managed="${controller.vault.processing}"/>
					<Label styleClass="badge,badge-pill,badge-primary" text="%main.vaultDetail.unlockedStatus" minWidth="-Infinity" visible="${controller.vault.unlocked}" managed="${controller.vault.unlocked}"/>
				</HBox>
				<Hyperlink styleClass="hyperlink-secondary,hyperlink-hover-icon" text="${controller.vault.displayablePath}" textOverrun="CENTER_ELLIPSIS" onAction="#revealStorageLocation">
				<Hyperlink styleClass="hyperlink-muted,hyperlink-hover-icon" text="${controller.vault.displayablePath}" textOverrun="CENTER_ELLIPSIS" onAction="#revealStorageLocation">
					<graphic>
						<FontAwesome5IconView styleClass="glyph-icon-muted" glyph="EYE"/>
					</graphic>