Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[W6.2][T09-B1] Nguyen Duy Son #901

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[W6.2][T09-B1] Nguyen Duy Son #901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4bdc21a
Add new fonts, customize css
duyson98 Sep 27, 2017
69110dd
Add application icon
duyson98 Sep 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added resources/images/address_book.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions src/seedu/addressbook/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import javafx.application.Application;
import javafx.application.Platform;

import javafx.scene.image.Image;
import javafx.scene.text.Font;
import javafx.stage.Stage;
import seedu.addressbook.logic.Logic;
import seedu.addressbook.ui.Gui;
Expand All @@ -20,6 +22,13 @@ public class Main extends Application implements Stoppable{

@Override
public void start(Stage primaryStage) throws Exception{
// Load custom fonts
Font.loadFont(getClass().getResourceAsStream("/seedu/addressbook/ui/fonts/NovaSquare.ttf"), 10);
Font.loadFont(getClass().getResourceAsStream("/seedu/addressbook/ui/fonts/Electrolize-Regular.ttf"), 10);

// Add application icon
primaryStage.getIcons().add(new Image("file:resources/images/address_book.png"));

gui = new Gui(new Logic(), VERSION);
gui.start(primaryStage, this);
}
Expand Down
22 changes: 10 additions & 12 deletions src/seedu/addressbook/ui/DarkTheme.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@


.text-field {
-fx-font-size: 12pt;
-fx-font-family: "Consolas";
-fx-font-weight: bold;
-fx-text-fill: yellow;
-fx-control-inner-background: derive(#1d1d1d,20%);
-fx-font-size: 15pt;
-fx-font-family: "Nova Square";
-fx-text-fill: lightgray;
-fx-control-inner-background: black;
}

.text-area {
-fx-background-color: black;
-fx-control-inner-background: black;
-fx-font-family: "Segoe UI Semibold";
-fx-font-size: 10pt;
-fx-background-color: #545454;
-fx-control-inner-background: mediumblue;
-fx-font-family: "Electrolize";
-fx-font-size: 18pt;
-fx-text-fill: ghostwhite;
-fx-padding: 5 5 5 5;
}
}
Binary file added src/seedu/addressbook/ui/fonts/Electrolize-Regular.ttf
View file
Open in desktop
Binary file not shown.
Binary file added src/seedu/addressbook/ui/fonts/NovaSquare.ttf
View file
Open in desktop
Binary file not shown.
3 changes: 1 addition & 2 deletions src/seedu/addressbook/ui/mainwindow.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
<?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.VBox?>

<VBox stylesheets="@/seedu/addressbook/ui/DarkTheme.css" alignment="center" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="seedu.addressbook.ui.MainWindow">
<VBox alignment="center" stylesheets="@/seedu/addressbook/ui/DarkTheme.css" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seedu.addressbook.ui.MainWindow">

<children>

Expand Down