update bar type and retain fonts

gleidsonmt · Jan 24, 2020 · 0c406a0 · 0c406a0
1 parent ca7b0d1
commit 0c406a0
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 23 deletions.
diff --git a/src/com/gn/decorator/GNDecorator.java b/src/com/gn/decorator/GNDecorator.java
@@ -655,7 +655,7 @@ public void floatActions(){
      */
     public void floatActions(Region bar2){
         AnchorPane.setTopAnchor(areaContent, 0D);
-        bar.toFront();
+//        bar.toFront();
         bar_content.getChildren().removeAll(title_content, menu);
         AnchorPane.clearConstraints(bar);
         AnchorPane.setTopAnchor(bar, 0D);
@@ -1391,52 +1391,38 @@ public void initTheme(Theme theme){
                 break;
             case DANGER:
                 this.background.getStylesheets().clear();
-                // add css
-                this.background.getScene().getStylesheets().add(getClass().getResource("/com/gn/resources/css/theme/roboto.css").toExternalForm());
                 // add theme
                 this.background.getStylesheets().add(getClass().getResource("/com/gn/resources/css/theme/danger.css").toExternalForm());
                 break;
             case INFO :
                 this.background.getStylesheets().clear();
-                // add css
-                this.background.getScene().getStylesheets().add(getClass().getResource("/com/gn/resources/css/theme/roboto.css").toExternalForm());
                 // add theme
                 this.background.getStylesheets().add(getClass().getResource("/com/gn/resources/css/theme/info.css").toExternalForm());
             break;
             case PRIMARY:
                 this.background.getStylesheets().clear();
                 // add css
-                this.background.getScene().getStylesheets().add(getClass().getResource("/com/gn/resources/css/theme/roboto.css").toExternalForm());
-                // add theme
                 this.background.getStylesheets().add(getClass().getResource("/com/gn/resources/css/theme/primary.css").toExternalForm());
             break;
             case SECONDARY:
                 this.background.getStylesheets().clear();
                 // add css
-                this.background.getScene().getStylesheets().add(getClass().getResource("/com/gn/resources/css/theme/roboto.css").toExternalForm());
-                // add theme
                 this.background.getStylesheets().add(getClass().getResource("/com/gn/resources/css/theme/secondary.css").toExternalForm());
             break;
             case SUCCESS:
                 this.background.getStylesheets().clear();
                 // add css
-                this.scene.getStylesheets().add(getClass().getResource("/com/gn/resources/css/theme/roboto.css").toExternalForm());
-                // add theme
                 this.background.getStylesheets().add(getClass().getResource("/com/gn/resources/css/theme/success.css").toExternalForm());
                 break;
             case WARNING:
                 this.background.getStylesheets().clear();
                 // add css
-                this.background.getScene().getStylesheets().add(getClass().getResource("/com/gn/resources/css/theme/roboto.css").toExternalForm());
-                // add theme
                 this.background.getStylesheets().add(getClass().getResource("/com/gn/resources/css/theme/warning.css").toExternalForm());
                 break;
             case CUSTOM:
                 this.background.getStylesheets().clear();
                 // add css
-                this.background.getScene().getStylesheets().add(getClass().getResource("/com/gn/resources/css/theme/roboto.css").toExternalForm());
-                // add theme
-//                this.background.getStylesheets().add(getClass().getResource("/css/theme/custom.css").toExternalForm());
+                this.background.getStylesheets().add(getClass().getResource("/css/theme/custom.css").toExternalForm());
                 break;
         }
     }

diff --git a/src/com/gn/resources/css/theme/danger.css b/src/com/gn/resources/css/theme/danger.css
@@ -19,7 +19,6 @@
     -gn-fill : white;
     -fx-text-fill : white;
     -fx-fill : white;
-    -fx-font-family: 'Roboto Medium';
 }
 
 .gn-buttons *:hover

diff --git a/src/com/gn/resources/css/theme/info.css b/src/com/gn/resources/css/theme/info.css
@@ -21,8 +21,7 @@
     -gn-fill : white;
     -fx-text-fill : white;
     -fx-fill : white;
-    -fx-font-family: 'Roboto Medium';
-
+
 }
 
 .gn-buttons .button:hover

diff --git a/src/com/gn/resources/css/theme/primary.css b/src/com/gn/resources/css/theme/primary.css
@@ -19,7 +19,6 @@
     -gn-fill : white;
     -fx-text-fill : white;
     -fx-fill : white;
-    -fx-font-family: 'Roboto Medium';
 }
 
 .gn-buttons *:hover

diff --git a/src/com/gn/resources/css/theme/secondary.css b/src/com/gn/resources/css/theme/secondary.css
@@ -18,7 +18,6 @@
     -gn-fill : white;
     -fx-text-fill : white;
     -fx-fill : white;
-    -fx-font-family: 'Roboto Medium';
 }
 
 .gn-buttons *:hover

diff --git a/src/com/gn/resources/css/theme/success.css b/src/com/gn/resources/css/theme/success.css
@@ -18,7 +18,6 @@
     -gn-fill : white;
     -fx-text-fill : white;
     -fx-fill : white;
-    -fx-font-family: 'Roboto Medium';
 }
 
 .gn-buttons *:hover

diff --git a/src/com/gn/resources/css/theme/warning.css b/src/com/gn/resources/css/theme/warning.css
@@ -18,7 +18,6 @@
     -gn-fill : white;
     -fx-text-fill : white;
     -fx-fill : white;
-    -fx-font-family: 'Roboto Medium';
 }
 
 .gn-buttons *:hover