Skip to content

Commit

Permalink
Merge pull request #125 from gustavohenriquefs/hotfix/css-paths
Browse files Browse the repository at this point in the history
corrigindo paths desatualizados apos merge de hotfix/menus
  • Loading branch information
Francisco-Paulino-Arruda-Filho authored Oct 31, 2023
2 parents 1cd410b + e8d39ed commit 0d17eb0
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.VBox?>

<DialogPane id="dialogOpcoes" prefHeight="235.0" prefWidth="614.0" stylesheets="@../../css/dialogOpcoesParticipanteStyle.css" xmlns="http://javafx.com/javafx/20.0.1" xmlns:fx="http://javafx.com/fxml/1">
<DialogPane id="dialogOpcoes" prefHeight="235.0" prefWidth="614.0" stylesheets="@../../css/dialog/dialogOpcoesParticipanteStyle.css" xmlns="http://javafx.com/javafx/20.0.1" xmlns:fx="http://javafx.com/fxml/1">
<content>
<AnchorPane prefHeight="200.0" prefWidth="200.0" />
</content>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>

<DialogPane id="dialogParticipantes" prefHeight="499.0" prefWidth="614.0" stylesheets="@../../css/dialogParticipanteStyle.css" xmlns="http://javafx.com/javafx/20.0.1" xmlns:fx="http://javafx.com/fxml/1">
<DialogPane id="dialogParticipantes" prefHeight="499.0" prefWidth="614.0" stylesheets="@../../css/dialog/dialogParticipanteStyle.css" xmlns="http://javafx.com/javafx/20.0.1" xmlns:fx="http://javafx.com/fxml/1">
<content>
<AnchorPane prefHeight="200.0" prefWidth="200.0">
<children>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import java.lang.*?>
<?import javafx.geometry.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.text.*?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.CheckBox?>
Expand All @@ -21,11 +16,11 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>

<VBox fx:id="root" id="pageCadastrarEvento" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.casaculturaqxd.sgec.controller.CadastrarEventoController">
<VBox id="pageCadastrarEvento" fx:id="root" xmlns="http://javafx.com/javafx/20.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.casaculturaqxd.sgec.controller.CadastrarEventoController">
<children>
<ScrollPane minHeight="-Infinity" minWidth="-Infinity" prefHeight="1122.0" prefWidth="1442.0" >
<ScrollPane minHeight="-Infinity" minWidth="-Infinity" prefHeight="1122.0" prefWidth="1442.0">
<content>
<AnchorPane id="container" prefHeight="800.0" prefWidth="1440.0" stylesheets="@../css/cadastrarEventoStyle.css" xmlns="http://javafx.com/javafx/20.0.1" xmlns:fx="http://javafx.com/fxml/1">
<AnchorPane id="container" prefHeight="800.0" prefWidth="1440.0" stylesheets="@../css/page/cadastrarEventoStyle.css" xmlns="http://javafx.com/javafx/20.0.1" xmlns:fx="http://javafx.com/fxml/1">
<children>
<Label layoutX="29.0" layoutY="45.0" prefHeight="35.0" prefWidth="124.0" text="Criar Evento" textFill="#352929" AnchorPane.leftAnchor="29.0">
<font>
Expand Down Expand Up @@ -198,5 +193,3 @@
</ScrollPane>
</children>
</VBox>


Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>

<VBox fx:id="root" id="pageCadastrarGrupoEvento" stylesheets="@../css/cadastrarGrupoEventoStyle.css" xmlns="http://javafx.com/javafx/20.0.1" xmlns:fx="http://javafx.com/fxml/1">
<VBox id="pageCadastrarGrupoEvento" fx:id="root" stylesheets="@../css/page/cadastrarGrupoEventoStyle.css" xmlns="http://javafx.com/javafx/20.0.1" xmlns:fx="http://javafx.com/fxml/1">
<ScrollPane id="container" fx:id="container" hbarPolicy="ALWAYS" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" prefHeight="1560.0" prefWidth="1560.0" vbarPolicy="ALWAYS">
<content>
<AnchorPane id="principal" fx:id="principal" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" prefHeight="1560.0" prefWidth="1560.0">
Expand Down Expand Up @@ -188,5 +188,3 @@
</content>
</ScrollPane>
</VBox>


Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>

