Merged latest from open-master and open1222 platform/

2015-06-08 16:00:24 -07:00
parent e216961727 3a36fda8ab
commit cec115976c
12 changed files with 370 additions and 504 deletions
--- a/platform/commonUI/general/res/sass/_constants.scss
+++ b/platform/commonUI/general/res/sass/_constants.scss
@@ -19,6 +19,10 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
+
+// Features
+$enableImageryThumbs: false; // Set to true if historical imagery thumbnails are supported
+
 // Margins, spacing, radii
 $bodyMargin: 10px;
 $interiorMargin: 5px;