changeset 5631:3d78391f8a73

RT-33590 Simplify Ensemble8 styling. pushing changes for Jasper
author dmasada
date Mon, 04 Nov 2013 21:13:50 -0800
parents a62e639df566
children bbed405cc8bd
files apps/samples/Ensemble8/nbproject/build-impl.xml apps/samples/Ensemble8/nbproject/genfiles.properties apps/samples/Ensemble8/nbproject/project.properties apps/samples/Ensemble8/src/app/java/ensemble/SamplePopoverTreeList.java apps/samples/Ensemble8/src/app/java/ensemble/control/Popover.java apps/samples/Ensemble8/src/app/java/ensemble/samplepage/Description.java apps/samples/Ensemble8/src/app/resources/ensemble/EnsembleStylesCommon.css apps/samples/Ensemble8/src/app/resources/ensemble/images/orange-arrrow.png apps/samples/Ensemble8/src/app/resources/ensemble/images/orange-arrrow@2x.png
diffstat 9 files changed, 109 insertions(+), 101 deletions(-) [+]
line wrap: on
line diff
--- a/apps/samples/Ensemble8/nbproject/build-impl.xml	Mon Nov 04 18:19:10 2013 -0800
+++ b/apps/samples/Ensemble8/nbproject/build-impl.xml	Mon Nov 04 21:13:50 2013 -0800
@@ -108,10 +108,11 @@
                 </not>
             </and>
         </condition>
-        <condition property="manifest.available+main.class">
+        <condition property="profile.available">
             <and>
-                <isset property="manifest.available"/>
-                <isset property="main.class.available"/>
+                <isset property="javac.profile"/>
+                <length length="0" string="${javac.profile}" when="greater"/>
+                <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
             </and>
         </condition>
         <condition property="do.archive">
@@ -128,12 +129,6 @@
                 </not>
             </and>
         </condition>
-        <condition property="manifest.available+main.class+mkdist.available">
-            <and>
-                <istrue value="${manifest.available+main.class}"/>
-                <isset property="do.mkdist"/>
-            </and>
-        </condition>
         <condition property="do.archive+manifest.available">
             <and>
                 <isset property="manifest.available"/>
@@ -152,24 +147,12 @@
                 <istrue value="${do.archive}"/>
             </and>
         </condition>
-        <condition property="do.archive+manifest.available+main.class">
+        <condition property="do.archive+profile.available">
             <and>
-                <istrue value="${manifest.available+main.class}"/>
+                <isset property="profile.available"/>
                 <istrue value="${do.archive}"/>
             </and>
         </condition>
-        <condition property="manifest.available-mkdist.available">
-            <or>
-                <istrue value="${manifest.available}"/>
-                <isset property="do.mkdist"/>
-            </or>
-        </condition>
-        <condition property="manifest.available+main.class-mkdist.available">
-            <or>
-                <istrue value="${manifest.available+main.class}"/>
-                <isset property="do.mkdist"/>
-            </or>
-        </condition>
         <condition property="have.tests">
             <or/>
         </condition>
@@ -227,7 +210,15 @@
         </condition>
         <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
         <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
-            <length length="0" string="${endorsed.classpath}" when="greater"/>
+            <and>
+                <isset property="endorsed.classpath"/>
+                <not>
+                    <equals arg1="${endorsed.classpath}" arg2="" trim="true"/>
+                </not>
+            </and>
+        </condition>
+        <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
+            <isset property="profile.available"/>
         </condition>
         <property name="jar.index" value="false"/>
         <property name="jar.index.metainf" value="${jar.index}"/>
@@ -312,6 +303,7 @@
                         <path path="@{classpath}"/>
                     </classpath>
                     <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <compilerarg line="${javac.profile.cmd.line.arg}"/>
                     <compilerarg line="${javac.compilerargs}"/>
                     <compilerarg value="-processorpath"/>
                     <compilerarg path="@{processorpath}:${empty.dir}"/>
@@ -351,6 +343,7 @@
                         <path path="@{classpath}"/>
                     </classpath>
                     <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <compilerarg line="${javac.profile.cmd.line.arg}"/>
                     <compilerarg line="${javac.compilerargs}"/>
                     <customize/>
                 </javac>
@@ -476,7 +469,7 @@
                 </condition>
                 <union id="test.set"/>
                 <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
