tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #3815 from vvlladd28/improvement/safari/admin-widget 

UI: Fixed admin widget in safari browser; Fixed order action button
pull/3831/head
Igor Kulikov 6 years ago
committed by GitHub
parent
e65b09abec f133551e98
commit
6027958c24
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      application/src/main/data/json/system/widget_bundles/entity_admin_widgets.json
  2. 20
      ui-ngx/src/app/modules/home/components/widget/action/custom-sample-html.raw

6
application/src/main/data/json/system/widget_bundles/entity_admin_widgets.json
View File

File diff suppressed because one or more lines are too long

20
ui-ngx/src/app/modules/home/components/widget/action/custom-sample-html.raw
View File

@ -178,17 +178,17 @@
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<!-- <div mat-dialog-actions fxLayout="row" fxLayoutAlign="end center">--> <!-- <div mat-dialog-actions fxLayout="row" fxLayoutAlign="end center">-->
<!-- <button mat-button mat-raised-button color="primary"-->
<!-- type="submit"-->
<!-- [disabled]="(isLoading$ | async) || editEntityForm.invalid || !editEntityForm.dirty">-->
<!-- Save-->
<!-- </button>-->
<!-- <button mat-button color="primary"--> <!-- <button mat-button color="primary"-->
<!-- type="button"--> <!-- type="button"-->
<!-- [disabled]="(isLoading$ | async)"--> <!-- [disabled]="(isLoading$ | async)"-->
<!-- (click)="cancel()" cdkFocusInitial>--> <!-- (click)="cancel()" cdkFocusInitial>-->
<!-- Cancel--> <!-- Cancel-->
<!-- </button>--> <!-- </button>-->
<!-- <button mat-button mat-raised-button color="primary"-->
<!-- type="submit"-->
<!-- [disabled]="(isLoading$ | async) || editEntityForm.invalid || !editEntityForm.dirty">-->
<!-- Save-->
<!-- </button>-->
<!-- </div>--> <!-- </div>-->
<!--</form>--> <!--</form>-->
<!----> <!---->
@ -338,16 +338,16 @@
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<!-- <div mat-dialog-actions fxLayout="row" fxLayoutAlign="end center">--> <!-- <div mat-dialog-actions fxLayout="row" fxLayoutAlign="end center">-->
<!-- <button mat-button mat-raised-button color="primary"-->
<!-- type="submit"-->
<!-- [disabled]="(isLoading$ | async) || addEntityForm.invalid || !addEntityForm.dirty">-->
<!-- Create-->
<!-- </button>-->
<!-- <button mat-button color="primary"--> <!-- <button mat-button color="primary"-->
<!-- type="button"--> <!-- type="button"-->
<!-- [disabled]="(isLoading$ | async)"--> <!-- [disabled]="(isLoading$ | async)"-->
<!-- (click)="cancel()" cdkFocusInitial>--> <!-- (click)="cancel()" cdkFocusInitial>-->
<!-- Cancel--> <!-- Cancel-->
<!-- </button>--> <!-- </button>-->
<!-- <button mat-button mat-raised-button color="primary"-->
<!-- type="submit"-->
<!-- [disabled]="(isLoading$ | async) || addEntityForm.invalid || !addEntityForm.dirty">-->
<!-- Create-->
<!-- </button>-->
<!-- </div>--> <!-- </div>-->
<!--</form>--> <!--</form>-->

Write Preview
Loading…
Cancel
Save