diff --git a/src/main/resources/NTNU/IDATT1002/view_picture.fxml b/src/main/resources/NTNU/IDATT1002/view_picture.fxml
index 2426c052f36d0e18691d0d70532b20507f49ee2c..9fb39593ca7a85c5b37af30f2472c804b6912e5f 100644
--- a/src/main/resources/NTNU/IDATT1002/view_picture.fxml
+++ b/src/main/resources/NTNU/IDATT1002/view_picture.fxml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
+<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.image.Image?>
@@ -12,30 +13,50 @@
<VBox prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.ViewPicture">
<children>
- <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
+ <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" styleClass="tbarbg" stylesheets="@style.css">
<children>
- <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" pickOnBounds="true" preserveRatio="true">
- <image>
- <Image url="@../../Images/PlaceholderLogo.png" />
- </image>
- </ImageView>
- <Pane prefHeight="100.0" prefWidth="343.0" />
- <TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
- <Button fx:id="tbar_searchBtn" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" />
- <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
- <Button fx:id="tbar_albums" mnemonicParsing="false" onAction="#switchToAlbums" text="ALBUMS" />
- <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
- <Pane prefHeight="100.0" prefWidth="174.0" />
- <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
+ <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0">
+ <children>
+ <HBox alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="250.0">
+ <children>
+ <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" pickOnBounds="true" preserveRatio="true">
+ <image>
+ <Image url="@../../Images/PlaceholderLogo.png" />
+ </image>
+ <HBox.margin>
+ <Insets />
+ </HBox.margin>
+ </ImageView>
+ </children>
+ <opaqueInsets>
+ <Insets />
+ </opaqueInsets>
+ </HBox>
+ <TextField fx:id="tbar_search" focusTraversable="false" minWidth="200.0" prefHeight="35.0" prefWidth="400.0" promptText="Search: Tags, Albums, Metadata, etc...">
+ <HBox.margin>
+ <Insets />
+ </HBox.margin>
+ </TextField>
+ <Button fx:id="tbar_searchBtn" minWidth="70" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" textFill="white" />
+ <Button fx:id="tbar_explore" minWidth="70" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" textFill="white" />
+ <Button fx:id="tbar_albums" minWidth="70" mnemonicParsing="false" onAction="#switchToAlbums" text="ALBUMS" textFill="white" />
+ <Button fx:id="tbar_map" minWidth="50" mnemonicParsing="false" onAction="#switchToMap" text="MAP" textFill="white" />
+ <HBox alignment="CENTER_RIGHT" prefHeight="100.0" prefWidth="250.0">
+ <children>
+ <Button fx:id="tbar_upload" minWidth="70" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" textFill="white" />
+ </children>
+ </HBox>
+ </children>
+ </HBox>
</children>
</HBox>
<HBox alignment="CENTER" VBox.vgrow="ALWAYS">
<children>
- <VBox alignment="CENTER" prefHeight="981.0" prefWidth="1066.0" style="-fx-background-color: #777777;">
+ <VBox alignment="CENTER" prefHeight="981.0" prefWidth="1066.0" styleClass="bodybg" stylesheets="@style.css">
<children>
- <VBox alignment="CENTER_LEFT" maxHeight="981.0" maxWidth="966.0" style="-fx-background-color: #777777;">
+ <VBox alignment="CENTER_LEFT" maxHeight="981.0" maxWidth="966.0">
<children>
- <Text fx:id="picture_title_field" strokeType="OUTSIDE" strokeWidth="0.0" text="Picturetitle" textAlignment="CENTER">
+ <Text fx:id="picture_title_field" fill="WHITE" strokeType="OUTSIDE" strokeWidth="0.0" text="Picturetitle" textAlignment="CENTER">
<font>
<Font name="System Bold Italic" size="36.0" />
</font>
@@ -45,17 +66,17 @@
<Image url="@../../Images/placeholder-1920x1080.png" />
</image>
</ImageView>
- <Text fx:id="picture_tagsField" strokeType="OUTSIDE" strokeWidth="0.0" text="#tags">
+ <Text fx:id="picture_tagsField" fill="WHITE" strokeType="OUTSIDE" strokeWidth="0.0" text="#tags">
<font>
<Font size="18.0" />
</font>
</Text>
- <Text strokeType="OUTSIDE" strokeWidth="0.0" text="DESCRIPTION:" wrappingWidth="164.24609375">
+ <Text fill="WHITE" strokeType="OUTSIDE" strokeWidth="0.0" text="DESCRIPTION:" wrappingWidth="164.24609375">
<font>
<Font name="System Bold" size="24.0" />
</font>
</Text>
- <Text fx:id="picture_descField" strokeType="OUTSIDE" strokeWidth="0.0" text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." wrappingWidth="700.0">
+ <Text fx:id="picture_descField" fill="WHITE" strokeType="OUTSIDE" strokeWidth="0.0" text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." wrappingWidth="700.0">
<font>
<Font size="14.0" />
</font>
@@ -64,15 +85,21 @@
</VBox>
</children>
</VBox>
- <VBox alignment="CENTER" prefHeight="981.0" prefWidth="791.0" spacing="20.0" style="-fx-background-color: #666666;" HBox.hgrow="ALWAYS">
+ <VBox alignment="CENTER" prefHeight="981.0" prefWidth="791.0" spacing="20.0" styleClass="viewbg" stylesheets="@style.css" HBox.hgrow="ALWAYS">
<children>
- <Text strokeType="OUTSIDE" strokeWidth="0.0" text="PICTURE METADATA:">
+ <Text fill="WHITE" strokeType="OUTSIDE" strokeWidth="0.0" text="PICTURE METADATA:">
<font>
<Font name="System Bold" size="24.0" />
</font>
</Text>
- <Pane fx:id="metadata_pane" prefHeight="740.0" prefWidth="779.0" style="-fx-background-color: #ffffff;" />
+ <Pane fx:id="metadata_pane" prefHeight="906.0" prefWidth="854.0" style="-fx-background-color: #ffffff;" VBox.vgrow="ALWAYS" />
</children>
+ <HBox.margin>
+ <Insets />
+ </HBox.margin>
+ <padding>
+ <Insets bottom="80.0" left="80.0" right="80.0" top="80.0" />
+ </padding>
</VBox>
</children>
</HBox>