mirror of
https://github.com/michaelrausch/Party-Parrots-At-Sea.git
synced 2026-05-09 06:18:44 +00:00
Merge branch 'story1275_host_customization' into 1273_Skybox
# Conflicts: # src/main/java/seng302/visualiser/GameView3D.java # src/main/java/seng302/visualiser/controllers/LobbyController.java # src/main/java/seng302/visualiser/controllers/ViewManager.java # src/main/resources/views/LobbyView.fxml # src/main/resources/views/RaceView.fxml
This commit is contained in:
@@ -44,6 +44,11 @@
|
||||
-fx-border-color: -fx-decorator-color;
|
||||
-fx-border-width: 0 4 4 4;
|
||||
}
|
||||
|
||||
.jfx-decorator-button {
|
||||
-fx-focus-traversable: false; /* so decorator button will not be focused */
|
||||
}
|
||||
|
||||
/********* customised scroll bar for scroll pane ***********/
|
||||
|
||||
/* The main scrollbar **track** CSS class */
|
||||
@@ -99,4 +104,16 @@
|
||||
|
||||
.slider .track {
|
||||
-fx-background-color: -fx-pp-dark-text-color;
|
||||
}
|
||||
|
||||
.jfx-snackbar-content {
|
||||
-fx-background-color: -fx-pp-front-color;
|
||||
-fx-padding: 0 5 0 5;
|
||||
-fx-spacing: 0 5 0 5;
|
||||
-fx-font-size: 15;
|
||||
}
|
||||
|
||||
.jfx-snackbar-toast {
|
||||
-fx-text-fill: -fx-pp-theme-color;
|
||||
-fx-font-size: 15;
|
||||
}
|
||||
@@ -48,6 +48,7 @@ GridPane .timer * {
|
||||
-fx-text-fill: -fx-pp-theme-color;
|
||||
-fx-font-size: 13px;
|
||||
-fx-pref-height: 35px;
|
||||
-fx-focus-traversable: false;
|
||||
}
|
||||
|
||||
#chatSend:hover {
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
-fx-font-size: 20px;
|
||||
-fx-text-fill: -fx-pp-light-text-color;
|
||||
-fx-background-color: -fx-pp-theme-color;
|
||||
-fx-focus-traversable: false;
|
||||
}
|
||||
|
||||
.jfx-rippler {
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
#keyBindingDialogHeader {
|
||||
-fx-font-size: 27px;
|
||||
-fx-text-fill: -fx-pp-dark-text-color;
|
||||
}
|
||||
|
||||
#closeLabel {
|
||||
-fx-font-size: 30;
|
||||
-fx-text-fill: -fx-pp-dark-text-color;
|
||||
}
|
||||
|
||||
#closeLabel:hover {
|
||||
-fx-text-fill: -fx-pp-theme-color;
|
||||
-fx-font-size: 33;
|
||||
}
|
||||
|
||||
JFXButton {
|
||||
-fx-background-color: -fx-pp-light-text-color;
|
||||
-fx-text-fill: -fx-pp-theme-color;
|
||||
-fx-font-size: 13px;
|
||||
}
|
||||
|
||||
Label {
|
||||
-fx-font-size: 15px;
|
||||
-fx-text-fill: -fx-pp-theme-color;
|
||||
-fx-effect: -fx-pp-dropshadow-light;
|
||||
}
|
||||
|
||||
JFXToggleButton {
|
||||
-jfx-toggle-color: -fx-pp-theme-color;
|
||||
-fx-text-fill: -fx-pp-theme-color;
|
||||
}
|
||||
|
||||
#resetBtn {
|
||||
-fx-background-color: -fx-pp-theme-color;
|
||||
-fx-text-fill: -fx-pp-front-color;
|
||||
-fx-effect: -fx-pp-dropshadow-light;
|
||||
-fx-font-size: 18;
|
||||
}
|
||||
|
||||
#resetBtn:hover {
|
||||
-fx-font-size: 20;
|
||||
}
|
||||
|
||||
.jfx-snackbar-content {
|
||||
-fx-background-color: #323232;
|
||||
}
|
||||
|
||||
.jfx-snackbar-toast {
|
||||
-fx-text-fill: WHITE;
|
||||
}
|
||||
|
||||
.jfx-snackbar-action {
|
||||
-fx-text-fill: #ff4081;
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
/* a separate file to dynamically change snackbar's color */
|
||||
.jfx-snackbar-toast {
|
||||
-fx-text-fill: red !important;
|
||||
}
|
||||
Reference in New Issue
Block a user