[Themes] Resolve conflicts

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

platform/commonUI/general/res/templates/controls/action-button.html

@@ -19,7 +19,7 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<a class="btn s-btn s-icon-btn s-very-subtle key-{{parameters.action.getMetadata().key}}"
+<a class="s-btn key-{{parameters.action.getMetadata().key}}"
    ng-class="{ labeled: parameters.labeled }"
    title="{{parameters.action.getMetadata().description}}"
    ng-click="parameters.action.perform()">

platform/commonUI/general/res/templates/controls/action-group.html

@@ -20,17 +20,16 @@
  at runtime from the About dialog for additional information.
 -->
 <span ng-controller="ActionGroupController">
-
     <span ng-repeat="action in ungrouped">
-        <mct-include key="'action-button'" parameters="{ action: action }">
-        </mct-include>
+        <mct-include key="'action-button'" parameters="{ action: action }"></mct-include>
     </span>
-
-    <span class="btn-set" ng-repeat="group in groups">
+    <span class="l-btn-set" ng-repeat="group in groups">
         <span ng-repeat="action in group">
-            <mct-include key="'action-button'" parameters="{ action: action }">
+            <mct-include key="'action-button'"
+                         parameters="{ action: action }"
+                         ng-class="{ first:$index == 0, last:$index == group.length - 1 }"
+	            >
             </mct-include>
         </span>
     </span>
-
 </span>

platform/commonUI/general/res/templates/controls/selector.html

@@ -43,11 +43,11 @@
     </div>
     <div class='col col-2'>
         <div class='btn-holder valign-mid btns-add-remove'>
-            <a class='btn major'
+            <a class='s-btn major'
                ng-click="selector.select(selector.treeModel.selectedObject)">
                 <span class='ui-symbol'>&gt;</span>
             </a>
-            <a class='btn major'
+            <a class='s-btn major'
                ng-click="selector.deselect(selector.listModel.selectedObject)">
                 <span class='ui-symbol'>&lt;</span>
             </a>

platform/commonUI/general/res/templates/controls/switcher.html

@@ -21,7 +21,7 @@
 -->
 <span ng-controller="ViewSwitcherController">
     <div
-	    class="view-switcher menu-element s-btn l-btn btn-menu dropdown click-invoke"
+	    class="view-switcher menu-element s-menu"
 	    ng-if="view.length > 1"
 	    ng-controller="ClickAwayController as toggle"
 	    >
@@ -33,11 +33,9 @@
 	        ></span>
 
         <span class="ui-symbol icon type-icon">{{ngModel.selected.glyph}}</span>
-        <span class="name">{{ngModel.selected.name}}</span>
-        <span class='ui-symbol invoke-menu'>v</span>
+        <span class="title-label">{{ngModel.selected.name}}</span>
 
-
-        <div class="menu dropdown" ng-show="toggle.isActive()">
+        <div class="menu" ng-show="toggle.isActive()">
             <ul>
                 <li ng-repeat="option in view"
                     ng-click="ngModel.selected = option; toggle.setState(false)">

platform/commonUI/general/res/templates/indicator.html

@@ -22,7 +22,8 @@
 <div class='status block'
      title="{{ngModel.getDescription()}}"
      ng-click='ngModel.configure()'
-     ng-class='ngModel.getClass()'>
+     ng-class='ngModel.getClass()'
+     ng-show="ngModel.getText().length > 0">
     <span class="ui-symbol status-indicator"
           ng-class='ngModel.getGlyphClass()'>
         {{ngModel.getGlyph()}}
@@ -31,9 +32,9 @@
           ng-class='ngModel.getTextClass()'>
         {{ngModel.getText()}}
     </span>
-    <a href=''
-       class="ui-symbol"
-       ng-if="ngModel.configure">
-        G
-    </a>
+	<a href=''
+	   class="ui-symbol"
+	   ng-if="ngModel.configure">
+		G
+	</a>
 </div>

platform/commonUI/general/res/templates/menu/context-menu.html

@@ -20,7 +20,7 @@
  at runtime from the About dialog for additional information.
 -->
 <div class="menu-element context-menu-wrapper mobile-disable-select" ng-controller="ContextMenuController">
-    <div class="menu context-menu dropdown">
+    <div class="menu context-menu">
         <ul>
 
             <li ng-repeat="menuAction in menuActions"