Added check box color field to MainPage css, removed MaintenancePage'…

…s solo css file (Changes color of the list's scrollbar from blue to white), and removed the manual setStyle from LocationSearcher (#466)
Sprowe · May 7, 2021 · 2a09c35 · 2a09c35
1 parent ef244af
commit 2a09c35
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/src/main/java/edu/wpi/teamo/views/LocationSearcher.java b/src/main/java/edu/wpi/teamo/views/LocationSearcher.java
@@ -40,7 +40,6 @@ public JFXCheckBox makeCheckbox(NodeInfo node, boolean isSelected) {
         JFXCheckBox checkBox = new JFXCheckBox();
         checkBox.setPadding(new Insets(10));
         checkBox.setSelected(isSelected);
-        checkBox.setStyle("-jfx-checked-color: #5e81ac");
         checkBox.setText(text);
 
         checkBox.setOnAction(event -> {

diff --git a/src/main/resources/edu/wpi/teamo/fxml/CSS/MainPage.css b/src/main/resources/edu/wpi/teamo/fxml/CSS/MainPage.css
@@ -79,6 +79,10 @@
     -fx-padding: 8;
 }
 
+.jfx-check-box{
+    -jfx-checked-color: #5e81ac
+}
+
 
 .tree-table-view{
     -fx-font: 12px "Arial";

diff --git a/src/main/resources/edu/wpi/teamo/fxml/SR12_MaintenancePage.fxml b/src/main/resources/edu/wpi/teamo/fxml/SR12_MaintenancePage.fxml
@@ -4,7 +4,6 @@
 <?import com.jfoenix.controls.JFXComboBox?>
 <?import com.jfoenix.controls.JFXListView?>
 <?import com.jfoenix.controls.JFXTextField?>
-<?import java.net.URL?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.AnchorPane?>
@@ -18,7 +17,7 @@
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>
 
-<StackPane fx:id="stackPane" stylesheets="@CSS/MaintenancePage.css" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="edu.wpi.teamo.views.SR12_MaintenancePage">
+<StackPane fx:id="stackPane" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="edu.wpi.teamo.views.SR12_MaintenancePage">
     <children>
       <GridPane prefHeight="576.0" prefWidth="738.0">
         <columnConstraints>
@@ -32,7 +31,7 @@
           <RowConstraints maxHeight="143.0" minHeight="0.0" prefHeight="0.0" vgrow="SOMETIMES" />
         </rowConstraints>
          <children>
-              <BorderPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" prefHeight="576.0" prefWidth="544.0" styleClass="pane" GridPane.columnIndex="1" GridPane.rowIndex="1">
+              <BorderPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" prefHeight="576.0" prefWidth="544.0" styleClass="pane" stylesheets="@CSS/MainPage.css" GridPane.columnIndex="1" GridPane.rowIndex="1">
                   <center>
                       <VBox maxHeight="1.7976931348623157E308" minWidth="-Infinity" prefHeight="396.0" prefWidth="675.0" BorderPane.alignment="TOP_CENTER">
                           <children>
@@ -189,10 +188,6 @@
                           </BorderPane.margin>
                       </VBox>
                   </top>
-               <stylesheets>
-                  <URL value="@CSS/MainPage.css" />
-                  <URL value="@CSS/MaintenancePage.css" />
-               </stylesheets>
               </BorderPane>
          </children>
       </GridPane>