Merge branch 'open940b' into open929

Merge in Fixed Position updates to reconcile conflicts related to generalization of selection mechanism, WTD-929. Conflicts: platform/features/layout/src/FixedController.js platform/features/layout/test/FixedControllerSpec.js
2015-03-04 15:08:11 -08:00
parent 3ce1064c4e 93debb4abe
commit 5ab2ceb333
49 changed files with 1415 additions and 399 deletions
--- a/platform/commonUI/browse/res/templates/browse/object-header.html
+++ b/platform/commonUI/browse/res/templates/browse/object-header.html
@@ -1,6 +1,6 @@
 <div class='object-header'>
    <span class='type-icon icon ui-symbol'>{{type.getGlyph()}}</span>
-    <span class='action'>{{parameters.mode}}</span>
+    <span ng-if="parameters.mode" class='action'>{{parameters.mode}}</span>
    <span class='type'>{{type.getName()}}</span>
    <span class='title'>{{model.name}}</span>
    <a id='actions-menu' class='ui-symbol invoke-menu' onclick="alert('Not yet functional. This will display a dropdown menu of options for this object.');">v</a>
--- a/platform/commonUI/general/res/css/forms.css
+++ b/platform/commonUI/general/res/css/forms.css
@@ -1,4 +1,4 @@
-/* line 2, ../sass/forms/_elems.scss */
+/* line 3, ../sass/forms/_elems.scss */
 .form .section-header {
  -webkit-border-radius: 3px;
  -moz-border-radius: 3px;
@@ -9,13 +9,13 @@
  font-size: 0.8em;
  margin-top: 5px;
  padding: 5px; }
-  /* line 8, ../sass/forms/_elems.scss */
+  /* line 9, ../sass/forms/_elems.scss */
  .form .section-header:first-child {
    margin-top: 0; }
-/* line 12, ../sass/forms/_elems.scss */
+/* line 13, ../sass/forms/_elems.scss */
 .form .form-section {
  position: relative; }
-/* line 16, ../sass/forms/_elems.scss */
+/* line 17, ../sass/forms/_elems.scss */
 .form .form-row {
  -webkit-box-sizing: border-box;
  -moz-box-sizing: border-box;
@@ -26,7 +26,7 @@
  margin-top: 5px;
  padding: 5px;
  position: relative; }
-  /* line 25, ../sass/forms/_elems.scss */
+  /* line 24, ../sass/forms/_elems.scss */
  .form .form-row:first-child {
    border-top: none; }
  /* line 29, ../sass/forms/_elems.scss */
@@ -41,24 +41,34 @@
    font-size: 0.75rem;
    line-height: 22px;
    min-height: 22px; }
-  /* line 39, ../sass/forms/_elems.scss */
+  /* line 38, ../sass/forms/_elems.scss */
  .form .form-row > .label {
    float: left;
    position: relative;
    white-space: nowrap;
    width: 20%; }
