Skip to content

Commit

Permalink
Merge pull request AY2324S2-CS2103T-T15-1#104 from officialchengyud/b…
Browse files Browse the repository at this point in the history
…ranch-ui

Improve javafx UI
  • Loading branch information
alfaloo authored Mar 30, 2024
2 parents ceb738e + 9567094 commit cf0b289
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 12 deletions.
18 changes: 10 additions & 8 deletions src/main/resources/view/LightTheme.css
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,19 @@
}

.cell_big_label {
-fx-font-family: "Segoe UI Semibold";
-fx-font-size: 16px;
-fx-font-family: "Segoe UI SemiBold";
-fx-font-size: 18px;
-fx-text-fill: #052a3a;
-fx-font-weight: bold;
}

.cell_small_label {
-fx-font-family: "Segoe UI";
-fx-font-size: 13px;
-fx-text-fill: #414141 !important;
}

.cell_type_label {
-fx-font-family: "Segoe UI";
-fx-font-size: 13px;
-fx-text-fill: #052a3a;
Expand Down Expand Up @@ -156,12 +163,7 @@
#resultDisplay {
-fx-border-radius: 10px;
-fx-background-radius: 10px;
/*-fx-text-fill: #052a3a;*/
/*-fx-border-radius: 10 10 0 0;*/
/*-fx-background-radius: 10 10 0 0;*/
/*-fx-background-color: black;*/
/*-fx-background-radius: 15px;*/
/*-fx-border-radius: 15px;*/
-fx-font-size: 11pt;
}

.status-bar {
Expand Down
15 changes: 11 additions & 4 deletions src/main/resources/view/PersonListCard.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<?import javafx.scene.layout.Region?>
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.layout.VBox?>

<?import javafx.scene.text.Font?>

<VBox xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1">
<children>
Expand All @@ -29,18 +29,25 @@
<Region fx:constant="USE_PREF_SIZE" />
</minWidth>
</Label>
<Label fx:id="name" styleClass="cell_big_label" text="\$first" />
<Label fx:id="name" styleClass="cell_big_label" text="\$first">
</Label>
<Region prefHeight="17.0" prefWidth="48.0" HBox.hgrow="ALWAYS" />
<Label id="typeText" fx:id="type" styleClass="cell_small_label" text="\$type" textAlignment="RIGHT">
<Label id="typeText" fx:id="type" styleClass="cell_type_label" text="\$type" textAlignment="RIGHT">
<HBox.margin>
<Insets right="10.0" />
</HBox.margin>
</Label>
<opaqueInsets>
<Insets />
</opaqueInsets>
<VBox.margin>
<Insets bottom="6.0" />
</VBox.margin>
</HBox>
<FlowPane fx:id="tags" />
<Label fx:id="nric" styleClass="cell_small_label" text="\$nric" />
<Label fx:id="dob" styleClass="cell_small_label" text="\$dob" />
<Label fx:id="phone" styleClass="cell_small_label" text="\$phone" />
<Label fx:id="dob" styleClass="cell_small_label" text="\$dob" />
</VBox>
<rowConstraints>
<RowConstraints />
Expand Down

0 comments on commit cf0b289

Please sign in to comment.