Merge branch 'window-design'

Ultimate-TicTacToe-Java · May 22, 2022 · 82c091e · 82c091e
2 parents 5b2f21f + 2563f25
commit 82c091e
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 20 deletions.
diff --git a/src/main/resources/GameWindow/main.fxml b/src/main/resources/GameWindow/main.fxml
@@ -9,13 +9,14 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="1000.0" prefWidth="1506.0" styleClass="backgroundColor" stylesheets="@../main/style.css" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1">
+<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="1000.0" prefWidth="1506.0"
+      styleClass="backgroundColor" stylesheets="@../main/style.css" xmlns="http://javafx.com/javafx/18" xmlns:fx="http://javafx.com/fxml/1">
    <children>
       <Group layoutX="563.0" layoutY="119.0">
          <children>
             <ImageView fitHeight="777.0" fitWidth="500.0" layoutY="140.0" pickOnBounds="true" preserveRatio="true">
                <image>
-                  <Image url="@../img/Asset%206.png" />
+                  <Image url="@../img/Asset6.png" />
                </image>
             </ImageView>
             <ImageView fitHeight="219.0" fitWidth="264.0" layoutX="402.0" layoutY="52.0" pickOnBounds="true" preserveRatio="true">

diff --git a/src/main/resources/img/Asset 6.png → src/main/resources/img/Asset6.png b/src/main/resources/img/Asset 6.png → src/main/resources/img/Asset6.png
diff --git a/src/main/resources/main/style.css b/src/main/resources/main/style.css
@@ -3,9 +3,26 @@
     background-color: black;
 }*/
 
+.BigBoard {
+    -fx-padding: 60px;
+}
+
+.SmallBoardsContainer{
+    -fx-border-color: rgba(36,166,183,.9);
+    -fx-border-width: 8;
+}
+.SmallBoard {
+    -fx-opacity: 1;
+    -fx-background-color: rgba(36,166,183,.1);
+    -fx-border-color: rgba(36,166,183,.2);
+    -fx-border-width: 8;
+    -fx-background-radius: 20;
+}
+
+
 .button {
     -fx-background-color: transparent;
-    -fx-border-color: darkgrey;
+    -fx-border-color: '#092937';
     -fx-border-width: 2;
     -fx-padding: 0;
     -fx-font-size: 70;
@@ -14,30 +31,17 @@
     -fx-font-family: "Consolas";
 }
 
-.button .text{
+.button .text {
     -fx-stroke: black;
     -fx-stroke-width: 1.5;
 }
 
-.BigBoard {
-    -fx-padding: 50px;
-    -fx-border-width: 20;
-    background-color: aqua;
-    background-color: aqua;
-}
-
-.SmallBoard {
-    -fx-opacity: 1;
-    -fx-background-color: transparent;
-    -fx-border-color: black;
-    -fx-border-width: 3;
-}
 
 .Draw {
     -fx-border-color: yellow;
 }
 
-.Draw .label{
+.Draw .label {
     -fx-font-size: 150;
     -fx-font-weight: bold;
     -fx-text-fill: yellow;
@@ -47,7 +51,7 @@
     -fx-border-color: red;
 }
 
-.WonX .label{
+.WonX .label {
     -fx-font-size: 200;
     -fx-font-weight: bold;
     -fx-text-fill: red;
@@ -57,7 +61,7 @@
     -fx-border-color: blue;
 }
 
-.WonO .label{
+.WonO .label {
     -fx-font-size: 200;
     -fx-font-weight: bold;
     -fx-text-fill: blue;