[Merge] Merging open-master in; resolved conflicts

This commit is contained in:
Charles Hacskaylo
2015-06-15 16:47:23 -07:00
5 changed files with 154 additions and 29 deletions

View File

@ -87,10 +87,10 @@
</mct-chart>
<!-- TODO: Move into correct position; make part of group; infer from set of actions -->
<div class="gl-plot-local-controls"
<div class="l-local-controls gl-plot-local-controls"
ng-if="$first"
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"