Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Madsmal/iCook
Browse files Browse the repository at this point in the history
  • Loading branch information
shqtech committed Jun 14, 2018
2 parents a6f1f47 + 0640e30 commit 642313d
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/application/AddRecipeView.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
<Separator layoutX="220.0" layoutY="2.0" orientation="VERTICAL" prefHeight="480.0" prefWidth="6.0" />
<Button layoutX="652.0" layoutY="286.0" mnemonicParsing="false" onAction="#saveToXMLFile" prefHeight="52.0" prefWidth="145.0" stylesheets="@Stylesheets/home.css" text="Save" />
<Button layoutX="652.0" layoutY="356.0" mnemonicParsing="false" onAction="#onBackToEditor" prefHeight="52.0" prefWidth="145.0" stylesheets="@Stylesheets/home.css" text="Back to editor" />
<ScrollPane layoutX="226.0" layoutY="45.0" prefHeight="436.0" prefWidth="206.0">
<ScrollPane hbarPolicy="NEVER" layoutX="226.0" layoutY="45.0" prefHeight="436.0" prefWidth="206.0">
<content>
<VBox fx:id="ingBox" prefHeight="463.0" prefWidth="204.0" />
<VBox fx:id="ingBox" prefHeight="418.0" prefWidth="204.0" />
</content>
</ScrollPane>
<Label layoutX="275.0" layoutY="21.0" text="Add your ingredients:">
Expand All @@ -43,9 +43,9 @@
</Label>
<Button layoutX="652.0" layoutY="421.0" mnemonicParsing="false" onAction="#onExit" prefHeight="52.0" prefWidth="145.0" stylesheets="@Stylesheets/home.css" text="Back to menu" />
<Button layoutX="652.0" layoutY="30.0" mnemonicParsing="false" onAction="#addIngredientToUI" prefHeight="52.0" prefWidth="145.0" stylesheets="@Stylesheets/home.css" text="Add Ingredients" />
<ScrollPane layoutX="438.0" layoutY="44.0" prefHeight="436.0" prefWidth="206.0">
<ScrollPane hbarPolicy="NEVER" layoutX="438.0" layoutY="44.0" prefHeight="436.0" prefWidth="206.0">
<content>
<VBox fx:id="taskBox" prefHeight="362.0" prefWidth="205.0" />
<VBox fx:id="taskBox" prefHeight="410.0" prefWidth="205.0" />
</content>
</ScrollPane>
<Separator layoutX="433.0" orientation="VERTICAL" prefHeight="493.0" prefWidth="6.0" />
Expand Down

0 comments on commit 642313d

Please sign in to comment.