dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugs/show action button (#1826)

Browse Source
This commit is contained in:
Vladyslav 2019-07-02 13:10:36 +03:00 committed by Igor Kulikov
parent 40b02ff7ff
commit 23d2271d63
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/src/app/components/dashboard.scss
View File

@ -25,7 +25,7 @@ div.tb-widget {
transition: all .2s ease-in-out; transition: all .2s ease-in-out;
.tb-widget-title { .tb-widget-title {
max-height: 60px; max-height: 65px;
padding-top: 5px; padding-top: 5px;
padding-left: 5px; padding-left: 5px;
overflow: hidden; overflow: hidden;
@ -44,11 +44,11 @@ div.tb-widget {
.tb-widget-actions { .tb-widget-actions {
z-index: 19; z-index: 19;
margin: 0; margin: 5px 0 0;
&-absolute{ &-absolute{
position: absolute; position: absolute;
top: 8px; top: 3px;
right: 8px; right: 8px;
} }

2
ui/src/app/components/dashboard.tpl.html
View File

@ -51,7 +51,7 @@
<tb-timewindow aggregation="{{vm.hasAggregation(widget)}}" ng-if="vm.hasTimewindow(widget)" ng-model="widget.config.timewindow"></tb-timewindow> <tb-timewindow aggregation="{{vm.hasAggregation(widget)}}" ng-if="vm.hasTimewindow(widget)" ng-model="widget.config.timewindow"></tb-timewindow>
</div> </div>
<div class="tb-widget-actions" layout="row" layout-align="start center" ng-show="vm.showWidgetActions(widget)" tb-mousedown="$event.stopPropagation()" <div class="tb-widget-actions" layout="row" layout-align="start center" ng-show="vm.showWidgetActions(widget)" tb-mousedown="$event.stopPropagation()"
ng-class="{'tb-widget-actions-absolute': !vm.showWidgetTitlePanel(widget) && !(vm.hasWidgetTitleTemplate(widget)||vm.showWidgetTitle(widget)||vm.hasAggregation(widget))}"> ng-class="{'tb-widget-actions-absolute': !(vm.showWidgetTitlePanel(widget)&&(vm.hasWidgetTitleTemplate(widget)||vm.showWidgetTitle(widget)||vm.hasAggregation(widget)))}">
<md-button ng-repeat="action in vm.customWidgetHeaderActions(widget)" <md-button ng-repeat="action in vm.customWidgetHeaderActions(widget)"
aria-label="{{action.displayName}}" aria-label="{{action.displayName}}"
ng-show="!vm.isEdit" ng-show="!vm.isEdit"