<ScrollPane id="pageGrupoEventoExistente" fx:id="container" hbarPolicy="ALWAYS" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="2400.0" prefWidth="1560.0" stylesheets="@../css/grupoEventoExistenteStyle.css" vbarPolicy="ALWAYS" xmlns="http://javafx.com/javafx/20.0.1" xmlns:fx="http://javafx.com/fxml/1">
<ScrollPane id="pageGrupoEventoExistente" fx:id="container" hbarPolicy="ALWAYS" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="2400.0" prefWidth="1560.0" stylesheets="@../css/page/grupoEventoExistenteStyle.css" vbarPolicy="ALWAYS" xmlns="http://javafx.com/javafx/20.0.1" xmlns:fx="http://javafx.com/fxml/1">
<content>
<AnchorPane id="principal" fx:id="principal" prefHeight="2400.0" prefWidth="1560.0">
<children>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/com/casaculturaqxd/sgec/view/home.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>

<VBox id="pageHome" fx:id="root" prefHeight="576.0" prefWidth="780.0" stylesheets="@../css/HomeStyle.css" xmlns="http://javafx.com/javafx/20.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.casaculturaqxd.sgec.HomeController">
<VBox id="pageHome" fx:id="root" prefHeight="576.0" prefWidth="780.0" stylesheets="@../css/page/HomeStyle.css" xmlns="http://javafx.com/javafx/20.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.casaculturaqxd.sgec.HomeController">
<children>
<GridPane fx:id="gridMetas" prefHeight="227.0" prefWidth="780.0">
<columnConstraints>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/com/casaculturaqxd/sgec/view/login.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>

<VBox alignment="CENTER" id="pageLogin" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" stylesheets="@../css/LoginStyle.css" xmlns="http://javafx.com/javafx/20.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.casaculturaqxd.sgec.controller.LoginController">
<VBox id="pageLogin" alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" stylesheets="@../css/page/LoginStyle.css" xmlns="http://javafx.com/javafx/20.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.casaculturaqxd.sgec.controller.LoginController">
<children>
<Pane fx:id="form" layoutX="195.0" layoutY="109.0" maxWidth="200.0" prefHeight="210.0" prefWidth="219.0">
<children>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>

<VBox id="pagePesquisarEvento" fx:id="root" stylesheets="@../css/pesquisarEventoStyle.css" xmlns="http://javafx.com/javafx/20.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.casaculturaqxd.sgec.controller.PesquisarEventoController">
<VBox id="pagePesquisarEvento" fx:id="root" stylesheets="@../css/page/pesquisarEventoStyle.css" xmlns="http://javafx.com/javafx/20.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.casaculturaqxd.sgec.controller.PesquisarEventoController">
<children>
<AnchorPane id="container" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="800.0" style="-fx-background-color: #E9E3CA;" VBox.vgrow="ALWAYS">
<children>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<children>
<ScrollPane prefHeight="2079.0" prefWidth="1440.0">
<content>
<AnchorPane id="container" prefHeight="2066.0" prefWidth="1560.0" style="-fx-background-color: #E9E3CA;" stylesheets="@../css/visualizarEvento.css">
<AnchorPane id="container" prefHeight="2066.0" prefWidth="1560.0" style="-fx-background-color: #E9E3CA;">
<children>
<HBox alignment="CENTER" layoutX="153.0" layoutY="55.0" maxHeight="-Infinity" maxWidth="-Infinity" prefHeight="203.0" prefWidth="1155.0" style="-fx-background-color: FFFEF7;">
<children>
Expand Down

0 comments on commit 0d17eb0

Please sign in to comment.