updated shared css styles

tschie · tschie · commit 12fdc8be9c1a · 2016-11-11T16:50:08.000-08:00
diff --git a/src/main/java/com/esri/samples/displayinformation/update_graphics/UpdateGraphicsSample.java b/src/main/java/com/esri/samples/displayinformation/update_graphics/UpdateGraphicsSample.java
@@ -68,7 +68,7 @@ public void start(Stage stage) throws Exception {
       // create stack pane and application scene
       StackPane stackPane = new StackPane();
       Scene scene = new Scene(stackPane);
-      scene.getStylesheets().add(getClass().getResource("/css/SamplesTheme.css").toExternalForm());
+      scene.getStylesheets().add(getClass().getResource("/css/style.css").toExternalForm());
 
       // set title, size, and add scene to stage
       stage.setTitle("Update Graphics Sample");
diff --git a/src/main/java/com/esri/samples/editing/edit_feature_attachments/EditFeatureAttachmentsSample.java b/src/main/java/com/esri/samples/editing/edit_feature_attachments/EditFeatureAttachmentsSample.java
@@ -73,7 +73,7 @@ public void start(Stage stage) throws Exception {
       // create stack pane and application scene
       StackPane stackPane = new StackPane();
       Scene scene = new Scene(stackPane);
-      scene.getStylesheets().add(getClass().getResource("/css/SamplesTheme.css").toExternalForm());
+      scene.getStylesheets().add(getClass().getResource("/css/style.css").toExternalForm());
 
       // set title, size, and add scene to stage
       stage.setTitle("Edit Feature Attachments Sample");
diff --git a/src/main/java/com/esri/samples/editing/update_attributes/UpdateAttributesSample.java b/src/main/java/com/esri/samples/editing/update_attributes/UpdateAttributesSample.java
@@ -66,7 +66,7 @@ public void start(Stage stage) throws Exception {
       // create stack pane and application scene
       StackPane stackPane = new StackPane();
       Scene scene = new Scene(stackPane);
-      scene.getStylesheets().add(getClass().getResource("/css/SamplesTheme.css").toExternalForm());
+      scene.getStylesheets().add(getClass().getResource("/css/style.css").toExternalForm());
 
       // size the stage, add a title, and set scene to stage
       stage.setTitle("Update Attributes Sample");
diff --git a/src/main/java/com/esri/samples/featurelayers/change_feature_layer_renderer/ChangeFeatureLayerRendererSample.java b/src/main/java/com/esri/samples/featurelayers/change_feature_layer_renderer/ChangeFeatureLayerRendererSample.java
@@ -54,7 +54,7 @@ public void start(Stage stage) throws Exception {
       // create stack pane and application scene
       StackPane stackPane = new StackPane();
       Scene scene = new Scene(stackPane);
-      scene.getStylesheets().add(getClass().getResource("/css/SamplesTheme.css").toExternalForm());
+      scene.getStylesheets().add(getClass().getResource("/css/style.css").toExternalForm());
 
       // set title, size, and add scene to stage
       stage.setTitle("Change Feature Layer Renderer Sample");
diff --git a/src/main/java/com/esri/samples/featurelayers/feature_layer_definition_expression/FeatureLayerDefinitionExpressionSample.java b/src/main/java/com/esri/samples/featurelayers/feature_layer_definition_expression/FeatureLayerDefinitionExpressionSample.java
@@ -49,7 +49,7 @@ public void start(Stage stage) throws Exception {
       // create stack pane and application scene
       StackPane stackPane = new StackPane();
       Scene scene = new Scene(stackPane);
-      scene.getStylesheets().add(getClass().getResource("/css/SamplesTheme.css").toExternalForm());
+      scene.getStylesheets().add(getClass().getResource("/css/style.css").toExternalForm());
 
       // set title, size, and add scene to stage
       stage.setTitle("Feature Layer Definition Expression Sample");
diff --git a/src/main/java/com/esri/samples/featurelayers/feature_layer_query/FeatureLayerQuerySample.java b/src/main/java/com/esri/samples/featurelayers/feature_layer_query/FeatureLayerQuerySample.java
@@ -68,7 +68,7 @@ public void start(Stage stage) throws Exception {
       // create stack pane and application scene
       StackPane stackPane = new StackPane();
       Scene scene = new Scene(stackPane);
-      scene.getStylesheets().add(getClass().getResource("/css/SamplesTheme.css").toExternalForm());
+      scene.getStylesheets().add(getClass().getResource("/css/style.css").toExternalForm());
 
       // set title, size, and add scene to stage
       stage.setTitle("Feature Layer Query Sample");
diff --git a/src/main/java/com/esri/samples/featurelayers/feature_layer_selection/FeatureLayerSelectionSample.java b/src/main/java/com/esri/samples/featurelayers/feature_layer_selection/FeatureLayerSelectionSample.java
@@ -109,9 +109,6 @@ public void start(Stage stage) throws Exception {
               // select features
               featureLayer.selectFeatures(features);
 
-              // select all of the identified features
-              System.out.println("Features selected: " + features.size());
-
             } catch (Exception e) {
               e.printStackTrace();
             }
diff --git a/src/main/java/com/esri/samples/featurelayers/service_feature_table_manual_cache/ServiceFeatureTableManualCacheSample.java b/src/main/java/com/esri/samples/featurelayers/service_feature_table_manual_cache/ServiceFeatureTableManualCacheSample.java
@@ -60,7 +60,7 @@ public void start(Stage stage) throws Exception {
       // create stack pane and application scene
       StackPane stackPane = new StackPane();
       Scene scene = new Scene(stackPane);
-      scene.getStylesheets().add(getClass().getResource("/css/SamplesTheme.css").toExternalForm());
+      scene.getStylesheets().add(getClass().getResource("/css/style.css").toExternalForm());
 
       // set title, size, and add scene to stage
       stage.setTitle("Service Feature Table Manual Cache Sample");
diff --git a/src/main/java/com/esri/samples/geometry/geometry_engine_simplify/GeometryEngineSimplifySample.java b/src/main/java/com/esri/samples/geometry/geometry_engine_simplify/GeometryEngineSimplifySample.java
@@ -51,7 +51,7 @@ public void start(Stage stage) throws Exception {
       // create stack pane and application scene
       StackPane stackPane = new StackPane();
       Scene scene = new Scene(stackPane);
-      scene.getStylesheets().add(getClass().getResource("/css/SamplesTheme.css").toExternalForm());
+      scene.getStylesheets().add(getClass().getResource("/css/style.css").toExternalForm());
 
       // set title, size, and add scene to stage
       stage.setTitle("Geometry Engine Simplify Sample");
diff --git a/src/main/java/com/esri/samples/geometry/spatial_operations/SpatialOperationsSample.java b/src/main/java/com/esri/samples/geometry/spatial_operations/SpatialOperationsSample.java
@@ -60,7 +60,7 @@ public void start(Stage stage) throws Exception {
       // create stack pane and application scene
       StackPane stackPane = new StackPane();
       Scene scene = new Scene(stackPane);
-      scene.getStylesheets().add(getClass().getResource("/css/SamplesTheme.css").toExternalForm());
+      scene.getStylesheets().add(getClass().getResource("/css/style.css").toExternalForm());
 
       // set title, size, and add scene to stage
       stage.setTitle("Spatial Operations Sample");
diff --git a/src/main/java/com/esri/samples/map/access_load_status/AccessLoadStatusSample.java b/src/main/java/com/esri/samples/map/access_load_status/AccessLoadStatusSample.java
@@ -44,7 +44,7 @@ public void start(Stage stage) throws Exception {
       // create stack pane and application scene
       StackPane stackPane = new StackPane();
       Scene scene = new Scene(stackPane);
-      scene.getStylesheets().add(getClass().getResource("/css/SamplesTheme.css").toExternalForm());
+      scene.getStylesheets().add(getClass().getResource("/css/style.css").toExternalForm());
 
       // set title, size, and add scene to stage
       stage.setTitle("Access Load Status Sample");
diff --git a/src/main/java/com/esri/samples/map/change_basemap/ChangeBasemapSample.java b/src/main/java/com/esri/samples/map/change_basemap/ChangeBasemapSample.java
@@ -71,7 +71,7 @@ public void start(Stage stage) throws Exception {
 
         Button button = new Button();
         button.setTooltip(new Tooltip(basemapString));
-        button.setGraphic(new ImageView(new Image(getClass().getResourceAsStream("/change_basemap/" + basemapString
+        button.setGraphic(new ImageView(new Image(getClass().getResourceAsStream("/basemap_thumbnails/" + basemapString
             .toLowerCase() + ".png"))));
 
         // listener to switch ArcGISMap types when button clicked
diff --git a/src/main/java/com/esri/samples/map/manage_bookmarks/ManageBookmarksSample.java b/src/main/java/com/esri/samples/map/manage_bookmarks/ManageBookmarksSample.java
@@ -44,7 +44,7 @@ public void start(Stage stage) throws Exception {
       // create stack pane and application scene
       StackPane stackPane = new StackPane();
       Scene scene = new Scene(stackPane);
-      scene.getStylesheets().add(getClass().getResource("/css/SamplesTheme.css").toExternalForm());
+      scene.getStylesheets().add(getClass().getResource("/css/style.css").toExternalForm());
 
       // set title, size, and add scene to stage
       stage.setTitle("Manage Bookmarks Sample");
diff --git a/src/main/java/com/esri/samples/map/manage_operational_layers/ManageOperationalLayersSample.java b/src/main/java/com/esri/samples/map/manage_operational_layers/ManageOperationalLayersSample.java
@@ -55,7 +55,7 @@ public void start(Stage stage) throws Exception {
       // create stack pane and application scene
       StackPane stackPane = new StackPane();
       Scene scene = new Scene(stackPane);
-      scene.getStylesheets().add(getClass().getResource("/css/SamplesTheme.css").toExternalForm());
+      scene.getStylesheets().add(getClass().getResource("/css/style.css").toExternalForm());
 
       // set title, size, and add scene to stage
       stage.setTitle("Manage Operational Layers Sample");
diff --git a/src/main/java/com/esri/samples/mapview/change_viewpoint/ChangeViewpointSample.java b/src/main/java/com/esri/samples/mapview/change_viewpoint/ChangeViewpointSample.java
@@ -45,7 +45,7 @@ public void start(Stage stage) throws Exception {
       // create stack pane and application scene
       StackPane stackPane = new StackPane();
       Scene scene = new Scene(stackPane);
-      scene.getStylesheets().add(getClass().getResource("/css/SamplesTheme.css").toExternalForm());
+      scene.getStylesheets().add(getClass().getResource("/css/style.css").toExternalForm());
 
       // set title, size, and add scene to stage
       stage.setTitle("Change Viewpoint Sample");
diff --git a/src/main/java/com/esri/samples/mapview/display_layer_view_state_status/DisplayLayerViewStateStatusSample.java b/src/main/java/com/esri/samples/mapview/display_layer_view_state_status/DisplayLayerViewStateStatusSample.java
@@ -62,7 +62,7 @@ public void start(Stage stage) throws Exception {
       // create stack pane and application scene
       StackPane stackPane = new StackPane();
       Scene scene = new Scene(stackPane);
-      scene.getStylesheets().add(getClass().getResource("/css/SamplesTheme.css").toExternalForm());
+      scene.getStylesheets().add(getClass().getResource("/css/style.css").toExternalForm());
 
       // set title, size, and add scene to stage
       stage.setTitle("Display Layer View State Status Sample");
diff --git a/src/main/java/com/esri/samples/na/find_route/FindRouteSample.java b/src/main/java/com/esri/samples/na/find_route/FindRouteSample.java
@@ -71,7 +71,7 @@ public void start(Stage stage) throws Exception {
       // create stack pane and application scene
       StackPane stackPane = new StackPane();
       Scene scene = new Scene(stackPane);
-      scene.getStylesheets().add(getClass().getResource("/css/SamplesTheme.css").toExternalForm());
+      scene.getStylesheets().add(getClass().getResource("/css/style.css").toExternalForm());
 
       // set title, size, and add scene to stage
       stage.setTitle("Find Route Sample");
diff --git a/src/main/java/com/esri/samples/search/find_place/FindPlaceSample.java b/src/main/java/com/esri/samples/search/find_place/FindPlaceSample.java
@@ -70,7 +70,7 @@ public void start(Stage stage) throws Exception {
       // create stack pane and application scene
       StackPane stackPane = new StackPane();
       Scene scene = new Scene(stackPane);
-      scene.getStylesheets().add(getClass().getResource("/css/SamplesTheme.css").toExternalForm());
+      scene.getStylesheets().add(getClass().getResource("/css/style.css").toExternalForm());
 
       // set title, size, and add scene to stage
       stage.setTitle("Find Place Sample");
diff --git a/src/main/java/com/esri/samples/symbology/simple_fill_symbol/SimpleFillSymbolSample.java b/src/main/java/com/esri/samples/symbology/simple_fill_symbol/SimpleFillSymbolSample.java
@@ -57,7 +57,7 @@ public void start(Stage stage) throws Exception {
       // create stack pane and application scene
       StackPane stackPane = new StackPane();
       Scene scene = new Scene(stackPane);
-      scene.getStylesheets().add(getClass().getResource("/css/SamplesTheme.css").toExternalForm());
+      scene.getStylesheets().add(getClass().getResource("/css/style.css").toExternalForm());
 
       // set title, size, and add scene to stage
       stage.setTitle("Simple Fill Symbol Sample");
diff --git a/src/main/java/com/esri/samples/symbology/simple_line_symbol/SimpleLineSymbolSample.java b/src/main/java/com/esri/samples/symbology/simple_line_symbol/SimpleLineSymbolSample.java
@@ -51,7 +51,7 @@ public void start(Stage stage) throws Exception {
       // create stack pane and application scene
       StackPane stackPane = new StackPane();
       Scene scene = new Scene(stackPane);
-      scene.getStylesheets().add(getClass().getResource("/css/SamplesTheme.css").toExternalForm());
+      scene.getStylesheets().add(getClass().getResource("/css/style.css").toExternalForm());
 
       // set title, size, and add scene to stage
       stage.setTitle("Simple Line Symbol Sample");
diff --git a/src/main/resources/css/style.css b/src/main/resources/css/style.css
@@ -3,7 +3,14 @@
   -fx-padding: 10.0 10.0 10.0 10.0;
 }
 
-.panel-label {
+.panel-region .label {
   -fx-text-fill: white;
-  -fx-font-weight: bold;
+}
+
+.label {
+  -fx-text-fill: black;
+}
+
+.slider .axis {
+    -fx-tick-label-fill: white;
 }
diff --git a/src/main/resources/fxml/animate_3d_symbols.fxml b/src/main/resources/fxml/animate_3d_symbols.fxml
@@ -13,21 +13,6 @@
 <?import com.esri.samples.scene.animate_3d_symbols.PlaneModel?>
 
 <?import javafx.animation.Timeline?>
-<!--
-  ~ Copyright 2016 Esri.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License"); you may not
-  ~ use this file except in compliance with the License. You may obtain a copy of
-  ~ the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-  ~ License for the specific language governing permissions and limitations under
-  ~ the License.
-  -->
 
 <StackPane fx:controller="com.esri.samples.scene.animate_3d_symbols.Animate3dSymbolsController"
            xmlns:fx="http://javafx.com/fxml" stylesheets="/csv/style.css">
diff --git a/src/main/resources/fxml/calculate_distance_3d.fxml b/src/main/resources/fxml/calculate_distance_3d.fxml
@@ -1,22 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.text.Text ?>
-
-<?import com.esri.arcgisruntime.mapping.view.MapView?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.StackPane?>
 <?import com.esri.arcgisruntime.mapping.view.SceneView?>
-
 <StackPane fx:controller="com.esri.samples.scene.calculate_distance_3d.CalculateDistance3dController"
-           xmlns:fx="http://javafx.com/fxml" stylesheets="/calculate_distance_3d/CalculateDistance3d.css">
+           xmlns:fx="http://javafx.com/fxml" stylesheets="/css/style.css">
     <!--SDK SceneView-->
     <SceneView fx:id="sceneView"/>
     <!--Position Parameters Pane-->
-    <HBox StackPane.alignment="TOP_CENTER" maxWidth="200" maxHeight="50" spacing="5" styleClass="pane">
-        <Label text="Distance: "  />
-        <Label fx:id="txtDistance" text="" />
+    <HBox StackPane.alignment="TOP_CENTER" maxWidth="200" maxHeight="50" spacing="5" styleClass="panel-region">
+        <Label text="Distance: "   style="-fx-font-size: 1.4em"/>
+        <Label fx:id="txtDistance" style="-fx-font-size: 1.4em"/>
     </HBox>
 </StackPane>
diff --git a/src/main/resources/fxml/local_server_geoprocessing.fxml b/src/main/resources/fxml/local_server_geoprocessing.fxml
@@ -10,8 +10,8 @@
 
 <?import com.esri.arcgisruntime.mapping.view.MapView?>
 
-<StackPane fx:controller="com.esri.samples.localserver.local_server_geoprocessing.LocalServerGeoprocessingController"                                   
-           xmlns:fx="http://javafx.com/fxml" stylesheets="/SamplesTheme.css">
+<StackPane fx:controller="com.esri.samples.localserver.local_server_geoprocessing.LocalServerGeoprocessingController"
+           xmlns:fx="http://javafx.com/fxml" stylesheets="/css/style.css">
            
    <!--SDK MapView-->
   <MapView fx:id="mapView"/>
diff --git a/src/main/resources/fxml/scene_properties_expressions.fxml b/src/main/resources/fxml/scene_properties_expressions.fxml
@@ -6,11 +6,11 @@
 <?import com.esri.arcgisruntime.mapping.view.SceneView?>
 
 <StackPane fx:controller="com.esri.samples.scene.scene_properties_expressions.ScenePropertiesExpressionsController" xmlns:fx="http://javafx.com/fxml"
-           stylesheets="/scene_properties_expressions/style.css">
+           stylesheets="/css/style.css">
     <!--SDK SceneView-->
     <SceneView fx:id="sceneView"/>
     <!--Slider box-->
-    <VBox StackPane.alignment="TOP_LEFT" maxWidth="200" maxHeight="50" spacing="5" styleClass="pane">
+    <VBox StackPane.alignment="TOP_LEFT" maxWidth="200" maxHeight="50" spacing="5" styleClass="panel-region">
         <Label text="heading"/>
         <Slider fx:id="headingSlider" max="360" majorTickUnit="90" showTickLabels="true"/>
         <Label text="pitch"/>
diff --git a/src/main/resources/fxml/symbol_dictionary.fxml b/src/main/resources/fxml/symbol_dictionary.fxml
@@ -11,7 +11,7 @@
 
 <?import javafx.scene.control.ListView?>
 <VBox fx:controller="com.esri.samples.symbology.symbol_dictionary.SymbolDictionaryController"
-      xmlns:fx="http://javafx.com/fxml" stylesheets="/symbol_dictionary/style.css">
+      xmlns:fx="http://javafx.com/fxml" stylesheets="/css/style.css">
     <!-- Top Pane for Search Result -->
     <GridPane hgap="10" vgap="10"  prefHeight="200">
         <padding><Insets top="25" bottom="25" left="25"/></padding>

Original file line number	Diff line number	Diff line change
`@@ -109,9 +109,6 @@ public void start(Stage stage) throws Exception {`
`109`	`109`	`// select features`
`110`	`110`	`featureLayer.selectFeatures(features);`
`111`	`111`
`112`		`- // select all of the identified features`
`113`		`- System.out.println("Features selected: " + features.size());`
`114`		`-`
`115`	`112`	`} catch (Exception e) {`
`116`	`113`	`e.printStackTrace();`
`117`	`114`	`}`