diff --git a/.gitignore b/.gitignore index 6d8ee7e58b..26932aec64 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ *.DS_Store *.sass-cache +*COMPILE.css # Intellij project configuration files *.idea diff --git a/bundles.json b/bundles.json index ee554ad9bb..a0f7edd7a8 100644 --- a/bundles.json +++ b/bundles.json @@ -9,6 +9,7 @@ "platform/commonUI/general", "platform/commonUI/inspect", "platform/commonUI/mobile", + "platform/commonUI/themes/espresso", "platform/containment", "platform/execution", "platform/telemetry", diff --git a/example/imagery/src/ImageTelemetry.js b/example/imagery/src/ImageTelemetry.js index 127b65deba..c0e1e2bd1d 100644 --- a/example/imagery/src/ImageTelemetry.js +++ b/example/imagery/src/ImageTelemetry.js @@ -31,10 +31,11 @@ define( var firstObservedTime = Date.now(), images = [ - "http://www.nasa.gov/393811main_Palomar_ao_bouchez_10s_after_impact_4x3_946-710.png", - "http://www.nasa.gov/393821main_Palomar_ao_bouchez_15s_after_impact_4x3_946-710.png", - "http://www.nasa.gov/images/content/393801main_CfhtVeillet2_4x3_516-387.jpg", - "http://www.nasa.gov/images/content/392790main_1024_768_GeminiNorth_NightBeforeImpact_946-710.jpg" + "http://www.esa.int/var/esa/storage/images/esa_multimedia/images/2015/01/comet_on_16_january_2015_navcam/15205508-1-eng-GB/Comet_on_16_January_2015_NavCam.jpg", + "http://www.esa.int/var/esa/storage/images/esa_multimedia/images/2014/08/comet_on_7_august_a/14721226-1-eng-GB/Comet_on_7_August_a_node_full_image_2.jpg", + "http://http://resources0.news.com.au/images/2014/10/26/1227102/619948-e62d0d0c-5cb3-11e4-9c68-d403f5dcc36d.jpg", + "http://www.esa.int/var/esa/storage/images/esa_multimedia/images/2014/08/comet_on_16_august_a/14735866-1-eng-GB/Comet_on_16_August_a_node_full_image_2.jpg", + "http://www.esa.int/var/esa/storage/images/esa_multimedia/images/2015/08/year_at_a_comet_may_2015/15549436-1-eng-GB/Year_at_a_comet_May_2015_node_full_image_2.jpg" ].map(function (url, index) { return { timestamp: firstObservedTime + 1000 * index, diff --git a/platform/commonUI/browse/bundle.json b/platform/commonUI/browse/bundle.json index 558dc389c1..61057254a2 100644 --- a/platform/commonUI/browse/bundle.json +++ b/platform/commonUI/browse/bundle.json @@ -58,12 +58,6 @@ "templateUrl": "templates/create/locator.html" } ], - "templates": [ - { - "key": "topbar-browse", - "templateUrl": "templates/topbar-browse.html" - } - ], "representations": [ { "key": "browse-object", diff --git a/platform/commonUI/browse/res/templates/back-arrow.html b/platform/commonUI/browse/res/templates/back-arrow.html index daa29de67a..f2dde4ebe8 100644 --- a/platform/commonUI/browse/res/templates/back-arrow.html +++ b/platform/commonUI/browse/res/templates/back-arrow.html @@ -27,3 +27,4 @@ ng-click="context.getParent().getCapability('action').perform('navigate')"> { + diff --git a/platform/commonUI/browse/res/templates/create/create-button.html b/platform/commonUI/browse/res/templates/create/create-button.html index 527afd9882..67a0294111 100644 --- a/platform/commonUI/browse/res/templates/create/create-button.html +++ b/platform/commonUI/browse/res/templates/create/create-button.html @@ -20,10 +20,11 @@ at runtime from the About dialog for additional information. -->