sem/Greenify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EDIT::added style to logout button

Browse Source
This commit is contained in:
Sem van der Hoeven
2019-04-08 15:02:15 +02:00
parent 7043f7253d
commit 3cc01e4f4a
3 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Client/src/main/java/greenify/client/controller/DashBoardController.java
View File

@@ -317,7 +317,7 @@ public class DashBoardController {
* Sorts the scores of users.
* @param users the list of users
*/
public void sortScores(List<String> users) throws InterruptedException {
private void sortScores(List<String> users) {
for (int i = 0; i < users.size(); i++) {
for (int j = 0; j < users.size(); j++) {
Double first = userService.getFootprint(users.get(i));
@@ -340,7 +340,7 @@ public class DashBoardController {
* Sorts the scores of users.
* @param users the list of users
*/
public List<String> sortDiffScores(List<String> users) throws InterruptedException {
private List<String> sortDiffScores(List<String> users) throws InterruptedException {
for (int i = 0; i < users.size(); i++) {
for (int j = 0; j < users.size(); j++) {
Double firstDiff = userService.getFirstFootprint(users.get(i)) - userService
@@ -366,7 +366,7 @@ public class DashBoardController {
* Adds a fade transition for switching between the different panes.
* @param node the node on which the transition needs to act
*/
public void addFadeTransition(Node node) {
private void addFadeTransition(Node node) {
fadeTrans = new FadeTransition(Duration.millis(400), node);
fadeTrans.setFromValue(0);
fadeTrans.setToValue(1.0);

11
src/Client/src/main/resources/fxml/dashboard.fxml
View File

@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import java.lang.*?>
<?import javafx.scene.chart.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.image.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.shape.*?>
<?import javafx.scene.text.*?>
<?import javafx.scene.chart.PieChart?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?>
@@ -18,7 +25,7 @@
<?import javafx.scene.text.Text?>
<?import javafx.scene.control.Tooltip?>
<AnchorPane prefHeight="702.0" prefWidth="1032.0" xmlns="http://javafx.com/javafx/10.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="greenify.client.controller.DashBoardController">
<AnchorPane prefHeight="702.0" prefWidth="1032.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="greenify.client.controller.DashBoardController">
<children>
<AnchorPane fx:id="menuBar" prefHeight="703.0" prefWidth="216.0" style="-fx-background-color: #5a635c;">
<children>
@@ -47,7 +54,7 @@
<Font size="21.0" />
</font>
</Button>
<Button fx:id="logOutButton" layoutY="270.0" mnemonicParsing="false" onAction="#logOut" prefHeight="45.0" prefWidth="216.0" text="log out ">
<Button fx:id="logOutButton" layoutX="33.0" layoutY="638.0" mnemonicParsing="false" onAction="#logOut" prefHeight="45.0" prefWidth="149.0" text="log out ">
<font>
<Font size="21.0" />
</font>

11
src/Client/src/main/resources/stylesheets/dashboardStyle.css
View File

@@ -53,6 +53,17 @@
-fx-border-color: #497251;
}
#logOutButton {
-fx-background-color: #5a635c;
-fx-text-fill: #e3efe4;
}
#logOutButton:hover {
-fx-background-color: #e08f8f;
}
#logOutButton:pressed {
-fx-background-color: #ba3737;
}
/*friends table*/
.table-view .column-header {
/*-fx-background-color: linear-gradient(#4b7a3d, #588c58);*/