-                <testng classfilesetref="test.set" failureProperty="tests.failed" jvm="${platform.java}" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="Ensemble8" testname="TestNG tests" workingDir="${work.dir}">
+                <testng classfilesetref="test.set" failureProperty="tests.failed" jvm="${platform.java}" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="Ensemble8" testname="TestNG tests" workingDir="${work.dir}">
                     <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
                     <propertyset>
                         <propertyref prefix="test-sys-prop."/>
@@ -869,8 +862,8 @@
                     </chainedmapper>
                 </pathconvert>
                 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-                <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
-                    <fileset dir="${build.classes.dir}"/>
+                <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+                    <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
                     <manifest>
                         <attribute name="Class-Path" value="${jar.classpath}"/>
                         <customize/>
@@ -882,7 +875,7 @@
     <target name="-init-presetdef-jar">
         <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
             <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
-                <j2seproject1:fileset dir="${build.classes.dir}"/>
+                <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
             </jar>
         </presetdef>
     </target>
@@ -1004,41 +997,25 @@
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
-        <j2seproject1:jar/>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class-mkdist.available">
-        <j2seproject1:jar manifest="${manifest.file}"/>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
-        <j2seproject1:jar manifest="${manifest.file}">
-            <j2seproject1:manifest>
-                <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
-            </j2seproject1:manifest>
-        </j2seproject1:jar>
-        <echo level="info">To run this application from the command line without Ant, try:</echo>
-        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-        <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <pathconvert property="run.classpath.with.dist.jar">
-            <path path="${run.classpath}"/>
-            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
-        </pathconvert>
-        <echo level="info">${platform.java} -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
-    </target>
-    <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">
+    <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">
         <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
         <touch file="${tmp.manifest.file}" verbose="false"/>
     </target>
-    <target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest">
+    <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
         <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
         <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
     </target>
-    <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+main.class.available" name="-do-jar-with-libraries-set-main">
+    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
         <manifest file="${tmp.manifest.file}" mode="update">
             <attribute name="Main-Class" value="${main.class}"/>
         </manifest>
     </target>
-    <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-with-libraries-set-splashscreen">
+    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
+        <manifest file="${tmp.manifest.file}" mode="update">
+            <attribute name="Profile" value="${javac.profile}"/>
+        </manifest>
+    </target>
+    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">
         <basename file="${application.splash}" property="splashscreen.basename"/>
         <mkdir dir="${build.classes.dir}/META-INF"/>
         <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
@@ -1046,23 +1023,41 @@
             <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
         </manifest>
     </target>
-    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen" if="do.mkdist" name="-do-jar-with-libraries-pack">
+    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.mkdist" name="-do-jar-copylibs">
         <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
         <echo level="info">To run this application from the command line without Ant, try:</echo>
         <property location="${dist.jar}" name="dist.jar.resolved"/>
         <echo level="info">${platform.java} -jar "${dist.jar.resolved}"</echo>
     </target>
-    <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">
+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
+        <j2seproject1:jar manifest="${tmp.manifest.file}"/>
+        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+        <property location="${dist.jar}" name="dist.jar.resolved"/>
+        <pathconvert property="run.classpath.with.dist.jar">
+            <path path="${run.classpath}"/>
+            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
+        </pathconvert>
+        <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java} -cp ${run.classpath.with.dist.jar} ${main.class}">
+            <isset property="main.class.available"/>
+        </condition>
+        <condition else="debug" property="jar.usage.level" value="info">
+            <isset property="main.class.available"/>
+        </condition>
+        <echo level="${jar.usage.level}" message="${jar.usage.message}"/>
+    </target>
+    <target depends="-do-jar-copylibs" if="do.archive" name="-do-jar-delete-manifest">
         <delete>
             <fileset file="${tmp.manifest.file}"/>
         </delete>
     </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen,-do-jar-with-libraries-pack,-do-jar-with-libraries-delete-manifest" name="-do-jar-with-libraries"/>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-jar,-do-jar-delete-manifest" name="-do-jar-without-libraries"/>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-copylibs,-do-jar-delete-manifest" name="-do-jar-with-libraries"/>
     <target name="-post-jar">
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
+    <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
+    <target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/>
     <!--
                 =================
                 EXECUTION SECTION
