Commit 34ecde2c365c24db2c7416c9a83c278c81af9c86
Merge branch 'master' of github.com:thingsboard/thingsboard
Showing
2 changed files
with
37 additions
and
25 deletions
| @@ -15,28 +15,33 @@ | @@ -15,28 +15,33 @@ | ||
| 15 | limitations under the License. | 15 | limitations under the License. |
| 16 | 16 | ||
| 17 | --> | 17 | --> |
| 18 | -<button #toggleHelpButton | ||
| 19 | - *ngIf="!textMode" | ||
| 20 | - mat-icon-button | ||
| 21 | - color="primary" | ||
| 22 | - class="tb-help-popup-button tb-mat-32" | ||
| 23 | - type="button" | ||
| 24 | - (click)="toggleHelp()" | ||
| 25 | - matTooltip="{{'help.show-help' | translate}}" | ||
| 26 | - matTooltipPosition="above"> | ||
| 27 | - <mat-icon class="material-icons">{{popoverVisible ? 'help' : 'help_outline'}}</mat-icon> | ||
| 28 | - <mat-spinner *ngIf="popoverVisible && !popoverReady" class="tb-help-popup-button-loading" mode="indeterminate" diameter="20" strokeWidth="2"></mat-spinner> | ||
| 29 | -</button> | ||
| 30 | -<button #toggleHelpTextButton | ||
| 31 | - *ngIf="textMode" | ||
| 32 | - mat-button | ||
| 33 | - color="primary" | ||
| 34 | - class="tb-help-popup-text-button" | ||
| 35 | - [ngClass]="{'mat-stroked-button': popoverVisible && popoverReady}" | ||
| 36 | - (click)="toggleHelp()"> | ||
| 37 | - <ng-container *ngIf="triggerSafeHtml"> | ||
| 38 | - <span [style]="triggerStyle" [innerHTML]="triggerSafeHtml"></span> | ||
| 39 | - </ng-container> | ||
| 40 | - <mat-icon *ngIf="!popoverVisible || popoverReady" class="tb-mat-16">open_in_new</mat-icon> | ||
| 41 | - <mat-spinner *ngIf="popoverVisible && !popoverReady" mode="indeterminate" diameter="16" strokeWidth="2"></mat-spinner> | ||
| 42 | -</button> | 18 | +<fieldset class="tb-help-popup-button-container" *ngIf="!textMode"> |
| 19 | + <div #toggleHelpButton | ||
| 20 | + matTooltip="{{'help.show-help' | translate}}" | ||
| 21 | + matTooltipPosition="above" | ||
| 22 | + style="border-radius: 50%" | ||
| 23 | + (click)="toggleHelp()"> | ||
| 24 | + <button mat-icon-button | ||
| 25 | + color="primary" | ||
| 26 | + class="tb-help-popup-button tb-mat-32" | ||
| 27 | + type="button"> | ||
| 28 | + <mat-icon class="material-icons">{{popoverVisible ? 'help' : 'help_outline'}}</mat-icon> | ||
| 29 | + <mat-spinner *ngIf="popoverVisible && !popoverReady" class="tb-help-popup-button-loading" mode="indeterminate" diameter="20" strokeWidth="2"></mat-spinner> | ||
| 30 | + </button> | ||
| 31 | + </div> | ||
| 32 | +</fieldset> | ||
| 33 | +<fieldset class="tb-help-popup-button-container" *ngIf="textMode"> | ||
| 34 | + <div #toggleHelpTextButton | ||
| 35 | + (click)="toggleHelp()"> | ||
| 36 | + <button mat-button | ||
| 37 | + color="primary" | ||
| 38 | + class="tb-help-popup-text-button" | ||
| 39 | + [ngClass]="{'mat-stroked-button': popoverVisible && popoverReady}"> | ||
| 40 | + <ng-container *ngIf="triggerSafeHtml"> | ||
| 41 | + <span [style]="triggerStyle" [innerHTML]="triggerSafeHtml"></span> | ||
| 42 | + </ng-container> | ||
| 43 | + <mat-icon *ngIf="!popoverVisible || popoverReady" class="tb-mat-16">open_in_new</mat-icon> | ||
| 44 | + <mat-spinner *ngIf="popoverVisible && !popoverReady" mode="indeterminate" diameter="16" strokeWidth="2"></mat-spinner> | ||
| 45 | + </button> | ||
| 46 | + </div> | ||
| 47 | +</fieldset> |
| @@ -13,6 +13,13 @@ | @@ -13,6 +13,13 @@ | ||
| 13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | + | ||
| 17 | +.tb-help-popup-button-container { | ||
| 18 | + width: initial; | ||
| 19 | + display: inline-block; | ||
| 20 | + vertical-align: middle; | ||
| 21 | +} | ||
| 22 | + | ||
| 16 | .tb-help-popup-button { | 23 | .tb-help-popup-button { |
| 17 | position: relative; | 24 | position: relative; |
| 18 | .mat-progress-spinner { | 25 | .mat-progress-spinner { |