mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-22 04:31:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

loaading dosis-bold font via @font-face in css

Browse Source
This commit is contained in:
Armin Schrenk
2019-10-02 13:39:38 +02:00
parent 6b5f7d37ca
commit 0e4c833be0
3 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowController.java
View File

@@ -10,7 +10,6 @@ import javafx.scene.layout.VBox;
import javafx.stage.Stage;
import org.cryptomator.common.vaults.Vault;
import org.cryptomator.common.vaults.VaultListManager;
import org.cryptomator.ui.common.FontLoader;
import org.cryptomator.ui.common.FxController;
import org.cryptomator.ui.fxapp.FxApplication;
import org.cryptomator.ui.fxapp.UpdateChecker;
@@ -21,18 +20,15 @@ import org.slf4j.LoggerFactory;
import javax.inject.Inject;
import javax.inject.Named;
import java.io.File;
import java.nio.file.Files;
import java.nio.file.NoSuchFileException;
import java.nio.file.Path;
import java.util.Collection;
import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@MainWindowScoped
public class MainWindowController implements FxController {
private static final String TITLE_FONT = "/css/dosis-bold.ttf";
private static final Logger LOG = LoggerFactory.getLogger(MainWindowController.class);
private static final String MASTERKEY_FILENAME = "masterkey.cryptomator"; // TODO: deduplicate constant declared in multiple classes
@@ -64,7 +60,6 @@ public class MainWindowController implements FxController {
@FXML
public void initialize() {
LOG.debug("init MainWindowController");
loadFont(TITLE_FONT);
titleBar.setOnMousePressed(event -> {
xOffset = event.getSceneX();
yOffset = event.getSceneY();
@@ -115,14 +110,6 @@ public class MainWindowController implements FxController {
return Stream.empty();
}
private void loadFont(String resourcePath) {
try {
FontLoader.load(resourcePath);
} catch (FontLoader.FontLoaderException e) {
LOG.warn("Error loading font from path: " + resourcePath, e);
}
}
@FXML
public void close() {
if (minimizeToSysTray) {

4
main/ui/src/main/resources/css/dark_theme.css
View File

@@ -16,6 +16,10 @@
src: url('opensans-bold.ttf');
}
@font-face {
src: url('dosis-bold.ttf');
}
/*******************************************************************************
* *
* Root Styling & Colors *

4
main/ui/src/main/resources/css/light_theme.css
View File

@@ -16,6 +16,10 @@
src: url('opensans-bold.ttf');
}
@font-face {
src: url('dosis-bold.ttf');
}
/*******************************************************************************
* *
* Root Styling & Colors *