--- a/apps/samples/Ensemble8/nbproject/genfiles.properties	Mon Nov 04 18:19:10 2013 -0800
+++ b/apps/samples/Ensemble8/nbproject/genfiles.properties	Mon Nov 04 21:13:50 2013 -0800
@@ -4,5 +4,5 @@
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 nbproject/build-impl.xml.data.CRC32=8d0eded5
-nbproject/build-impl.xml.script.CRC32=67848eb1
-nbproject/build-impl.xml.stylesheet.CRC32=c6d2a60f@1.56.1.46
+nbproject/build-impl.xml.script.CRC32=6cb4b68c
+nbproject/build-impl.xml.stylesheet.CRC32=5a01deb7@1.68.1.46
--- a/apps/samples/Ensemble8/nbproject/project.properties	Mon Nov 04 18:19:10 2013 -0800
+++ b/apps/samples/Ensemble8/nbproject/project.properties	Mon Nov 04 21:13:50 2013 -0800
@@ -35,18 +35,18 @@
 jar.compress=true
 jar.index=${jnlp.enabled}
 javac.classpath=\
-    .:\
+    ${file.reference.jfxrt.jar}:\
     ${file.reference.lucene-core-3.2.0.jar}:\
     ${file.reference.lucene-grouping-3.2.0.jar}:\
-    ${file.reference.jfxrt.jar}
+    .
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
 javac.processorpath=\
     ${javac.classpath}:\
     ${file.reference.ant-javafx.jar}