-  /* line 47, ../sass/forms/_elems.scss */
+  /* line 46, ../sass/forms/_elems.scss */
  .form .form-row .value {
    color: #cccccc; }
-  /* line 51, ../sass/forms/_elems.scss */
+  /* line 50, ../sass/forms/_elems.scss */
  .form .form-row .controls {
    float: left;
    position: relative;
    width: 79%; }
-  /* line 58, ../sass/forms/_elems.scss */
+    /* line 55, ../sass/forms/_elems.scss */
+    .form .form-row .controls .l-composite-control {
+      display: inline-block; }
+      /* line 57, ../sass/forms/_elems.scss */
+      .form .form-row .controls .l-composite-control.l-checkbox {
+        line-height: 14px;
+        margin-right: 5px; }
+    /* line 65, ../sass/forms/_elems.scss */
+    .form .form-row .controls .select {
+      margin-right: 5px; }
+  /* line 70, ../sass/forms/_elems.scss */
  .form .form-row .field-hints {
    color: #666666; }
-  /* line 62, ../sass/forms/_elems.scss */
+  /* line 74, ../sass/forms/_elems.scss */
  .form .form-row .selector-list {
    -webkit-border-radius: 3px;
    -moz-border-radius: 3px;
@@ -69,7 +79,7 @@
    position: relative;
    height: 150px;
    max-width: 50%; }
-    /* line 70, ../sass/forms/_elems.scss */
+    /* line 82, ../sass/forms/_elems.scss */
    .form .form-row .selector-list .wrapper {
      overflow-y: auto;
      position: absolute;
@@ -78,15 +88,35 @@
      bottom: 5px;
      left: 5px; }

-/* line 84, ../sass/forms/_elems.scss */
+/* line 96, ../sass/forms/_elems.scss */
 label.form-control.checkbox input {
  margin-right: 5px;
  vertical-align: top; }

-/* line 90, ../sass/forms/_elems.scss */
-.hint {
+/* line 103, ../sass/forms/_elems.scss */
+.hint,
+.s-hint {
  font-size: 0.9em; }

+/* line 107, ../sass/forms/_elems.scss */
+.l-result {
+  display: inline-block;
+  min-width: 32px;
+  min-height: 32px;
+  position: relative;
+  vertical-align: top; }
+  /* line 114, ../sass/forms/_elems.scss */
+  .l-result div.s-hint {
+    -webkit-border-radius: 3px;
+    -moz-border-radius: 3px;
+    -ms-border-radius: 3px;
+    -o-border-radius: 3px;
+    border-radius: 3px;
+    background: rgba(255, 153, 0, 0.8);
+    display: block;
+    color: #ffd699;
+    padding: 5px; }
+
 /* line 1, ../sass/forms/_textarea.scss */
 .edit-main textarea {
  -webkit-appearance: none;
@@ -166,30 +196,22 @@ input[type="text"] {
  -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
  -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
  box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
+  border: none;
  border-top: 1px solid #666666;
  color: #999999;
  display: inline-block;
-  margin-right: 5px;
-  margin-top: 1px;
-  padding: 0 25px 0 0;
-  position: relative;
-  overflow: hidden;
-  vertical-align: middle; }
-  /* line 115, ../sass/_mixins.scss */
+  cursor: pointer;
+  display: inline-block;
+  margin: 0 0 2px 2px;
+  position: relative; }
+  /* line 127, ../sass/_mixins.scss */
  .form-control.select:not(.disabled):hover {
    background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #666666), color-stop(100%, #4d4d4d));
    background-image: -webkit-linear-gradient(#666666, #4d4d4d);
    background-image: -moz-linear-gradient(#666666, #4d4d4d);
    background-image: -o-linear-gradient(#666666, #4d4d4d);
    background-image: linear-gradient(#666666, #4d4d4d); }
-  /* line 11, ../sass/forms/_selects.scss */
-  .form-control.select span.arw {
-    display: block;
-    pointer-events: none;
-    position: absolute;
-    right: 8%;
-    top: 10%; }
-  /* line 18, ../sass/forms/_selects.scss */
+  /* line 7, ../sass/forms/_selects.scss */
  .form-control.select select {
    -webkit-appearance: none;
    -moz-appearance: none;
@@ -197,16 +219,21 @@ input[type="text"] {
    -webkit-box-sizing: border-box;
    -moz-box-sizing: border-box;
    box-sizing: border-box;
-    border: none;
-    box-shadow: none;
-    background-color: transparent;
-    background-image: none;
+    background: none;
+    color: #999999;
+    border: none !important;
    cursor: pointer;
-    padding: 3px 5px 4px 5px;
-    width: 150%; }
-  /* line 32, ../sass/forms/_selects.scss */
-  .form-control.select select:focus {
-    outline: none; }
+    padding: 4px 25px 2px 5px; }
+  /* line 16, ../sass/forms/_selects.scss */
+  .form-control.select:after {
+    color: #0099cc;
+    content: "v";
+    display: block;
+    font-family: 'symbolsfont';
+    pointer-events: none;
+    position: absolute;
+    right: 5px;
+    top: 0; }

 /* line 2, ../sass/forms/_channel-selector.scss */
 .channel-selector .line {
--- a/platform/commonUI/general/res/css/items.css
+++ b/platform/commonUI/general/res/css/items.css
@@ -24,6 +24,7 @@
    -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
    -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
    box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
+    border: none;
    border-top: 1px solid #737373;
    color: #999999;
    display: inline-block;
@@ -35,7 +36,7 @@
    margin-bottom: 3px;
    margin-right: 3px;
    position: relative; }
-    /* line 115, ../sass/_mixins.scss */
+    /* line 127, ../sass/_mixins.scss */
    .items-holder .item.grid-item:not(.disabled):hover {
      background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #737373), color-stop(100%, #595959));
      background-image: -webkit-linear-gradient(#737373, #595959);
@@ -109,6 +110,7 @@
      -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
      -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
      box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
+      border: none;
      border-top: 1px solid #33ccff;
      color: #999999;
      display: inline-block;
@@ -118,7 +120,7 @@
      background-image: -o-linear-gradient(#33ccff, #0099cc);
      background-image: linear-gradient(#33ccff, #0099cc);
      color: #80dfff; }
-      /* line 123, ../sass/_mixins.scss */
+      /* line 135, ../sass/_mixins.scss */
      .items-holder .item.grid-item.selected:not(.disabled):hover {
        background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #66d9ff), color-stop(100%, #00bfff));
        background-image: -webkit-linear-gradient(#66d9ff, #00bfff);
--- a/platform/commonUI/general/res/css/theme-espresso.css
+++ b/platform/commonUI/general/res/css/theme-espresso.css
@@ -364,6 +364,115 @@ span {
 .vscroll {
  overflow-y: auto; }

+/* line 2, ../sass/_fixed-position.scss */
+.t-fixed-position.l-fixed-position {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  width: auto;
+  height: auto; }
+  /* line 8, ../sass/_fixed-position.scss */
+  .t-fixed-position.l-fixed-position .l-grid-holder {
+    position: relative;
+    height: 100%;
+    width: 100%; }
+    /* line 11, ../sass/_fixed-position.scss */
+    .t-fixed-position.l-fixed-position .l-grid-holder .l-grid {
+      position: absolute;
+      height: 100%;
+      width: 100%;
+      pointer-events: none;
+      z-index: 0; }
+      /* line 17, ../sass/_fixed-position.scss */
+      .t-fixed-position.l-fixed-position .l-grid-holder .l-grid.l-grid-x {
+        background-image: -webkit-linear-gradient(90deg, rgba(255, 255, 255, 0.05) 1px, transparent 1px, transparent 100%);
+        background-image: -moz-linear-gradient(90deg, rgba(255, 255, 255, 0.05) 1px, transparent 1px, transparent 100%);
+        background-image: -o-linear-gradient(90deg, rgba(255, 255, 255, 0.05) 1px, transparent 1px, transparent 100%);
+        background-image: linear-gradient(90deg, rgba(255, 255, 255, 0.05) 1px, transparent 1px, transparent 100%);
+        background-repeat: repeat-x; }
+      /* line 21, ../sass/_fixed-position.scss */
+      .t-fixed-position.l-fixed-position .l-grid-holder .l-grid.l-grid-y {
+        background-image: -webkit-linear-gradient(0deg, rgba(255, 255, 255, 0.05) 1px, transparent 1px, transparent 100%);
+        background-image: -moz-linear-gradient(0deg, rgba(255, 255, 255, 0.05) 1px, transparent 1px, transparent 100%);
+        background-image: -o-linear-gradient(0deg, rgba(255, 255, 255, 0.05) 1px, transparent 1px, transparent 100%);
+        background-image: linear-gradient(0deg, rgba(255, 255, 255, 0.05) 1px, transparent 1px, transparent 100%);
+        background-repeat: repeat-y; }
+/* line 28, ../sass/_fixed-position.scss */
+.t-fixed-position .l-fixed-position-item {
+  position: absolute;
+  border: 1px solid transparent; }
+  /* line 32, ../sass/_fixed-position.scss */
+  .t-fixed-position .l-fixed-position-item.s-selected {
+    -webkit-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px;
+    -moz-box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px;
+    box-shadow: rgba(0, 0, 0, 0.7) 0 3px 10px;
+    border-color: #0099cc;
+    cursor: move; }
+  /* line 37, ../sass/_fixed-position.scss */
+  .t-fixed-position .l-fixed-position-item.s-not-selected {
+    opacity: 0.8; }
+  /* line 43, ../sass/_fixed-position.scss */
+  .t-fixed-position .l-fixed-position-item .l-fixed-position-box,
+  .t-fixed-position .l-fixed-position-item .l-fixed-position-image,
+  .t-fixed-position .l-fixed-position-item .l-fixed-position-text {
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+    height: 100%;
+    width: 100%; }
+  /* line 51, ../sass/_fixed-position.scss */
+  .t-fixed-position .l-fixed-position-item .l-fixed-position-image {
+    background-size: cover;
+    background-repeat: no-repeat;
+    background-position: left top; }
+  /* line 57, ../sass/_fixed-position.scss */
+  .t-fixed-position .l-fixed-position-item .l-fixed-position-text {
+    text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px;
+    border: 1px solid transparent;
+    font-size: 0.8rem; }
+    /* line 62, ../sass/_fixed-position.scss */
+    .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-static-text {
+      padding: 3px; }
+    /* line 67, ../sass/_fixed-position.scss */
+    .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem {
+      overflow: hidden;
+      position: absolute;
+      top: 3px;
+      right: 3px;
+      bottom: 3px;
+      left: 3px;
+      width: auto;
+      height: auto;
+      -webkit-box-sizing: border-box;
+      -moz-box-sizing: border-box;
+      box-sizing: border-box;
+      width: 50%; }
+      /* line 71, ../sass/_fixed-position.scss */
+      .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-title {
+        right: auto;
+        left: 3px; }
+      /* line 75, ../sass/_fixed-position.scss */
+      .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-value {
+        right: 3px;
+        left: auto;
+        text-align: right; }
+        /* line 80, ../sass/_fixed-position.scss */
+        .t-fixed-position .l-fixed-position-item .l-fixed-position-text.l-telemetry .l-elem.l-value.telem-only {
+          left: 3px;
+          width: auto; }
+/* line 91, ../sass/_fixed-position.scss */
+.t-fixed-position .l-fixed-position-item-handle {
+  background: rgba(0, 153, 204, 0.5);
+  cursor: crosshair;
+  border: 1px solid #0099cc;
+  position: absolute; }
+
+/* line 103, ../sass/_fixed-position.scss */
+.edit-mode .t-fixed-position .l-fixed-position-item:not(.s-selected):hover {
+  border: 1px dotted rgba(0, 153, 204, 0.5); }
+
 /* line 3, ../sass/_about.scss */
 .t-about {
  line-height: 120%; }
@@ -500,7 +609,7 @@ span {
  display: inline-block;
  font-size: 1rem;
  vertical-align: middle; }
-  /* line 159, ../sass/_mixins.scss */
+  /* line 171, ../sass/_mixins.scss */
  .invoke-menu:hover {
    color: #33ccff; }

@@ -512,15 +621,16 @@ span {
 /* line 49, ../sass/_icons.scss */
 .icon-buttons-main .invoke-menu {
  color: #666666; }
-  /* line 159, ../sass/_mixins.scss */
+  /* line 171, ../sass/_mixins.scss */
  .icon-buttons-main .invoke-menu:hover {
    color: #999999; }

 /* line 57, ../sass/_icons.scss */
 .object-header .type-icon {
-  color: #ffc700; }
+  color: #ffc700;
+  margin-right: 5px; }

-/* line 64, ../sass/_icons.scss */
+/* line 65, ../sass/_icons.scss */
 .menu .type-icon,
 .tree-item .type-icon,
 .icon-btn .menu.dropdown .icon,
@@ -652,10 +762,11 @@ span {
    -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
    -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
    box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
+    border: none;
    border-top: 1px solid #666666;
    color: #999999;
    display: inline-block; }
-    /* line 70, ../sass/_mixins.scss */
+    /* line 82, ../sass/_mixins.scss */
    .s-btn.s-very-subtle:hover, .s-very-subtle.s-icon-btn:hover {
      background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #666666), color-stop(100%, #595959));
      background-image: -webkit-linear-gradient(#666666, #595959);
@@ -690,6 +801,64 @@ a.l-btn,
 a.l-btn span {
  display: inline-block; }

+/* line 1, ../sass/controls/_color-palette.scss */
+.l-color-palette {
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  padding: 5px !important; }
+  /* line 10, ../sass/controls/_color-palette.scss */
+  .l-color-palette .l-palette-row {
+    overflow: hidden;
+    *zoom: 1;
+    line-height: 16px;
+    width: 170px; }
+    /* line 15, ../sass/controls/_color-palette.scss */
+    .l-color-palette .l-palette-row .l-palette-item {
+      -webkit-box-sizing: border-box;
+      -moz-box-sizing: border-box;
+      box-sizing: border-box;
+      text-shadow: rgba(0, 0, 0, 0.8) 0 1px 2px;
+      -webkit-transition-property: visibility, opacity, background-color, border-color;
+      -moz-transition-property: visibility, opacity, background-color, border-color;
+      -o-transition-property: visibility, opacity, background-color, border-color;
+      transition-property: visibility, opacity, background-color, border-color;
+      -webkit-transition-duration: 0.25s;
+      -moz-transition-duration: 0.25s;
+      -o-transition-duration: 0.25s;
+      transition-duration: 0.25s;
+      -webkit-transition-timing-function: ease-in-out;
+      -moz-transition-timing-function: ease-in-out;
+      -o-transition-timing-function: ease-in-out;
+      transition-timing-function: ease-in-out;
+      border: 1px solid transparent;
+      color: white;
+      display: block;
+      font-family: 'symbolsfont';
+      float: left;
+      height: 16px;
+      width: 16px;
+      line-height: 16px;
+      margin: 0 1px 1px 0;
+      text-align: center;
+      vertical-align: middle; }
+    /* line 32, ../sass/controls/_color-palette.scss */
+    .l-color-palette .l-palette-row .s-palette-item:hover {
+      -webkit-transition-property: none;
+      -moz-transition-property: none;
+      -o-transition-property: none;
+      transition-property: none;
+      border-color: white !important; }
+    /* line 38, ../sass/controls/_color-palette.scss */
+    .l-color-palette .l-palette-row .l-palette-item-label {
+      margin-left: 5px; }
+    /* line 42, ../sass/controls/_color-palette.scss */
+    .l-color-palette .l-palette-row.l-option-row {
+      margin-bottom: 5px; }
+      /* line 44, ../sass/controls/_color-palette.scss */
+      .l-color-palette .l-palette-row.l-option-row .s-palette-item {
+        border-color: #999999; }
+
 /* line 3, ../sass/controls/_controls.scss */
 .control.view-control .icon {
  display: inline-block;
@@ -815,6 +984,7 @@ a.l-btn span {
    -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
    -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
    box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
+    border: none;
    border-top: 1px solid #33ccff;
    color: #999999;
    display: inline-block;
@@ -824,7 +994,7 @@ a.l-btn span {
    background-image: -o-linear-gradient(#33ccff, #0099cc);
    background-image: linear-gradient(#33ccff, #0099cc);
    color: #ccf2ff; }
-    /* line 123, ../sass/_mixins.scss */
+    /* line 135, ../sass/_mixins.scss */
    .btn.major:not(.disabled):hover {
      background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #66d9ff), color-stop(100%, #00bfff));
      background-image: -webkit-linear-gradient(#66d9ff, #00bfff);
@@ -849,6 +1019,7 @@ a.l-btn span {
      -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
      -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
      box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
+      border: none;
      border-top: 1px solid #4dd2ff;
      color: #999999;
      display: inline-block;
@@ -858,7 +1029,7 @@ a.l-btn span {
      background-image: -o-linear-gradient(#4dd2ff, #00ace6);
      background-image: linear-gradient(#4dd2ff, #00ace6);
      color: #ccf2ff; }
-      /* line 123, ../sass/_mixins.scss */
+      /* line 135, ../sass/_mixins.scss */
      .btn.major:hover:not(.disabled):hover {
        background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #80dfff), color-stop(100%, #1ac6ff));
        background-image: -webkit-linear-gradient(#80dfff, #1ac6ff);
@@ -892,10 +1063,11 @@ a.l-btn span {
    -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
    -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
    box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
+    border: none;
    border-top: 1px solid #999999;
    color: #cccccc;
    display: inline-block; }
-    /* line 115, ../sass/_mixins.scss */
+    /* line 127, ../sass/_mixins.scss */
    .btn.subtle:not(.disabled):hover {
      background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #999999), color-stop(100%, #808080));
      background-image: -webkit-linear-gradient(#999999, #808080);
@@ -920,10 +1092,11 @@ a.l-btn span {
    -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
    -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
    box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
+    border: none;
    border-top: 1px solid #666666;
    color: #b3b3b3;
    display: inline-block; }
-    /* line 115, ../sass/_mixins.scss */
+    /* line 127, ../sass/_mixins.scss */
    .btn.very-subtle:not(.disabled):hover {
      background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #666666), color-stop(100%, #4d4d4d));
      background-image: -webkit-linear-gradient(#666666, #4d4d4d);
@@ -954,6 +1127,13 @@ a.l-btn span {
  margin-left: 5px; }

 /* line 157, ../sass/controls/_controls.scss */
+.l-composite-control {
+  vertical-align: middle; }
+  /* line 160, ../sass/controls/_controls.scss */
+  .l-composite-control.l-checkbox .composite-control-label {
+    line-height: 18px; }
+
+/* line 166, ../sass/controls/_controls.scss */
 .control-group {
  -webkit-box-sizing: border-box;
  -moz-box-sizing: border-box;
@@ -961,16 +1141,16 @@ a.l-btn span {
  border-left: 1px solid #4d4d4d;
  padding: 0 5px;
  position: relative; }
-  /* line 164, ../sass/controls/_controls.scss */
+  /* line 173, ../sass/controls/_controls.scss */
  .control-group:first-child {
    border-left: none;
    padding-left: 0; }

-/* line 170, ../sass/controls/_controls.scss */
+/* line 179, ../sass/controls/_controls.scss */
 .btn-set {
  display: inline-block;
  position: relative; }
-  /* line 175, ../sass/controls/_controls.scss */
+  /* line 184, ../sass/controls/_controls.scss */
  .btn-set .btn,
  .btn-set .t-btn {
    -webkit-border-radius: 0;
@@ -980,7 +1160,7 @@ a.l-btn span {
    border-radius: 0;
    border-left: 1px solid #666666;
    margin-left: 0; }
-    /* line 179, ../sass/controls/_controls.scss */
+    /* line 188, ../sass/controls/_controls.scss */
    .btn-set .btn:first-child,
    .btn-set .t-btn:first-child {
      border-left: none;
@@ -990,7 +1170,7 @@ a.l-btn span {
      -moz-border-radius-bottomleft: 3px;
      -webkit-border-bottom-left-radius: 3px;
      border-bottom-left-radius: 3px; }
-    /* line 183, ../sass/controls/_controls.scss */
+    /* line 192, ../sass/controls/_controls.scss */
    .btn-set .btn:last-child,
    .btn-set .t-btn:last-child {
      -moz-border-radius-topright: 3px;
@@ -1000,7 +1180,7 @@ a.l-btn span {
      -webkit-border-bottom-right-radius: 3px;
      border-bottom-right-radius: 3px; }

-/* line 194, ../sass/controls/_controls.scss */
+/* line 203, ../sass/controls/_controls.scss */
 .object-browse-bar .btn,
 .object-browse-bar .t-btn,
 .top-bar .buttons-main .btn,
@@ -1011,7 +1191,7 @@ a.l-btn span {
  font-size: 12.6px;
  height: 28px;
  line-height: 28px; }
-  /* line 200, ../sass/controls/_controls.scss */
+  /* line 209, ../sass/controls/_controls.scss */
  .object-browse-bar .btn .icon:not(.invoke-menu),
  .object-browse-bar .t-btn .icon:not(.invoke-menu),
  .top-bar .buttons-main .btn .icon:not(.invoke-menu),
@@ -1021,21 +1201,22 @@ a.l-btn span {
    font-size: 150%;
    vertical-align: middle; }

-/* line 208, ../sass/controls/_controls.scss */
+/* line 217, ../sass/controls/_controls.scss */
 label.checkbox.custom {
  cursor: pointer;
  display: inline-block;
  line-height: 14px;
  margin-right: 20px;
  padding-left: 19px;
-  position: relative; }
-  /* line 218, ../sass/controls/_controls.scss */
+  position: relative;
+  vertical-align: top; }
+  /* line 228, ../sass/controls/_controls.scss */
  label.checkbox.custom em {
    color: #999999;
    display: inline-block;
    height: 14px;
    min-width: 14px; }
-    /* line 223, ../sass/controls/_controls.scss */
+    /* line 233, ../sass/controls/_controls.scss */
    label.checkbox.custom em:before {
      -webkit-border-radius: 2.25px;
      -moz-border-radius: 2.25px;
@@ -1056,51 +1237,51 @@ label.checkbox.custom {
      top: 0;
      position: absolute;
      text-align: center; }
-  /* line 241, ../sass/controls/_controls.scss */
+  /* line 251, ../sass/controls/_controls.scss */
  label.checkbox.custom.no-text {
    overflow: hidden;
    margin-right: 0;
    padding-left: 0;
    height: 14px;
    width: 14px; }
-    /* line 247, ../sass/controls/_controls.scss */
+    /* line 257, ../sass/controls/_controls.scss */
    label.checkbox.custom.no-text em {
      overflow: hidden; }
-  /* line 251, ../sass/controls/_controls.scss */
+  /* line 261, ../sass/controls/_controls.scss */
  label.checkbox.custom input {
    display: none; }
-    /* line 253, ../sass/controls/_controls.scss */
+    /* line 263, ../sass/controls/_controls.scss */
    label.checkbox.custom input:checked ~ em:before {
      background: #0099cc;
      color: #ccf2ff;
      content: "2"; }

-/* line 261, ../sass/controls/_controls.scss */
+/* line 271, ../sass/controls/_controls.scss */
 .input-labeled {
  margin-left: 5px; }
-  /* line 263, ../sass/controls/_controls.scss */
+  /* line 273, ../sass/controls/_controls.scss */
  .input-labeled label {
    display: inline-block;
    margin-right: 3px; }
-  /* line 267, ../sass/controls/_controls.scss */
+  /* line 277, ../sass/controls/_controls.scss */
  .input-labeled.inline {
    display: inline-block; }
-  /* line 270, ../sass/controls/_controls.scss */
+  /* line 280, ../sass/controls/_controls.scss */
  .input-labeled:first-child {
    margin-left: 0; }

-/* line 275, ../sass/controls/_controls.scss */
+/* line 285, ../sass/controls/_controls.scss */
 .btn-menu label.checkbox.custom {
  margin-left: 5px; }

-/* line 280, ../sass/controls/_controls.scss */
+/* line 290, ../sass/controls/_controls.scss */
 .item .checkbox.checked label {
  -webkit-box-shadow: none;
  -moz-box-shadow: none;
  box-shadow: none;
  border-bottom: none; }

-/* line 286, ../sass/controls/_controls.scss */
+/* line 296, ../sass/controls/_controls.scss */
 .btn-menu {
  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4d4d4d), color-stop(100%, #404040));
  background-image: -webkit-linear-gradient(#4d4d4d, #404040);
@@ -1118,51 +1299,52 @@ label.checkbox.custom {
  -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
  -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
  box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
+  border: none;
  border-top: 1px solid #666666;
  color: #999999;
  display: inline-block;
  height: 20px;
  line-height: 20px; }
-  /* line 115, ../sass/_mixins.scss */
+  /* line 127, ../sass/_mixins.scss */
  .btn-menu:not(.disabled):hover {
    background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #666666), color-stop(100%, #4d4d4d));
    background-image: -webkit-linear-gradient(#666666, #4d4d4d);
    background-image: -moz-linear-gradient(#666666, #4d4d4d);
    background-image: -o-linear-gradient(#666666, #4d4d4d);
    background-image: linear-gradient(#666666, #4d4d4d); }
-  /* line 293, ../sass/controls/_controls.scss */
+  /* line 303, ../sass/controls/_controls.scss */
  .btn-menu.dropdown {
    padding-right: 7px; }
-  /* line 298, ../sass/controls/_controls.scss */
+  /* line 308, ../sass/controls/_controls.scss */
  .btn-menu:not(.disabled):hover {
    color: #cccccc; }
-  /* line 302, ../sass/controls/_controls.scss */
+  /* line 312, ../sass/controls/_controls.scss */
  .btn-menu.btn-invoke-menu {
    color: #0099cc;
    padding: 0 5px; }
-    /* line 306, ../sass/controls/_controls.scss */
+    /* line 316, ../sass/controls/_controls.scss */
    .btn-menu.btn-invoke-menu:hover {
      color: deepskyblue; }
-  /* line 311, ../sass/controls/_controls.scss */
+  /* line 325, ../sass/controls/_controls.scss */
  .btn-menu .type-icon {
    margin-right: 5px; }
-  /* line 314, ../sass/controls/_controls.scss */
+  /* line 328, ../sass/controls/_controls.scss */
  .btn-menu .menu {
    text-align: left; }
-    /* line 317, ../sass/controls/_controls.scss */
+    /* line 331, ../sass/controls/_controls.scss */
    .btn-menu .menu .ui-symbol.icon {
      width: 12px; }

-/* line 323, ../sass/controls/_controls.scss */
+/* line 337, ../sass/controls/_controls.scss */
 .top-bar .btn-menu {
  height: 35px;
  line-height: 35px;
  padding-right: 10px; }
-  /* line 331, ../sass/controls/_controls.scss */
+  /* line 345, ../sass/controls/_controls.scss */
  .top-bar .btn-menu.browse-btn {
    margin-right: 5px;
    padding-left: 35px; }
-    /* line 334, ../sass/controls/_controls.scss */
+    /* line 348, ../sass/controls/_controls.scss */
    .top-bar .btn-menu.browse-btn .badge {
      -webkit-border-radius: 4.5px;
      -moz-border-radius: 4.5px;
@@ -1181,31 +1363,30 @@ label.checkbox.custom {
      height: auto; }

 /******************************************************** OBJECT-HEADER */
-/* line 351, ../sass/controls/_controls.scss */
+/* line 365, ../sass/controls/_controls.scss */
 .object-header {
  display: inline-block;
  font-size: 1em; }
-  /* line 354, ../sass/controls/_controls.scss */
+  /* line 368, ../sass/controls/_controls.scss */
  .object-header .title {
    color: white; }
-  /* line 357, ../sass/controls/_controls.scss */
+  /* line 371, ../sass/controls/_controls.scss */
  .object-header .type-icon {
    font-size: 1.5em;
    margin-right: 5px;
    vertical-align: middle; }

-/* line 366, ../sass/controls/_controls.scss */
+/* line 380, ../sass/controls/_controls.scss */
 .top-bar .object-header,
 .object-browse-bar .object-header {
-  font-size: 1.2em; }
-  /* line 368, ../sass/controls/_controls.scss */
+  font-size: 1.1em; }
+  /* line 382, ../sass/controls/_controls.scss */
  .top-bar .object-header span,
  .object-browse-bar .object-header span {
-    display: inline-block;
-    margin-right: 5px; }
+    display: inline-block; }

 /******************************************************** VIEW-CONTROLS */
-/* line 377, ../sass/controls/_controls.scss */
+/* line 391, ../sass/controls/_controls.scss */
 .view-controls .view-type {
  -webkit-border-radius: 3px;
  -moz-border-radius: 3px;
@@ -1219,16 +1400,16 @@ label.checkbox.custom {
  line-height: 20px;
  padding-left: 5px;
  padding-right: 5px; }
-  /* line 388, ../sass/controls/_controls.scss */
+  /* line 402, ../sass/controls/_controls.scss */
  .view-controls .view-type.cur {
    background: #666666; }

-/* line 393, ../sass/controls/_controls.scss */
+/* line 407, ../sass/controls/_controls.scss */
 .edit-mode .top-bar .control-set.edit-view-controls {
  margin-right: 50px; }

 /******************************************************** SLIDERS */
-/* line 404, ../sass/controls/_controls.scss */
+/* line 418, ../sass/controls/_controls.scss */
 .slider .slot {
  -webkit-border-radius: 2px;
  -moz-border-radius: 2px;
@@ -1251,7 +1432,7 @@ label.checkbox.custom {
  right: 0;
  bottom: auto;
  left: 0; }
-/* line 415, ../sass/controls/_controls.scss */
+/* line 429, ../sass/controls/_controls.scss */
 .slider .knob {
  background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4d4d4d), color-stop(100%, #404040));
  background-image: -webkit-linear-gradient(#4d4d4d, #404040);
@@ -1269,6 +1450,7 @@ label.checkbox.custom {
  -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
  -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
  box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
+  border: none;
  border-top: 1px solid #666666;
  color: #999999;
  display: inline-block;
@@ -1280,14 +1462,14 @@ label.checkbox.custom {
  auto: 0;
  bottom: auto;
  left: auto; }
-  /* line 115, ../sass/_mixins.scss */
+  /* line 127, ../sass/_mixins.scss */
  .slider .knob:not(.disabled):hover {
    background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #666666), color-stop(100%, #4d4d4d));
    background-image: -webkit-linear-gradient(#666666, #4d4d4d);
    background-image: -moz-linear-gradient(#666666, #4d4d4d);
    background-image: -o-linear-gradient(#666666, #4d4d4d);
    background-image: linear-gradient(#666666, #4d4d4d); }
-  /* line 87, ../sass/_mixins.scss */
+  /* line 99, ../sass/_mixins.scss */
  .slider .knob:before {
    content: '';
    display: block;
@@ -1298,15 +1480,15 @@ label.checkbox.custom {
    left: 2px;
    bottom: 5px;
    top: 5px; }
-  /* line 108, ../sass/_mixins.scss */
+  /* line 120, ../sass/_mixins.scss */
  .slider .knob:not(.disabled):hover:before {
    border-color: rgba(0, 153, 204, 0.9); }
-  /* line 426, ../sass/controls/_controls.scss */
+  /* line 440, ../sass/controls/_controls.scss */
  .slider .knob:before {
    top: 1px;
    bottom: 3px;
    left: 5px; }
-/* line 433, ../sass/controls/_controls.scss */
+/* line 447, ../sass/controls/_controls.scss */
 .slider .range {
  background: rgba(0, 153, 204, 0.6);
  cursor: ew-resize;
@@ -1317,12 +1499,12 @@ label.checkbox.custom {
  left: auto;
  height: auto;
  width: auto; }
-  /* line 443, ../sass/controls/_controls.scss */
+  /* line 457, ../sass/controls/_controls.scss */
  .slider .range:hover {
    background: rgba(0, 153, 204, 0.7); }

 /******************************************************** BROWSER ELEMENTS */
-/* line 451, ../sass/controls/_controls.scss */
+/* line 465, ../sass/controls/_controls.scss */
 ::-webkit-scrollbar {
  -webkit-border-radius: 2px;
  -moz-border-radius: 2px;
@@ -1341,7 +1523,7 @@ label.checkbox.custom {
  height: 10px;
  width: 10px; }

-/* line 457, ../sass/controls/_controls.scss */
+/* line 471, ../sass/controls/_controls.scss */
 ::-webkit-scrollbar-thumb {
  background-image: -webkit-gradient(linear, 50% 0%, 50% 20, color-stop(0%, #666666), color-stop(100%, #595959));
  background-image: -webkit-linear-gradient(#666666, #595959 20px);
@@ -1360,7 +1542,7 @@ label.checkbox.custom {
  -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
  box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
  border-top: 1px solid gray; }
-  /* line 464, ../sass/controls/_controls.scss */
+  /* line 478, ../sass/controls/_controls.scss */
  ::-webkit-scrollbar-thumb:hover {
    background-image: -webkit-gradient(linear, 50% 0%, 50% 20, color-stop(0%, #808080), color-stop(100%, #737373));
    background-image: -webkit-linear-gradient(#808080, #737373 20px);
@@ -1368,7 +1550,7 @@ label.checkbox.custom {
    background-image: -o-linear-gradient(#808080, #737373 20px);
    background-image: linear-gradient(#808080, #737373 20px); }

-/* line 469, ../sass/controls/_controls.scss */
+/* line 483, ../sass/controls/_controls.scss */
 ::-webkit-scrollbar-corner {
  background: rgba(0, 0, 0, 0.4); }

@@ -1408,6 +1590,7 @@ label.checkbox.custom {
    -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
    -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
    box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
+    border: none;
    border-top: 1px solid #737373;
    color: #999999;
    display: inline-block;
@@ -1420,7 +1603,7 @@ label.checkbox.custom {
    .menu-element .menu ul {
      margin: 0;
      padding: 0; }
-      /* line 167, ../sass/_mixins.scss */
+      /* line 179, ../sass/_mixins.scss */
      .menu-element .menu ul li {
        list-style-type: none;
        margin: 0;
@@ -1535,6 +1718,7 @@ label.checkbox.custom {
      -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
      -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
      box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
+      border: none;
      border-top: 1px solid #a6a6a6;
      color: #999999;
      display: inline-block; }
@@ -1580,7 +1764,7 @@ label.checkbox.custom {
  right: 0;
  width: auto; }

-/* line 2, ../sass/forms/_elems.scss */
+/* line 3, ../sass/forms/_elems.scss */
 .form .section-header {
  -webkit-border-radius: 3px;
  -moz-border-radius: 3px;
@@ -1591,13 +1775,13 @@ label.checkbox.custom {
  font-size: 0.8em;
  margin-top: 5px;
  padding: 5px; }
-  /* line 8, ../sass/forms/_elems.scss */
+  /* line 9, ../sass/forms/_elems.scss */
  .form .section-header:first-child {
    margin-top: 0; }
-/* line 12, ../sass/forms/_elems.scss */
+/* line 13, ../sass/forms/_elems.scss */
 .form .form-section {
  position: relative; }
-/* line 16, ../sass/forms/_elems.scss */
+/* line 17, ../sass/forms/_elems.scss */
 .form .form-row {
  -webkit-box-sizing: border-box;
  -moz-box-sizing: border-box;
@@ -1608,7 +1792,7 @@ label.checkbox.custom {
  margin-top: 5px;
  padding: 5px;
  position: relative; }
-  /* line 25, ../sass/forms/_elems.scss */
+  /* line 24, ../sass/forms/_elems.scss */
  .form .form-row:first-child {
    border-top: none; }
  /* line 29, ../sass/forms/_elems.scss */
@@ -1623,24 +1807,34 @@ label.checkbox.custom {
    font-size: 0.75rem;
    line-height: 22px;
    min-height: 22px; }
-  /* line 39, ../sass/forms/_elems.scss */
+  /* line 38, ../sass/forms/_elems.scss */
  .form .form-row > .label {
    float: left;
    position: relative;
    white-space: nowrap;
    width: 20%; }
-  /* line 47, ../sass/forms/_elems.scss */
+  /* line 46, ../sass/forms/_elems.scss */
  .form .form-row .value {
    color: #cccccc; }
-  /* line 51, ../sass/forms/_elems.scss */
+  /* line 50, ../sass/forms/_elems.scss */
  .form .form-row .controls {
    float: left;
    position: relative;
    width: 79%; }
-  /* line 58, ../sass/forms/_elems.scss */
+    /* line 55, ../sass/forms/_elems.scss */
+    .form .form-row .controls .l-composite-control {
+      display: inline-block; }
+      /* line 57, ../sass/forms/_elems.scss */
+      .form .form-row .controls .l-composite-control.l-checkbox {
+        line-height: 14px;
+        margin-right: 5px; }
+    /* line 65, ../sass/forms/_elems.scss */
+    .form .form-row .controls .select {
+      margin-right: 5px; }
+  /* line 70, ../sass/forms/_elems.scss */
  .form .form-row .field-hints {
    color: #666666; }
-  /* line 62, ../sass/forms/_elems.scss */
+  /* line 74, ../sass/forms/_elems.scss */
  .form .form-row .selector-list {
    -webkit-border-radius: 3px;
    -moz-border-radius: 3px;
@@ -1651,7 +1845,7 @@ label.checkbox.custom {
    position: relative;
    height: 150px;
    max-width: 50%; }
-    /* line 70, ../sass/forms/_elems.scss */
+    /* line 82, ../sass/forms/_elems.scss */
    .form .form-row .selector-list .wrapper {
      overflow-y: auto;
      position: absolute;
@@ -1660,15 +1854,35 @@ label.checkbox.custom {
      bottom: 5px;
      left: 5px; }

-/* line 84, ../sass/forms/_elems.scss */
+/* line 96, ../sass/forms/_elems.scss */
 label.form-control.checkbox input {
  margin-right: 5px;
  vertical-align: top; }

-/* line 90, ../sass/forms/_elems.scss */
-.hint {
+/* line 103, ../sass/forms/_elems.scss */
+.hint,
+.s-hint {
  font-size: 0.9em; }

+/* line 107, ../sass/forms/_elems.scss */
+.l-result {
+  display: inline-block;
+  min-width: 32px;
+  min-height: 32px;
+  position: relative;
+  vertical-align: top; }
+  /* line 114, ../sass/forms/_elems.scss */
+  .l-result div.s-hint {
+    -webkit-border-radius: 3px;
+    -moz-border-radius: 3px;
+    -ms-border-radius: 3px;
+    -o-border-radius: 3px;
+    border-radius: 3px;
+    background: rgba(255, 153, 0, 0.8);
+    display: block;
+    color: #ffd699;
+    padding: 5px; }
+
 /* line 4, ../sass/forms/_validation.scss */
 .validates > .label {
  padding-right: 25px; }
@@ -1753,30 +1967,22 @@ input[type="text"] {
  -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
  -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
  box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
+  border: none;
  border-top: 1px solid #666666;
  color: #999999;
  display: inline-block;
-  margin-right: 5px;
-  margin-top: 1px;
-  padding: 0 25px 0 0;
-  position: relative;
-  overflow: hidden;
-  vertical-align: middle; }
-  /* line 115, ../sass/_mixins.scss */
+  cursor: pointer;
+  display: inline-block;
+  margin: 0 0 2px 2px;
+  position: relative; }
+  /* line 127, ../sass/_mixins.scss */
  .form-control.select:not(.disabled):hover {
    background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #666666), color-stop(100%, #4d4d4d));
    background-image: -webkit-linear-gradient(#666666, #4d4d4d);
    background-image: -moz-linear-gradient(#666666, #4d4d4d);
    background-image: -o-linear-gradient(#666666, #4d4d4d);
    background-image: linear-gradient(#666666, #4d4d4d); }
-  /* line 11, ../sass/forms/_selects.scss */
-  .form-control.select span.arw {
-    display: block;
-    pointer-events: none;
-    position: absolute;
-    right: 8%;
-    top: 10%; }
-  /* line 18, ../sass/forms/_selects.scss */
+  /* line 7, ../sass/forms/_selects.scss */
  .form-control.select select {
    -webkit-appearance: none;
    -moz-appearance: none;
@@ -1784,16 +1990,21 @@ input[type="text"] {
    -webkit-box-sizing: border-box;
    -moz-box-sizing: border-box;
    box-sizing: border-box;
-    border: none;
-    box-shadow: none;
-    background-color: transparent;
-    background-image: none;
+    background: none;
+    color: #999999;
+    border: none !important;
    cursor: pointer;
-    padding: 3px 5px 4px 5px;
-    width: 150%; }
-  /* line 32, ../sass/forms/_selects.scss */
-  .form-control.select select:focus {
-    outline: none; }
+    padding: 4px 25px 2px 5px; }
+  /* line 16, ../sass/forms/_selects.scss */
+  .form-control.select:after {
+    color: #0099cc;
+    content: "v";
+    display: block;
+    font-family: 'symbolsfont';
+    pointer-events: none;
+    position: absolute;
+    right: 5px;
+    top: 0; }

 /* line 2, ../sass/forms/_channel-selector.scss */
 .channel-selector .line {
@@ -1912,7 +2123,7 @@ input[type="text"] {
  -ms-border-radius: 3px;
  -o-border-radius: 3px;
  border-radius: 3px;
-  display: block;
+  display: inline-block;
  font-size: 1.3em;
  height: 22px;
  line-height: 22px;
@@ -2222,6 +2433,7 @@ input[type="text"] {
  -webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
  -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
  box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
+  border: none;
  border-top: 1px solid #666666;
  color: #999999;
  display: inline-block;
@@ -2488,7 +2700,7 @@ input[type="text"] {
    height: 5px;
    margin-top: -7px;
    top: 70%; }
-    /* line 87, ../sass/_mixins.scss */
+    /* line 99, ../sass/_mixins.scss */
    .split-layout.horizontal > .splitter:before {
      content: '';
      display: block;
@@ -2499,7 +2711,7 @@ input[type="text"] {
      top: 2px;
      left: 5px;
      right: 5px; }
-    /* line 108, ../sass/_mixins.scss */
+    /* line 120, ../sass/_mixins.scss */
    .split-layout.horizontal > .splitter:not(.disabled):hover:before {
      border-color: rgba(0, 153, 204, 0.9); }
 /* line 42, ../sass/helpers/_splitter.scss */
@@ -2521,7 +2733,7 @@ input[type="text"] {
  width: 5px;
  margin-left: -7px;
  left: 85%; }
-  /* line 87, ../sass/_mixins.scss */
+  /* line 99, ../sass/_mixins.scss */
  .split-layout.vertical > .splitter:before {
    content: '';
    display: block;
@@ -2532,7 +2744,7 @@ input[type="text"] {
    left: 2px;
    bottom: 5px;
    top: 5px; }
-  /* line 108, ../sass/_mixins.scss */
+  /* line 120, ../sass/_mixins.scss */
  .split-layout.vertical > .splitter:not(.disabled):hover:before {
    border-color: rgba(0, 153, 204, 0.9); }

--- a/platform/commonUI/general/res/css/tree.css
+++ b/platform/commonUI/general/res/css/tree.css
@@ -2,7 +2,7 @@
 ul.tree {
  margin: 0;
  padding: 0; }
-  /* line 167, ../sass/_mixins.scss */
+  /* line 179, ../sass/_mixins.scss */
  ul.tree li {
    list-style-type: none;
    margin: 0;
--- a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot
+++ b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot
--- a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg
+++ b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg
@@ -2,12 +2,12 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <svg>
 <metadata>
-Created by FontForge 20110222 at Mon Feb 23 21:13:56 2015
+Created by FontForge 20110222 at Thu Feb 26 00:33:43 2015
 By deploy user
 Copyright 2015 Adobe Systems Incorporated. All rights reserved.
 </metadata>
 <defs>
-<font id="WTDSymbols" horiz-adv-x="500" >
+<font id="WTDSymbols" horiz-adv-x="750" >
  <font-face 
    font-family="WTDSymbols"
    font-weight="400"
@@ -23,15 +23,15 @@ Copyright 2015 Adobe Systems Incorporated. All rights reserved.
    underline-position="-50"
    unicode-range="U+0020-2044"
  />
-<missing-glyph 
+<missing-glyph horiz-adv-x="500" 
 />
-    <glyph glyph-name=".notdef" 
+    <glyph glyph-name=".notdef" horiz-adv-x="500" 
 />
    <glyph glyph-name=".null" horiz-adv-x="0" 
 />
    <glyph glyph-name="nonmarkingreturn" horiz-adv-x="333" 
 />
-    <glyph glyph-name="space" unicode=" " 
+    <glyph glyph-name="space" unicode=" " horiz-adv-x="500" 
 />
    <glyph glyph-name="exclam" unicode="!" horiz-adv-x="636" 
 d="M476 730q65 0 112.5 -46.5t47.5 -111.5v-413q0 -66 -47 -112.5t-113 -46.5h-317q-66 0 -112.5 46.5t-46.5 112.5v413q0 65 46.5 111.5t112.5 46.5h317zM405 108v63q0 8 -6.5 13.5t-13.5 5.5h-135q-21 0 -21 -19v-63q0 -10 6.5 -16t14.5 -6h135q7 0 13.5 6.5t6.5 15.5z
@@ -74,7 +74,7 @@ d="M352 0l-352 367l352 368v-735z" />
 d="M352 366l-352 -366v735z" />
    <glyph glyph-name="A" unicode="A" horiz-adv-x="812" 
 d="M446 735l366 -368l-366 -367l-130 130l147 147h-156q-51 -76 -140 -76q-69 0 -118 48.5t-49 117.5t49 117.5t118 48.5q90 0 140 -75h156l-147 146zM167 295q30 0 51 21.5t21 50.5q0 30 -21 51.5t-51 21.5t-52 -21.5t-22 -51.5q0 -29 22.5 -50.5t51.5 -21.5z" />
-    <glyph glyph-name="C" unicode="C" horiz-adv-x="750" 
+    <glyph glyph-name="C" unicode="C" 
 d="M374 750q157 0 266.5 -109t109.5 -267q0 -155 -110 -264.5t-266 -109.5q-154 0 -264 110t-110 264q0 158 109.5 267t264.5 109zM558 281q7 14 3 29.5t-18 22.5l-131 68v260q0 36 -38 36q-16 0 -26 -9.5t-10 -26.5v-309l167 -85q9 -4 20 -4q22 0 33 18z" />
    <glyph glyph-name="D" unicode="D" horiz-adv-x="811" 
 d="M719 418q76 26 92 40v-313q0 -56 -116 -93.5t-287 -37.5t-289.5 37.5t-118.5 93.5v313q57 -30 97 -40q131 -43 311 -43q182 0 311 43zM811 615q0 -55 -117 -95t-286 -40t-288.5 40t-119.5 95q0 52 119.5 89.5t288.5 37.5t286 -37.5t117 -89.5z" />
@@ -90,7 +90,7 @@ q3 -16 3 -50zM361 224q66 0 113 45.5t47 111.5q0 65 -47 112.5t-113 47.5q-65 0 -112
 d="M0 0v700h180v-700h-180zM297 0v700h180v-700h-180zM594 192v508h180v-508h-180z" />
    <glyph glyph-name="I" unicode="I" horiz-adv-x="853" 
 d="M635 582h-439l220 200zM663 209v349l190 -174zM169 558v-349l-191 175zM196 185h439l-219 -199z" />
-    <glyph glyph-name="J" unicode="J" 
+    <glyph glyph-name="J" unicode="J" horiz-adv-x="500" 
 />
    <glyph glyph-name="L" unicode="L" horiz-adv-x="817" 
 d="M0 575q0 67 47 113.5t114 46.5h303v-735h-303q-67 0 -114 47t-47 113v415zM652 735q66 0 113.5 -46.5t47.5 -113.5v-172h-271v332h110zM542 0v324h271v-164q0 -66 -47.5 -113t-113.5 -47h-110z" />
@@ -120,7 +120,7 @@ d="M339 727l340 -236v-491h-340h-339v491zM339 255l252 176l-252 174l-252 -174z" />
    <glyph glyph-name="X" unicode="X" horiz-adv-x="753" 
 d="M471 471v-95h-95v-94h-94v94h-94v95h94v94h94v-94h95zM753 94l-94 -94l-149 149q-81 -55 -181 -55q-137 0 -232 97q-97 95 -97 233q0 137 97 232q95 97 232 97q138 0 233 -97q97 -95 97 -232q0 -100 -55 -181zM329 235q79 0 134 55t55 134q0 78 -55 133t-134 55
 q-78 0 -133 -55t-55 -133q0 -79 55 -134t133 -55z" />
-    <glyph glyph-name="Y" unicode="Y" 
+    <glyph glyph-name="Y" unicode="Y" horiz-adv-x="500" 
 d="M471 471v-95h-283v95h283zM753 94l-94 -94l-149 149q-81 -55 -181 -55q-137 0 -232 97q-97 95 -97 233q0 137 97 232q95 97 232 97q138 0 233 -97q97 -95 97 -232q0 -100 -55 -181zM329 235q79 0 134 55t55 134q0 78 -55 133t-134 55q-78 0 -133 -55t-55 -133
 q0 -79 55 -134t133 -55z" />
    <glyph glyph-name="Z" unicode="Z" horiz-adv-x="808" 
@@ -199,11 +199,25 @@ d="M0 0l131 262l-131 262h91l132 -262l-132 -262h-91z" />
    <glyph glyph-name="asciitilde" unicode="~" horiz-adv-x="799" 
 d="M658 363h141q-36 -150 -70 -227q-28 -58 -58 -88q-45 -46 -102 -48h-7q-55 0 -98 40q-34 31 -60 86q-35 72 -71 222q-35 137 -61 194q-9 18 -17.5 30t-12.5 15t-6 3q-3 0 -8 -4t-14.5 -18t-19.5 -35q-28 -62 -53 -170h-141q36 152 70 227q25 57 58 88q41 42 102 49
 q57 2 105 -40q33 -31 60 -86q34 -73 70 -222q36 -140 62 -194q9 -18 17.5 -30t12.5 -15.5t5 -3.5q15 0 42 57q30 66 54 170z" />
+    <glyph glyph-name="agrave" unicode="&#xe0;" horiz-adv-x="753" 
+d="M752 141q0 -59 -41 -100t-100 -41h-470q-59 0 -100 41t-41 100v470q0 59 41 100t100 41h470q59 0 100 -41t41 -100v-470z" />
+    <glyph glyph-name="aacute" unicode="&#xe1;" 
+d="M750 469l-375 -282l-375 282l375 281zM375 94l312 234l63 -47l-375 -281l-375 281l63 47z" />
+    <glyph glyph-name="acircumflex" unicode="&#xe2;" 
+d="M47 328q-19 0 -33 14t-14 33t14 33t33 14h656q19 0 33 -14t14 -33t-14 -33t-33 -14h-656z" />
+    <glyph glyph-name="atilde" unicode="&#xe3;" horiz-adv-x="749" 
+d="M655 749q39 0 66.5 -27.5t27.5 -66.5v-561q0 -39 -27.5 -66.5t-66.5 -27.5h-561q-39 0 -66.5 27.5t-27.5 66.5v561q0 39 27.5 66.5t66.5 27.5h561zM655 94v561h-561v-561h561zM234 562l187 -188l94 94l94 -94v-234h-469v328z" />
+    <glyph glyph-name="adieresis" unicode="&#xe4;" 
+d="M0 750h750v-94v-47v-47h-94v47h-187v-515h140v-94h-468v94h140v515h-187v-47h-94v47v47v94z" />
+    <glyph glyph-name="aring" unicode="&#xe5;" 
+d="M656 750q39 0 66.5 -27.5t27.5 -66.5v-562q0 -39 -27.5 -66.5t-66.5 -27.5h-562q-39 0 -66.5 27.5t-27.5 66.5v562q0 39 27.5 66.5t66.5 27.5h562zM94 656v-562h234v562h-234zM656 94v562h-234v-562h234z" />
+    <glyph glyph-name="ccedilla" unicode="&#xe7;" 
+d="M656 750q39 0 66.5 -27.5t27.5 -66.5v-562q0 -39 -27.5 -66.5t-66.5 -27.5h-562q-39 0 -66.5 27.5t-27.5 66.5v562q0 39 27.5 66.5t66.5 27.5h562zM656 94v562h-234v-562h234z" />
    <glyph glyph-name="fraction" unicode="&#x2044;" horiz-adv-x="761" 
 d="M380 751q158 0 269.5 -111.5t111.5 -268.5q0 -133 -82.5 -236.5t-209.5 -134.5l-4 491l-176 -490q-126 31 -207.5 134.5t-81.5 235.5q0 157 111.5 268.5t268.5 111.5zM168 488l55 20l-34 94l-56 -20zM410 530v100h-59v-100h59zM593 488l34 94l-55 20l-34 -94z" />
    <glyph glyph-name="H.002" horiz-adv-x="803" 
 d="M0 0v726h187v-726h-187zM308 0v726h187v-726h-187zM616 199v527h187v-527h-187z" />
-    <glyph glyph-name="H.001" 
+    <glyph glyph-name="H.001" horiz-adv-x="500" 
 />
  </font>
 </defs></svg>
--- a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf
+++ b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf
--- a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff
+++ b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff
--- a/platform/commonUI/general/res/sass/_constants.scss
+++ b/platform/commonUI/general/res/sass/_constants.scss
@@ -23,6 +23,7 @@ $colorFormRequired: #ffc700;
 $colorFormValid: #33cc33;
 $colorFormError: #cc0000;
 $colorFormInvalid: #ff9900;
+$colorGridLines: rgba(#fff, 0.05);


 // Ratios
--- a/platform/commonUI/general/res/sass/_fixed-position.scss
+++ b/platform/commonUI/general/res/sass/_fixed-position.scss
@@ -0,0 +1,107 @@
+.t-fixed-position {
+	&.l-fixed-position {
+//		@include test(red);
+		position: absolute;
+		top: 0; right: 0; bottom: 0; left: 0;
+		width: auto; height: auto;
+
+		.l-grid-holder {
+			position: relative;
+			height: 100%; width: 100%;
+			.l-grid {
+//				@include test(orange);
+				position: absolute;
+				height: 100%; width: 100%;
+				pointer-events: none;
+				z-index: 0;
+				&.l-grid-x {
+					@include bgTicks($colorGridLines, 'x');
+				}
+
+				&.l-grid-y {
+					@include bgTicks($colorGridLines, 'y');
+				}
+			}
+		}
+	}
+
+	.l-fixed-position-item {
+		position: absolute;
+		border: 1px solid transparent;
+
+		&.s-selected {
+			@include boxShdwLarge();
+			border-color: $colorKey;
+			cursor: move;
+		}
+		&.s-not-selected {
+			opacity: 0.8;
+		}
+
+		.l-fixed-position-box,
+		.l-fixed-position-image,
+		.l-fixed-position-text {
+			@include box-sizing(border-box);
+			height: 100%; width: 100%;
+		}
+
+		.l-fixed-position-box {
+		}
+		
+		.l-fixed-position-image {
+			background-size: cover;
+			background-repeat: no-repeat;
+			background-position: left top;
+		}
+
+		.l-fixed-position-text {
+			@include txtShdwSubtle();
+			border:1px solid transparent;
+			font-size: 0.8rem;
+			$p: $interiorMarginSm;
+			&.l-static-text {
+//				overflow: auto;
+				padding: $p;
+			}
+			&.l-telemetry {
+				.l-elem {
+					@include absPosDefault($p);
+					@include box-sizing(border-box);
+					width: 50%;
+					&.l-title {
+						right: auto;
+						left: $p;
+					}
+					&.l-value {
+//                        @include test(blue);
+						right: $p;
+						left: auto;
+						text-align: right;
+						&.telem-only {
+//							@include test(red);
+							left: $p;
+							width: auto;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	.l-fixed-position-item-handle {
+		$brd: 1px solid $colorKey;
+		//		@include border-radius($controlCr);
+		background: rgba($colorKey, 0.5);
+		cursor: crosshair;
+		border: $brd;
+		position: absolute;
+	}
+}
+
+.edit-mode .t-fixed-position {
+	.l-fixed-position-item {
+		&:not(.s-selected):hover {
+			border: 1px dotted rgba($colorKey, 0.5);
+		}
+	}
+}
--- a/platform/commonUI/general/res/sass/_icons.scss
+++ b/platform/commonUI/general/res/sass/_icons.scss
@@ -56,6 +56,7 @@

 .object-header .type-icon {
    color: $colorAlt1;
+	margin-right: $interiorMargin;
 }

 .menu .type-icon,
--- a/platform/commonUI/general/res/sass/_main.scss
+++ b/platform/commonUI/general/res/sass/_main.scss
@@ -9,11 +9,13 @@
@import "global";
@import "fonts";
@import "user-environ/layout";
+@import "fixed-position";
@import "about";
@import "badges";
@import "icons";
@import "lists/tabular";
@import "controls/buttons";
+@import "controls/color-palette";
@import "controls/controls";
@import "controls/lists";
@import "controls/menus";
--- a/platform/commonUI/general/res/sass/_mixins.scss
+++ b/platform/commonUI/general/res/sass/_mixins.scss
@@ -6,9 +6,13 @@
 }

@mixin trans-prop-nice-fade($t: 0.5s) {
-    @include transition-property(visibility, opacity, background-color);
-    @include transition-duration($t);
-    @include transition-timing-function(ease-in-out);
+	@if $t == 0 {
+		@include transition-property(none);
+	} @else {
+		@include transition-property(visibility, opacity, background-color, border-color);
+		@include transition-duration($t);
+		@include transition-timing-function(ease-in-out);
+	}
 }

@mixin trans-prop-nice-resize-h($t: 0.5s) {
@@ -48,13 +52,20 @@
 	background-size: $d $d;
 }

-@mixin bgTicks($c: $colorBodyFg) {
-	$c: $c;
-	@include background-image(linear-gradient(90deg,
+@mixin bgTicks($c: $colorBodyFg, $repeatDir: 'x') {
+	$deg: 90deg;
+	@if ($repeatDir != 'x') {
+		$deg: 0deg;
+		$repeatDir: repeat-y;
+	} @else {
+		$repeatDir: repeat-x;
+	}
+
+	@include background-image(linear-gradient($deg,
 		$c 1px, transparent 1px,
 		transparent 100%
 	));
-	background-repeat: repeat-x;
+	background-repeat: $repeatDir;
 }

@mixin containerSubtle($bg: $colorBodyBg, $fg: $colorBodyFg, $hover: false) {
@@ -63,6 +74,7 @@
 	@include box-sizing(border-box);
 //	@include box-shadow(rgba(black, 0.3) 0 1px 2px);
 	@include boxShdwSubtle();
+	border: none;
 	border-top: 1px solid lighten($bg, 20%);
 	color: $fg;
 	display: inline-block;
--- a/platform/commonUI/general/res/sass/controls/_color-palette.scss
+++ b/platform/commonUI/general/res/sass/controls/_color-palette.scss
@@ -0,0 +1,55 @@
+.l-color-palette {
+	$d: 16px;
+	$colorsPerRow: 10;
+	$m: 1;
+	$colorSelectedColor: #fff;
+
+	@include box-sizing(border-box);
+	padding: $interiorMargin !important;
+
+	.l-palette-row {
+		@include clearfix;
+		line-height: $d;
+		width: ($d * $colorsPerRow) + ($m * $colorsPerRow);
+
+		.l-palette-item {
+			@include box-sizing(border-box);
+			@include txtShdwSubtle(0.8);
+			@include trans-prop-nice-fade(0.25s);
+			border: 1px solid transparent;
+			color: $colorSelectedColor;
+			display: block;
+			font-family: 'symbolsfont';
+			float: left;
+			height: $d; width: $d;
+			line-height: $d;
+			margin: 0 ($m * 1px) ($m * 1px) 0;
+			text-align: center;
+			vertical-align: middle;
+		}
+
+		.s-palette-item {
+			&:hover {
+				@include trans-prop-nice-fade(0);
+				border-color: $colorSelectedColor !important;
+			}
+		}
+
+		.l-palette-item-label {
+			margin-left: $interiorMargin;
+		}
+
+		&.l-option-row {
+			margin-bottom: $interiorMargin;
+			.s-palette-item {
+				border-color: $colorBodyFg;
+			}
+		}
+	}
+
+
+
+
+
+
+}
--- a/platform/commonUI/general/res/sass/controls/_controls.scss
+++ b/platform/commonUI/general/res/sass/controls/_controls.scss
@@ -154,6 +154,15 @@
 	}
 }

+.l-composite-control {
+	vertical-align: middle;
+	&.l-checkbox {
+		.composite-control-label {
+			line-height: 18px;
+		}
+	}
+}
+
 .control-group {
 	// Buttons that have a conceptual grouping - internal space between, and a divider between groups.
 	//	@include test();
@@ -215,6 +224,7 @@ label.checkbox.custom {
 	margin-right: $interiorMargin * 4;
 	padding-left: $d + $interiorMargin;
 	position: relative;
+	vertical-align: top;
 	em {
 		color: $colorBodyFg;
 		display: inline-block;
@@ -308,6 +318,10 @@ label.checkbox.custom {
 		}
 	}

+    .l-click-area {
+//        @include test();
+    }
+
 	.type-icon {
 		margin-right: $interiorMargin;
 	}
@@ -364,10 +378,10 @@ label.checkbox.custom {
 .top-bar,
 .object-browse-bar {
 	.object-header {
-		font-size: 1.2em;
+		font-size: 1.1em;
 		span {
 			display: inline-block;
-			margin-right: $interiorMargin;
+//			margin-right: $interiorMargin;
 		}
 	}
 }
--- a/platform/commonUI/general/res/sass/forms/_elems.scss
+++ b/platform/commonUI/general/res/sass/forms/_elems.scss
@@ -1,4 +1,5 @@
 .form {
+//	@include test(orange);
 	.section-header {
 		@include border-radius(3px);
 		background: rgba(white, 0.1);
@@ -16,18 +17,16 @@
 	.form-row {
 		@include box-sizing(border-box);
 		@include clearfix;
-		//		background: rgba(#00ff00, 0.1);
 		border-top: 1px solid $colorInteriorBorder;
-		//		box-sizing: border-box;
 		margin-top: $interiorMargin;
 		padding: $interiorMargin;
 		position: relative;
 		&:first-child {
 			border-top: none;
 		}
+
 		.label,
 		.controls {
-			//			background: rgba(#ffcc00, 0.1);
 			@include box-sizing(border-box);
 			@include clearfix;
 			box-sizing: border-box;
@@ -50,9 +49,22 @@

 		.controls {
 			float: left;
-//			padding-left: $interiorMargin;
            position: relative;
 			width: 99% - $formLabelW; // Start with less than 100% for Firefox
+
+			.l-composite-control {
+				display: inline-block;
+				&.l-checkbox {
+//					@include test();
+//					height: $formRowCtrlsH;
+					line-height: $formRowCtrlsH;
+					margin-right: 5px;
+				}
+			}
+
+			.select {
+				margin-right: $interiorMargin;
+			}
 		}

 		.field-hints {
@@ -87,6 +99,23 @@ label.form-control.checkbox {
 	}
 }

-.hint {
+.hint,
+.s-hint {
 	font-size: 0.9em;
+}
+
+.l-result {
+	// Used in /vista/channel-query.html and evr-query.html as of 2/24/15
+	display: inline-block;
+	min-width: 32px; min-height: 32px;
+	position: relative;
+	vertical-align: top;
+
+	div.s-hint {
+		@include border-radius($basicCr);
+		background: rgba($colorFormInvalid, 0.8);
+		display: block;
+		color: lighten($colorFormInvalid, 30%);
+		padding: $interiorMargin;
+	}
 }
--- a/platform/commonUI/general/res/sass/forms/_filter.scss
+++ b/platform/commonUI/general/res/sass/forms/_filter.scss
@@ -20,7 +20,7 @@
 	}
 	.icon.ui-symbol {
 		@include border-radius($controlCr);
-		display: block;
+		display: inline-block;
 		font-size: 1.3em;
 		height: $formInputH;
 		line-height: $formInputH;
--- a/platform/commonUI/general/res/sass/forms/_selects.scss
+++ b/platform/commonUI/general/res/sass/forms/_selects.scss
@@ -1,35 +1,26 @@
 .form-control.select {
-	$myH: $formInputH + 1;
 	@include btnSubtle($colorBodyBg);
-	margin-right: $interiorMargin;
-	margin-top: 1px;
-	padding: 0 25px 0 0;
+	cursor: pointer;
+	display: inline-block;
+	margin: 0 0 2px 2px; // Needed to avoid dropshadow from being clipped by parent containers
 	position: relative;
-	overflow: hidden;
-	vertical-align: middle;
-	
-	span.arw {
-		display: block;
-		pointer-events: none;
-		position: absolute;
-		right: 8%; top: 10%;
-	}
-
 	select {
 		@include appearance(none);
 		@include box-sizing(border-box);
-		border: none;
-		box-shadow: none;
-		background-color: transparent;
-		background-image: none;
+		background: none;
+		color: $colorBodyFg;
+		border: none !important;
 		cursor: pointer;
-//		height: $myH;
-//		line-height: $myH;
-		padding: 3px 5px 4px 5px;
-		width: 150%;
+		padding: 4px 25px 2px 5px;
 	}
-
-	select:focus {
-		outline: none;
+	&:after {
+		color: $colorKey;
+		content:"v";
+		display: block;
+		font-family: 'symbolsfont';
+		pointer-events: none;
+		position: absolute;
+		right: $interiorMargin; top: 0;
+//		z-index: 2;
 	}
 }
--- a/platform/commonUI/general/res/templates/controls/action-button.html
+++ b/platform/commonUI/general/res/templates/controls/action-button.html
@@ -1,5 +1,4 @@
-<a href=""
-   class="t-btn l-btn s-btn s-icon-btn s-very-subtle"
+<a class="t-btn l-btn s-btn s-icon-btn s-very-subtle"
   ng-class="{ labeled: parameters.labeled }"
   title="{{parameters.action.getMetadata().description}}"
   ng-click="parameters.action.perform()">
--- a/platform/commonUI/general/res/templates/controls/switcher.html
+++ b/platform/commonUI/general/res/templates/controls/switcher.html
@@ -24,10 +24,11 @@
        </div>
    </div>

-    <span class="btn"
+	<!-- CH commented out 2/24/15 - really don't think we need this. Single view is what it is. -->
+    <!--span class="btn"
          ng-if="view.length === 1">
        <span class="ui-symbol icon type-icon">{{ngModel.selected.glyph}}</span>
        <span>{{ngModel.selected.name}}</span>
-    </span>
+    </span-->

 </span>