Resolve stash conflicts and integrate team changes
This commit is contained in:
@@ -8,7 +8,7 @@
|
||||
<?import javafx.scene.layout.VBox?>
|
||||
<?import javafx.scene.text.Font?>
|
||||
|
||||
<VBox alignment="CENTER" prefHeight="400.0" prefWidth="380.0" spacing="16.0"
|
||||
<VBox alignment="CENTER" prefHeight="420.0" prefWidth="380.0" spacing="16.0"
|
||||
style="-fx-background-color: #2C3E50;"
|
||||
xmlns="http://javafx.com/javafx/17"
|
||||
xmlns:fx="http://javafx.com/fxml/1"
|
||||
@@ -17,9 +17,9 @@
|
||||
<Insets bottom="40.0" left="50.0" right="50.0" top="40.0" />
|
||||
</padding>
|
||||
<children>
|
||||
<Label text="🐾 Pet Shop Manager" textFill="WHITE">
|
||||
<Label text="Pet Shop Manager" textFill="WHITE">
|
||||
<font>
|
||||
<Font name="Comic Sans MS Bold" size="22.0" />
|
||||
<Font name="System Bold" size="22.0" />
|
||||
</font>
|
||||
<VBox.margin>
|
||||
<Insets bottom="10.0" />
|
||||
@@ -76,5 +76,17 @@
|
||||
<Insets top="8.0" />
|
||||
</VBox.margin>
|
||||
</Button>
|
||||
|
||||
<Button fx:id="btnCreateStaff" mnemonicParsing="false" onAction="#btnCreateStaffClicked"
|
||||
prefWidth="280.0"
|
||||
style="-fx-background-color: transparent; -fx-text-fill: #D5DDE6; -fx-cursor: hand; -fx-underline: true;"
|
||||
text="Create Staff Account">
|
||||
<font>
|
||||
<Font name="System Bold" size="13.0" />
|
||||
</font>
|
||||
<VBox.margin>
|
||||
<Insets top="4.0" />
|
||||
</VBox.margin>
|
||||
</Button>
|
||||
</children>
|
||||
</VBox>
|
||||
|
||||
Reference in New Issue
Block a user