-javac.source=1.7
-javac.target=1.7
+javac.source=1.8
+javac.target=1.8
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
--- a/apps/samples/Ensemble8/src/app/java/ensemble/SamplePopoverTreeList.java	Mon Nov 04 18:19:10 2013 -0800
+++ b/apps/samples/Ensemble8/src/app/java/ensemble/SamplePopoverTreeList.java	Mon Nov 04 21:13:50 2013 -0800
@@ -89,7 +89,7 @@
     }
 
     @Override public String leftButtonText() {
-        return category == Samples.ROOT ? null : "Back";
+        return category == Samples.ROOT ? null : "< Back";
     }
 
     @Override public void handleLeftButton() {
--- a/apps/samples/Ensemble8/src/app/java/ensemble/control/Popover.java	Mon Nov 04 18:19:10 2013 -0800
+++ b/apps/samples/Ensemble8/src/app/java/ensemble/control/Popover.java	Mon Nov 04 21:13:50 2013 -0800
@@ -32,6 +32,8 @@
 package ensemble.control;
 
 import java.util.LinkedList;
+
+import ensemble.EnsembleApp;
 import javafx.animation.Animation;
 import javafx.animation.FadeTransition;
 import javafx.animation.Interpolator;
@@ -51,6 +53,7 @@
 import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
+import javafx.scene.image.Image;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.Region;
@@ -111,8 +114,10 @@
         // setup buttons
         leftButton.setOnMouseClicked(this);
         leftButton.getStyleClass().add("popover-left-button");
+        leftButton.setMinWidth(USE_PREF_SIZE);
         rightButton.setOnMouseClicked(this);
         rightButton.getStyleClass().add("popover-right-button");
+        rightButton.setMinWidth(USE_PREF_SIZE);
         pagesClipRect.setSmooth(false);
         pagesPane.setClip(pagesClipRect);
         titlesClipRect.setSmooth(false);
@@ -254,9 +259,9 @@
         int buttonHeight = (int)(leftButton.prefHeight(-1));
         if (buttonHeight < 30) buttonHeight = 30;
         final int buttonTop = (int)((top-buttonHeight)/2d);
-        final int leftButtonWidth = (int)(leftButton.prefWidth(-1)+0.5d);
+        final int leftButtonWidth = (int)snapSize(leftButton.prefWidth(-1));
         leftButton.resizeRelocate(left, buttonTop,leftButtonWidth,buttonHeight);
-        final int rightButtonWidth = (int)(rightButton.prefWidth(-1)+0.5d);
+        final int rightButtonWidth = (int)snapSize(rightButton.prefWidth(-1));
         rightButton.resizeRelocate(width-right-rightButtonWidth, buttonTop,rightButtonWidth,buttonHeight);
 
         final double leftButtonRight = leftButton.isVisible() ? (left + leftButtonWidth) : left;
--- a/apps/samples/Ensemble8/src/app/java/ensemble/samplepage/Description.java	Mon Nov 04 18:19:10 2013 -0800
+++ b/apps/samples/Ensemble8/src/app/java/ensemble/samplepage/Description.java	Mon Nov 04 21:13:50 2013 -0800
@@ -41,16 +41,18 @@
 import javafx.scene.control.*;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
-import javafx.scene.layout.*;
+import javafx.scene.layout.ColumnConstraints;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.VBox;
 import javafx.scene.text.Text;
 
+import static ensemble.samplepage.SamplePage.INDENT;
 import static ensemble.samplepage.SamplePageContent.title;
-import static ensemble.samplepage.SamplePage.INDENT;
 
 /**
  * Description Section on Sample Page
  */
-public class Description extends GridPane {
+public class Description extends VBox {
     private static final Image ORANGE_ARROW = new Image(EnsembleApp.class.getResource("images/orange-arrrow.png").toExternalForm());
     private final SamplePage samplePage;
     private final Label description;
@@ -58,43 +60,45 @@
     private final VBox relatedSamples;
     
     public Description(final SamplePage samplePage) {
-        setVgap(INDENT);
-        setHgap(INDENT);
         this.samplePage = samplePage;
         getStyleClass().add("sample-page-box");
 
-        // Setup Columns
-        ColumnConstraints leftColumn = new ColumnConstraints();
-        leftColumn.setPercentWidth(50);
-        ColumnConstraints rightColumn = new ColumnConstraints();
-        rightColumn.setPercentWidth(50);
-        getColumnConstraints().addAll(leftColumn,rightColumn);
-
         // Add Description
         Text descriptionTitle = title("DESCRIPTION");
-        setConstraints(descriptionTitle,0,0,2,1);
         description = new Label();
         description.setWrapText(true);
         description.setMinHeight(Label.USE_PREF_SIZE);
-        description.setPadding(new Insets(8,0,8,0));
-        setConstraints(description, 0, 1, 2, 1);
+        description.setPadding(new Insets(8, 0, 8, 0));
+        getChildren().addAll(descriptionTitle,description);
 
         // Add View Source Hyperlink
         Hyperlink sourceBtn = new Hyperlink("VIEW SOURCE");
-        setConstraints(sourceBtn,0,2,2,1);
         sourceBtn.getStyleClass().add("sample-page-box-title");
         sourceBtn.setGraphic(new ImageView(ORANGE_ARROW));
         sourceBtn.setContentDisplay(ContentDisplay.RIGHT);
         sourceBtn.setOnAction(event -> {
             samplePage.pageBrowser.goToPage(samplePage.getUrl().replaceFirst("sample://", "sample-src://"));
         });
+        if (!EnsembleApp.IS_EMBEDDED) getChildren().add(sourceBtn);
+
+        // Setup Columns
+        GridPane gridPane = new GridPane();
+        getChildren().add(gridPane);
+        gridPane.setVgap(INDENT);
+        gridPane.setHgap(INDENT);
+        ColumnConstraints leftColumn = new ColumnConstraints();
+        leftColumn.setPercentWidth(50);
+        ColumnConstraints rightColumn = new ColumnConstraints();
+        rightColumn.setPercentWidth(50);
+        gridPane.getColumnConstraints().addAll(leftColumn, rightColumn);
 
         // Add Related Documents
         Text relatedDocumentsTitle = title("RELATED DOCUMENTS");
-        setConstraints(relatedDocumentsTitle,0,3);
+        GridPane.setConstraints(relatedDocumentsTitle, 0, 0);
         relatedDocumentsList = new VBox();
         ScrollPane relatedDocumentsScrollPane = new ScrollPane(relatedDocumentsList);
-        setConstraints(relatedDocumentsScrollPane,0,4);
+        relatedDocumentsScrollPane.setPrefSize(50,20);
+        GridPane.setConstraints(relatedDocumentsScrollPane, 0, 1);
         relatedDocumentsScrollPane.setFitToHeight(true);
         relatedDocumentsScrollPane.setFitToWidth(true);
         relatedDocumentsScrollPane.prefHeightProperty().bind(heightProperty());
@@ -102,19 +106,15 @@
 
         // Add Related Samples
         Text relatedSamplesTitle = title("RELATED SAMPLES");
-        setConstraints(relatedSamplesTitle,1,3);
+        GridPane.setConstraints(relatedSamplesTitle, 1, 0);
         relatedSamples = new VBox();
-        setConstraints(relatedSamples,1,4);
+        GridPane.setConstraints(relatedSamples, 1, 1);
 
-        getChildren().addAll(
-                descriptionTitle,
-                description,
+        gridPane.getChildren().addAll(
                 relatedDocumentsTitle,
                 relatedDocumentsScrollPane,
                 relatedSamplesTitle,
-                relatedSamples
-                );
-        if (!EnsembleApp.IS_EMBEDDED) getChildren().add(sourceBtn);
+                relatedSamples);
 
         // listen for when sample changes
         samplePage.registerSampleInfoUpdater(sampleInfo -> {
--- a/apps/samples/Ensemble8/src/app/resources/ensemble/EnsembleStylesCommon.css	Mon Nov 04 18:19:10 2013 -0800
+++ b/apps/samples/Ensemble8/src/app/resources/ensemble/EnsembleStylesCommon.css	Mon Nov 04 21:13:50 2013 -0800
@@ -62,9 +62,9 @@
    * DOCS PAGE
    ****************************************************************************/
 .sidebar-title {
-    -fx-font-family: "Source Sans Pro Semibold";
-    -fx-font-size: 16 !important;
-    -fx-text-fill: #e1731c;
+    -fx-font-family: "Source Sans Pro Light";
+    -fx-font-size: 20 !important;
+    -fx-text-fill: #f3472f;
 }
 
 /* *****************************************************************************
@@ -80,15 +80,18 @@
     -fx-text-overrun: leading-word-ellipsis;
 }
 .sample-page-box-title {
-    -fx-font-family: "Source Sans Pro Semibold";
-    -fx-font-size: 16 !important;
-    -fx-text-fill: #e1731c;
-    -fx-fill: #e1731c;
+    -fx-font-family: "Source Sans Pro Light";
+    -fx-font-size: 20 !important;
+    -fx-text-fill: #f3472f;
+    -fx-fill: #f3472f;
     -fx-padding: 0;
 }
 .sample-container {
     -fx-background-color: -fx-background; /* give sample area a solid color for occlusion culling */
 }
+.sample-page-box .tab-pane.floating {
+    -fx-outer-border: derive(-fx-color,-13%);
+}
 
 /* *****************************************************************************
    * POPOVERS
@@ -113,6 +116,10 @@
  /*   -fx-text-fill: white;
     -fx-font-weight: bold; */
 }
+.popover .button {
+    -fx-font-family: "Source Sans Pro";
+    -fx-font-size: 16px;
+}
 .popover-tree-list-cell {
     -fx-background-color: white;
    /*  -fx-border-color: transparent transparent #dfdfdf transparent; */
@@ -144,10 +151,11 @@
     -fx-text-fill: #444444;
 }
 .search-icon-pane .label {
-    -fx-font-family: "Source Sans Pro Light";
+    -fx-font-family: "Source Sans Pro Semibold";
     -fx-font-size: 16px;
     -fx-background-color: #515151;
     -fx-background-radius: 3px;
+    -fx-text-fill: white;
     -fx-alignment: center;
 }
 .sample-tree-list-cell {
@@ -211,7 +219,7 @@
     -fx-padding: 0 0 0 30;
 }
 .search-box:focused {
-    -fx-background-radius: 15,14,16,0;
+    -fx-background-radius: 15,14,16,14;
 }
 .search-clear-button {
     -fx-shape: "M9.521,0.083c-5.212,0-9.438,4.244-9.438,9.479c0,5.234,4.225,9.479,9.438,9.479c5.212,0,9.437-4.244,9.437-9.479C18.958,4.327,14.733,0.083,9.521,0.083z M13.91,13.981c-0.367,0.369-0.963,0.369-1.329,0l-3.019-3.03l-3.019,3.03c-0.367,0.369-0.962,0.369-1.329,0c-0.367-0.368-0.366-0.965,0.001-1.334l3.018-3.031L5.216,6.585C4.849,6.217,4.849,5.618,5.217,5.25c0.366-0.369,0.961-0.368,1.328,0l3.018,3.031l3.019-3.031c0.366-0.368,0.961-0.369,1.328,0c0.366,0.368,0.366,0.967,0,1.335l-3.019,3.031l3.02,3.031C14.276,13.017,14.276,13.613,13.91,13.981z";
Binary file apps/samples/Ensemble8/src/app/resources/ensemble/images/orange-arrrow.png has changed
Binary file apps/samples/Ensemble8/src/app/resources/ensemble/images/orange-arrrow@2x.png has changed