Merge branch 'master' of github.com:nasa/openmct into open967

platform/features/table/res/templates/historical-table.html

@@ -4,6 +4,6 @@
         rows="rows"
         enableFilter="true"
         enableSort="true"
-        class="tabular-holder t-exportable">
+        class="tabular-holder has-control-bar">
     </mct-table>
 </div>

platform/features/table/res/templates/mct-table.html

@@ -1,8 +1,10 @@
-<a class="s-button t-export icon-download labeled"
-   ng-click="exportAsCSV()"
-   title="Export This View's Data">
-    Export
-</a>
+<div class="l-control-bar">
+    <a class="s-button t-export icon-download labeled"
+       ng-click="exportAsCSV()"
+       title="Export This View's Data">
+        Export
+    </a>
+</div>
 <div class="l-view-section scrolling" style="overflow: auto;" mct-resize="resize()">
     <table class="sizing-table">
         <tbody>

platform/features/table/res/templates/rt-table.html

@@ -4,7 +4,7 @@
         rows="rows"
         enableFilter="true"
         enableSort="true"
-        class="tabular-holder t-exportable"
+        class="tabular-holder has-control-bar"
         auto-scroll="true">
     </mct-table>
 </div>