Merging in latest from master

#70
2015-08-18 15:23:42 -07:00
parent 3d1e1659c2 f4b87cf70d
commit e426e0e5ec
22 changed files with 952 additions and 526 deletions
--- a/platform/commonUI/general/res/css/tree.css
+++ b/platform/commonUI/general/res/css/tree.css
@@ -69,6 +69,7 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
+/*********************************************** FORM ELEMENTS */
 /*
@mixin invokeMenu($baseColor: $colorBodyFg) {
 	$c: $baseColor;
@@ -103,7 +104,7 @@
 ul.tree {
  margin: 0;
  padding: 0; }
-  /* line 276, ../sass/_mixins.scss */
+  /* line 308, ../sass/_mixins.scss */
  ul.tree li {
    list-style-type: none;
    margin: 0;