From dc2b3134289063d8bc0f595af3fb6a1962200327 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolay=20Schi=C3=B8ll-Johansen?=
<nicolayschiolljohansen@gmail.com>
Date: Wed, 8 Apr 2020 13:33:19 +0200
Subject: [PATCH] Cleaned up style.css and refactored some styling names
---
.../resources/NTNU/IDATT1002/explore.fxml | 2 +-
src/main/resources/NTNU/IDATT1002/login.fxml | 2 +-
src/main/resources/NTNU/IDATT1002/search.fxml | 2 +-
src/main/resources/NTNU/IDATT1002/signup.fxml | 2 +-
src/main/resources/NTNU/IDATT1002/style.css | 69 ++++++++++---------
5 files changed, 40 insertions(+), 37 deletions(-)
diff --git a/src/main/resources/NTNU/IDATT1002/explore.fxml b/src/main/resources/NTNU/IDATT1002/explore.fxml
index 3fb5ddae..b054cd20 100644
--- a/src/main/resources/NTNU/IDATT1002/explore.fxml
+++ b/src/main/resources/NTNU/IDATT1002/explore.fxml
@@ -67,7 +67,7 @@
<Pane prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER" />
</right>
<center>
- <GridPane fx:id="gridPane" alignment="CENTER" hgap="10.0" styleClass="exploreGrid" stylesheets="@style.css" vgap="10.0" BorderPane.alignment="CENTER">
+ <GridPane fx:id="gridPane" alignment="CENTER" hgap="10.0" styleClass="transparentbg" stylesheets="@style.css" vgap="10.0" BorderPane.alignment="CENTER">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
diff --git a/src/main/resources/NTNU/IDATT1002/login.fxml b/src/main/resources/NTNU/IDATT1002/login.fxml
index 39d123b1..065b8d11 100644
--- a/src/main/resources/NTNU/IDATT1002/login.fxml
+++ b/src/main/resources/NTNU/IDATT1002/login.fxml
@@ -27,7 +27,7 @@
<padding>
<Insets left="30.0" top="30.0" />
</padding></VBox>
- <VBox alignment="CENTER" minWidth="600.0" prefHeight="1080.0" prefWidth="800.0" spacing="20.0" styleClass="signupbg" stylesheets="@style.css">
+ <VBox alignment="CENTER" minWidth="600.0" prefHeight="1080.0" prefWidth="800.0" spacing="20.0" styleClass="accentBg" stylesheets="@style.css">
<children>
<GridPane hgap="10.0" maxWidth="339.0" prefHeight="224.0" prefWidth="339.0" vgap="10.0">
<columnConstraints>
diff --git a/src/main/resources/NTNU/IDATT1002/search.fxml b/src/main/resources/NTNU/IDATT1002/search.fxml
index 69ed8f16..e4f53a22 100644
--- a/src/main/resources/NTNU/IDATT1002/search.fxml
+++ b/src/main/resources/NTNU/IDATT1002/search.fxml
@@ -101,7 +101,7 @@
</HBox>
</top>
<center>
- <VBox fx:id="vBox" maxHeight="1.7976931348623157E308" maxWidth="Infinity" minHeight="980.0" prefWidth="1920.0" spacing="10.0" styleClass="exploreGrid" stylesheets="@style.css" BorderPane.alignment="CENTER" />
+ <VBox fx:id="vBox" maxHeight="1.7976931348623157E308" maxWidth="Infinity" minHeight="980.0" prefWidth="1920.0" spacing="10.0" styleClass="transparentbg" stylesheets="@style.css" BorderPane.alignment="CENTER" />
</center>
<left>
<VBox prefHeight="200.0" prefWidth="100.0" BorderPane.alignment="CENTER" />
diff --git a/src/main/resources/NTNU/IDATT1002/signup.fxml b/src/main/resources/NTNU/IDATT1002/signup.fxml
index c9451af0..45ffa8d7 100644
--- a/src/main/resources/NTNU/IDATT1002/signup.fxml
+++ b/src/main/resources/NTNU/IDATT1002/signup.fxml
@@ -28,7 +28,7 @@
<padding>
<Insets left="30.0" top="30.0" />
</padding></VBox>
- <VBox alignment="CENTER" minWidth="600.0" prefHeight="400.0" prefWidth="800.0" spacing="20.0" styleClass="signupbg" stylesheets="@style.css">
+ <VBox alignment="CENTER" minWidth="600.0" prefHeight="400.0" prefWidth="800.0" spacing="20.0" styleClass="accentBg" stylesheets="@style.css">
<children>
<GridPane fx:id="signup_form" hgap="10.0" maxWidth="-Infinity" prefHeight="356.0" prefWidth="400.0" vgap="10.0">
<columnConstraints>
diff --git a/src/main/resources/NTNU/IDATT1002/style.css b/src/main/resources/NTNU/IDATT1002/style.css
index 4b0c9ceb..e2e30efd 100644
--- a/src/main/resources/NTNU/IDATT1002/style.css
+++ b/src/main/resources/NTNU/IDATT1002/style.css
@@ -1,13 +1,10 @@
+/*GENERAL STYLING*/
.bodybg{
-fx-background-image: url("../../Images/vector1.jpg");
-fx-background-size: cover;
}
-.signupbg{
- -fx-background-color: #10101f;
-}
-
.tbarbg{
-fx-background-color: #10101f;
}
@@ -16,33 +13,14 @@
-fx-background-color: #222235;
}
-.button{
- -fx-transition-duration: 0.4s;
- -fx-background-color: none;
- -fx-border-width: 2px;
- -fx-border-color: #46b4fe;
- -fx-text-fill: white;
-
-}
-
-.button:hover{
- -fx-background-color: rgba(193, 198, 196, 0.5);
- -fx-color: white;
-}
-
-.tbarmenu{
-
-}
-
-.exploreGrid{
+.transparentbg{
-fx-background-color: rgba(255, 255, 255, 0.5);
}
-.exploreGridPane{
- -fx-fit-to-width: true;
+.accentBg{
+ -fx-background-color: #10101f;
}
-
/*SCROLLPANE CSS*/
.scroll-pane {
@@ -70,12 +48,6 @@
/*SCROLLPANE CSS END*/
-
-
-.scrollHbox{
- -fx-background-color: transparent;
-}
-
/*RESPONSIZE IMAGES*/
.viewAlbumImage{
@@ -86,6 +58,29 @@
/*RESPONSIVE IMAGES END*/
+/*BUTTON STYLING*/
+.button{
+ -fx-transition-duration: 0.4s;
+ -fx-background-color: none;
+ -fx-border-width: 2px;
+ -fx-border-color: #46b4fe;
+ -fx-text-fill: white;
+
+}
+
+.button:hover{
+ -fx-background-color: rgba(193, 198, 196, 0.5);
+ -fx-color: white;
+}
+/*BUTTON STYLING END*/
+
+
+/*GENERAL STYLING END*/
+
+.scrollHbox{
+ -fx-background-color: transparent;
+}
+
/*UPLOAD PAGE*/
.dropMenu{
@@ -95,4 +90,12 @@
-fx-border-radius: 3px;
-fx-background-color: rgba(255, 255, 255, 0.1);
-fx-background-radius: 3px;
-}
\ No newline at end of file
+}
+/*UPLOAD PAGE END*/
+
+/*EXPLORE PAGE*/
+
+.exploreGridPane{
+ -fx-fit-to-width: true;
+}
+/*EXPLORE PAGE END*/
\ No newline at end of file
--
GitLab