mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-09-08 00:57:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

implement more ui logic

Browse Source 
and reduce css

Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
This commit is contained in:
Armin Schrenk
2025-12-04 17:03:36 +01:00
parent 285ddac219
commit 185c5a4f5d
3 changed files with 53 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/css/light_theme.css
+9 -42
View File
@@ -1187,16 +1187,17 @@
-fx-font-size: 1.166667em; /* 14pt - 2 more than the default font */
}
/**
Notification Window
**/
/*******************************************************************************
* *
* Notification Window
* *
******************************************************************************/
.notification-window {
-fx-background-color: MAIN_BG;
-fx-background-radius: 22;
-fx-border-radius: 22;
-fx-background-radius: 8px;
-fx-border-radius: 8px;
-fx-background-insets: 0;
-fx-background-color: rgba(255, 255, 255, 0.92);
-fx-border-color: rgba(0, 0, 0, 0.1);
-fx-border-color: MUTED_BG;
-fx-border-width: 1px;
-fx-effect: dropshadow(gaussian, rgba(0, 0, 0, 0.2), 28, 0.35, 0, 6);
}
@@ -1205,11 +1206,6 @@
-fx-alignment: center-left;
}
.notification-window .brand-title {
-fx-font-family: 'Open Sans SemiBold';
-fx-font-size: 18px;
}
.notification-window .close-button {
-fx-background-color: transparent;
-fx-border-color: transparent;
@@ -1225,30 +1221,6 @@
-fx-background-color: CONTROL_BG_ARMED;
}
.notification-window .notification-title {
-fx-font-family: 'Open Sans Bold';
-fx-font-size: 28px;
-fx-text-fill: TEXT_FILL;
}
.notification-window .notification-description {
-fx-font-size: 20px;
-fx-text-fill: TEXT_FILL;
-fx-line-spacing: 6px;
}
.notification-window .action-button {
-fx-background-color: CONTROL_BG_NORMAL;
-fx-border-color: CONTROL_BORDER_NORMAL;
-fx-border-width: 2px;
-fx-background-radius: 12;
-fx-border-radius: 12;
-fx-font-family: 'Open Sans SemiBold';
-fx-font-size: 22px;
-fx-text-fill: TEXT_FILL;
-fx-padding: 10 28 12 28;
}
.notification-window .action-button:hover {
-fx-background-color: CONTROL_BG_HOVER;
-fx-border-color: CONTROL_BORDER_FOCUSED;
@@ -1271,9 +1243,4 @@
.notification-window .nav-button:pressed {
-fx-background-color: CONTROL_BG_ARMED;
}
.notification-window .page-indicator {
-fx-font-size: 14px;
-fx-text-fill: TEXT_FILL;
}
}
src/main/resources/fxml/notification.fxml
+20 -25
View File
@@ -6,29 +6,28 @@
<?import javafx.scene.control.Label?>
<?import javafx.scene.image.Image?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.Region?>
<?import javafx.scene.layout.VBox?>
<?import org.cryptomator.ui.controls.FormattedLabel?>
<?import javafx.scene.layout.BorderPane?>
<BorderPane xmlns="http://javafx.com/javafx"
xmlns:fx="http://javafx.com/fxml"
fx:controller="org.cryptomator.ui.notification.NotificationController"
prefHeight="360.0" prefWidth="1100.0" maxHeight="600.0" maxWidth="1200.0"
prefHeight="200.0" prefWidth="300.0" maxHeight="300.0" maxWidth="400.0"
styleClass="notification-window">
<padding>
<Insets top="18" right="24" bottom="22" left="24"/>
</padding>
<top>
<HBox spacing="12" styleClass="dialog-header" alignment="CENTER_LEFT">
<ImageView fitHeight="28" preserveRatio="true" cache="true">
<ImageView fitHeight="16" preserveRatio="true" cache="true">
<Image url="@../img/logo64.png"/>
</ImageView>
<Label text="cryptomator" styleClass="brand-title"/>
<Label text="${controller.message}" styleClass="label-large"/>
<Region HBox.hgrow="ALWAYS"/>
<Button contentDisplay="GRAPHIC_ONLY" onAction="#close" styleClass="close-button">
<graphic>
<FontAwesome5IconView glyph="TIMES" glyphSize="18"/>
<FontAwesome5IconView glyph="TIMES" glyphSize="12"/>
</graphic>
</Button>
</HBox>
@@ -36,31 +35,27 @@
<center>
<VBox spacing="10">
<Label text="${controller.message}" styleClass="notification-title" wrapText="true"/>
<Label text="${controller.description}" styleClass="notification-description" wrapText="true"/>
<!--Label text="${controller.message}" styleClass="label-large" wrapText="true"/-->
<Label text="${controller.description}" styleClass="label" wrapText="true"/>
</VBox>
</center>
<bottom>
<HBox spacing="12" alignment="CENTER_LEFT">
<HBox spacing="6" alignment="CENTER_LEFT">
<Button text="${controller.actionText}" onAction="#handleButtonAction"
visible="${controller.buttonVisible}" managed="${controller.buttonVisible}"
styleClass="action-button"/>
visible="${controller.buttonVisible}" managed="${controller.buttonVisible}"/>
<Region HBox.hgrow="ALWAYS"/>
<HBox spacing="6" alignment="CENTER">
<Button contentDisplay="GRAPHIC_ONLY" styleClass="nav-button" onAction="#previousNotification">
<graphic>
<FontAwesome5IconView glyph="CHEVRON_LEFT" glyphSize="10"/>
</graphic>
</Button>
<FormattedLabel format="a%d / %d" arg1="${controller.selectionIndex}" arg2="${controller.numberOfNotifications}"
styleClass="page-indicator"/>
<Button contentDisplay="GRAPHIC_ONLY" styleClass="nav-button" onAction="#nextNotification">
<graphic>
<FontAwesome5IconView glyph="CHEVRON_RIGHT" glyphSize="10"/>
</graphic>
</Button>
</HBox>
<Button contentDisplay="GRAPHIC_ONLY" styleClass="nav-button" onAction="#previousNotification">
<graphic>
<FontAwesome5IconView glyph="CHEVRON_LEFT" glyphSize="12"/>
</graphic>
</Button>
<Label text="${controller.paging}" styleClass="label"/>
<Button contentDisplay="GRAPHIC_ONLY" styleClass="nav-button" onAction="#nextNotification">
<graphic>
<FontAwesome5IconView glyph="CHEVRON_RIGHT" glyphSize="12"/>
</graphic>
</Button>
</HBox>
</bottom>
</BorderPane>