[Themes] Resolve conflicts

Resolve conflicts in preparation for merge, nasa/openmctweb#118

platform/features/imagery/res/templates/imagery.html

@@ -10,7 +10,7 @@
             ng-show="false && showLocalControls"
              >
             <a
-               class="t-btn l-btn s-btn s-icon-btn s-very-subtle"
+               class="s-btn"
                ng-click="plot.stepBackPanZoom()"
                ng-show="1"
                title="Restore previous pan/zoom">
@@ -18,7 +18,7 @@
             </a>
 
             <a
-               class="t-btn l-btn s-btn s-icon-btn s-very-subtle"
+               class="s-btn"
                ng-click="plot.unzoom()"
                ng-show="1"
                title="Reset pan/zoom">
@@ -36,7 +36,7 @@
         <div class="l-image-main-controlbar l-flex bar">
             <div class="left">
                 <a
-                    class="t-btn l-btn s-btn s-icon-btn s-very-subtle show-thumbs sm"
+                    class="s-btn show-thumbs sm hidden"
                     ng-click="showThumbsBubble = (showThumbsBubble)? false:true"
                     ><span class="ui-symbol icon"></span></a>
                 <span class="l-timezone">{{imagery.getZone()}}</span>
@@ -45,7 +45,7 @@
             </div>
             <div class="right">
                 <a
-                    class="t-btn l-btn s-btn s-icon-btn s-very-subtle pause-play sm"
+                    class="s-btn pause-play"
                     ng-click="imagery.paused(!imagery.paused())"
                     ng-class="{ paused: imagery.paused() }"
                     ><span class="ui-symbol icon"></span></a>
@@ -53,10 +53,10 @@
                    ng-if="imagery.getImageUrl()"
                    target="_blank"
                    title="Open image in new tab."
-                   class="t-btn l-btn s-btn s-icon-btn s-very-subtle sm">
+                   class="s-btn">
                     <span class="ui-symbol icon">y</span></a>
                 <a href=""
-                    class="l-btn s-btn s-icon-btn l-mag s-mag ui-symbol vsm"
+                    class="s-btn l-mag s-mag ui-symbol vsm"
                     ng-click="clipped = false"
                     ng-show="clipped === true"
                     title="Not all of image is visible; click to reset."

platform/features/layout/bundle.json

@@ -1,6 +1,6 @@
 {
     "name": "Layout components.",
-    "description": "Plug in adding Layout capabiltiies.",
+    "description": "Plug in adding Layout capabilities.",
     "extensions": {
         "views": [
             {
@@ -85,7 +85,7 @@
                                 },
                                 {
                                     "property": "fill",
-                                    "glyph": "\u00E0",
+                                    "glyph": "\ue606",
                                     "control": "color"
                                 },
                                 {

platform/features/layout/src/FixedController.js

@@ -229,6 +229,7 @@ define(
             // Position a panel after a drop event
             function handleDrop(e, id, position) {
                 // Don't handle this event if it has already been handled
+			  	// color is set to "" to let the CSS theme determine the default color
                 if (e.defaultPrevented) {
                     return;
                 }
@@ -240,7 +241,7 @@ define(
                     y: Math.floor(position.y / self.gridSize[1]),
                     id: id,
                     stroke: "transparent",
-                    color: "#cccccc",
+                    color: "",
                     titled: true,
                     width: DEFAULT_DIMENSIONS[0],
                     height: DEFAULT_DIMENSIONS[1]

platform/features/layout/src/elements/ElementFactory.js

@@ -44,8 +44,7 @@ define(
                 },
                 "fixed.text": {
                     fill: "transparent",
-                    stroke: "transparent",
-                    color: "#cccccc"
+                    stroke: "transparent"
                 }
             },
             DIALOGS = {

platform/features/plot/res/templates/plot.html

@@ -105,23 +105,21 @@
                  ng-show="representation.showControls"
                  style="position: absolute; top: 8px; right: 8px;">
 
-                <a href=""
-                   class="t-btn l-btn s-btn s-icon-btn s-very-subtle"
+                <a class="s-btn"
                    ng-click="plot.stepBackPanZoom()"
                    ng-show="plot.isZoomed()"
                    title="Restore previous pan/zoom">
                     <span class="ui-symbol icon">&lt;</span>
                 </a>
 
-                <a href=""
-                   class="t-btn l-btn s-btn s-icon-btn s-very-subtle"
+                <a class="s-btn"
                    ng-click="plot.unzoom()"
                    ng-show="plot.isZoomed()"
                    title="Reset pan/zoom">
                     <span class="ui-symbol icon">I</span>
                 </a>
 
-                <div class="menu-element btn s-very-subtle btn-menu dropdown menus-to-left"
+                <div class="menu-element s-menu menus-to-left"
                      ng-if="plot.getModeOptions().length > 1"
                      ng-controller="ClickAwayController as toggle">
 
@@ -129,9 +127,8 @@
 
                     <span class="ui-symbol icon type-icon">{{plot.getMode().glyph}}</span>
                     <span>{{plot.getMode().name}}</span>
-                    <span class='ui-symbol invoke-menu'>v</span>
 
-                    <div class="menu dropdown" ng-show="toggle.isActive()">
+                    <div class="menu" ng-show="toggle.isActive()">
                         <ul>
                             <li ng-repeat="option in plot.getModeOptions()">
                                 <a href="" ng-click="plot.setMode(option); toggle.setState(false)">