Commit b1dd779532b4a9657379b3c7b673470a74a643fb
1 parent
3cc9ad50
UI: Added to js/JSON editor always working fullscreen button (include fieldset tag disabled)
Showing
2 changed files
with
20 additions
and
12 deletions
| @@ -24,12 +24,16 @@ | @@ -24,12 +24,16 @@ | ||
| 24 | <button type='button' *ngIf="!disabled" mat-button class="tidy" (click)="beautifyJs()"> | 24 | <button type='button' *ngIf="!disabled" mat-button class="tidy" (click)="beautifyJs()"> |
| 25 | {{'js-func.tidy' | translate }} | 25 | {{'js-func.tidy' | translate }} |
| 26 | </button> | 26 | </button> |
| 27 | - <button type='button' mat-button mat-icon-button (click)="fullscreen = !fullscreen" | ||
| 28 | - class="tb-mat-32" | ||
| 29 | - matTooltip="{{(fullscreen ? 'fullscreen.exit' : 'fullscreen.expand') | translate}}" | ||
| 30 | - matTooltipPosition="above"> | ||
| 31 | - <mat-icon class="material-icons">{{ fullscreen ? 'fullscreen_exit' : 'fullscreen' }}</mat-icon> | ||
| 32 | - </button> | 27 | + <fieldset style="width: initial"> |
| 28 | + <div matTooltip="{{(fullscreen ? 'fullscreen.exit' : 'fullscreen.expand') | translate}}" | ||
| 29 | + matTooltipPosition="above" | ||
| 30 | + style="border-radius: 50%" | ||
| 31 | + (click)="fullscreen = !fullscreen"> | ||
| 32 | + <button type='button' mat-button mat-icon-button class="tb-mat-32"> | ||
| 33 | + <mat-icon class="material-icons">{{ fullscreen ? 'fullscreen_exit' : 'fullscreen' }}</mat-icon> | ||
| 34 | + </button> | ||
| 35 | + </div> | ||
| 36 | + </fieldset> | ||
| 33 | </div> | 37 | </div> |
| 34 | <div id="tb-javascript-panel" class="tb-js-func-panel" fxLayout="column" tb-toast toastTarget="{{toastTargetId}}"> | 38 | <div id="tb-javascript-panel" class="tb-js-func-panel" fxLayout="column" tb-toast toastTarget="{{toastTargetId}}"> |
| 35 | <div #javascriptEditor id="tb-javascript-input" [ngClass]="{'fill-height': fillHeight}"></div> | 39 | <div #javascriptEditor id="tb-javascript-input" [ngClass]="{'fill-height': fillHeight}"></div> |
| @@ -29,12 +29,16 @@ | @@ -29,12 +29,16 @@ | ||
| 29 | mat-button *ngIf="!readonly && !disabled" class="tidy" (click)="minifyJSON()"> | 29 | mat-button *ngIf="!readonly && !disabled" class="tidy" (click)="minifyJSON()"> |
| 30 | {{'js-func.mini' | translate }} | 30 | {{'js-func.mini' | translate }} |
| 31 | </button> | 31 | </button> |
| 32 | - <button type='button' mat-button mat-icon-button (click)="fullscreen = !fullscreen" | ||
| 33 | - class="tb-mat-32" | ||
| 34 | - matTooltip="{{(fullscreen ? 'fullscreen.exit' : 'fullscreen.expand') | translate}}" | ||
| 35 | - matTooltipPosition="above"> | ||
| 36 | - <mat-icon class="material-icons">{{ fullscreen ? 'fullscreen_exit' : 'fullscreen' }}</mat-icon> | ||
| 37 | - </button> | 32 | + <fieldset style="width: initial"> |
| 33 | + <div matTooltip="{{(fullscreen ? 'fullscreen.exit' : 'fullscreen.expand') | translate}}" | ||
| 34 | + matTooltipPosition="above" | ||
| 35 | + style="border-radius: 50%" | ||
| 36 | + (click)="fullscreen = !fullscreen"> | ||
| 37 | + <button type='button' mat-button mat-icon-button class="tb-mat-32"> | ||
| 38 | + <mat-icon class="material-icons">{{ fullscreen ? 'fullscreen_exit' : 'fullscreen' }}</mat-icon> | ||
| 39 | + </button> | ||
| 40 | + </div> | ||
| 41 | + </fieldset> | ||
| 38 | </div> | 42 | </div> |
| 39 | <div id="tb-json-panel" tb-toast toastTarget="{{toastTargetId}}" | 43 | <div id="tb-json-panel" tb-toast toastTarget="{{toastTargetId}}" |
| 40 | class="tb-json-content-panel" fxLayout="column"> | 44 | class="tb-json-content-panel" fxLayout="column"> |