Commit 23d2271d636d668d49b11f1088aa8d57359fe5a9
Committed by
Igor Kulikov
Igor Kulikov
1 parent
40b02ff7
Bugs/show action button (#1826)
Showing
2 changed files
with
4 additions
and
4 deletions
| @@ -25,7 +25,7 @@ div.tb-widget { | @@ -25,7 +25,7 @@ div.tb-widget { | ||
| 25 | transition: all .2s ease-in-out; | 25 | transition: all .2s ease-in-out; |
| 26 | 26 | ||
| 27 | .tb-widget-title { | 27 | .tb-widget-title { |
| 28 | - max-height: 60px; | 28 | + max-height: 65px; |
| 29 | padding-top: 5px; | 29 | padding-top: 5px; |
| 30 | padding-left: 5px; | 30 | padding-left: 5px; |
| 31 | overflow: hidden; | 31 | overflow: hidden; |
| @@ -44,11 +44,11 @@ div.tb-widget { | @@ -44,11 +44,11 @@ div.tb-widget { | ||
| 44 | 44 | ||
| 45 | .tb-widget-actions { | 45 | .tb-widget-actions { |
| 46 | z-index: 19; | 46 | z-index: 19; |
| 47 | - margin: 0; | 47 | + margin: 5px 0 0; |
| 48 | 48 | ||
| 49 | &-absolute{ | 49 | &-absolute{ |
| 50 | position: absolute; | 50 | position: absolute; |
| 51 | - top: 8px; | 51 | + top: 3px; |
| 52 | right: 8px; | 52 | right: 8px; |
| 53 | } | 53 | } |
| 54 | 54 |
| @@ -51,7 +51,7 @@ | @@ -51,7 +51,7 @@ | ||
| 51 | <tb-timewindow aggregation="{{vm.hasAggregation(widget)}}" ng-if="vm.hasTimewindow(widget)" ng-model="widget.config.timewindow"></tb-timewindow> | 51 | <tb-timewindow aggregation="{{vm.hasAggregation(widget)}}" ng-if="vm.hasTimewindow(widget)" ng-model="widget.config.timewindow"></tb-timewindow> |
| 52 | </div> | 52 | </div> |
| 53 | <div class="tb-widget-actions" layout="row" layout-align="start center" ng-show="vm.showWidgetActions(widget)" tb-mousedown="$event.stopPropagation()" | 53 | <div class="tb-widget-actions" layout="row" layout-align="start center" ng-show="vm.showWidgetActions(widget)" tb-mousedown="$event.stopPropagation()" |
| 54 | - ng-class="{'tb-widget-actions-absolute': !vm.showWidgetTitlePanel(widget) && !(vm.hasWidgetTitleTemplate(widget)||vm.showWidgetTitle(widget)||vm.hasAggregation(widget))}"> | 54 | + ng-class="{'tb-widget-actions-absolute': !(vm.showWidgetTitlePanel(widget)&&(vm.hasWidgetTitleTemplate(widget)||vm.showWidgetTitle(widget)||vm.hasAggregation(widget)))}"> |
| 55 | <md-button ng-repeat="action in vm.customWidgetHeaderActions(widget)" | 55 | <md-button ng-repeat="action in vm.customWidgetHeaderActions(widget)" |
| 56 | aria-label="{{action.displayName}}" | 56 | aria-label="{{action.displayName}}" |
| 57 | ng-show="!vm.isEdit" | 57 | ng-show="!vm.isEdit" |