Quick fix for buttons on notification pages (still needs a complete rework)

pull/4043/head
twanariens 4 years ago
parent dd94784642
commit b9680bb99a

@ -1,6 +1,6 @@
<settings-menu> <settings-menu>
</settings-menu> </settings-menu>
<div *ngIf="form" class="container"> <div *ngIf="form" class="small-middle-container">
<fieldset> <fieldset>
<legend>Mobile Notifications</legend> <legend>Mobile Notifications</legend>
@ -47,7 +47,7 @@
<div class="md-form-field "> <div class="md-form-field ">
<div> <div>
<button mat-raised-button type="submit " color="primary" [disabled]="form.invalid ">Submit</button> <button mat-raised-button type="submit " color="accent" [disabled]="form.invalid ">Submit</button>
</div> </div>
</div> </div>
</form> </form>

@ -11,6 +11,7 @@ import { MatTableDataSource } from "@angular/material/table";
@Component({ @Component({
templateUrl: "./cloudmobile.component.html", templateUrl: "./cloudmobile.component.html",
styleUrls: ["./notificationtemplate.component.scss"]
}) })
export class CloudMobileComponent implements OnInit { export class CloudMobileComponent implements OnInit {

@ -42,7 +42,7 @@
<div class="form-group"> <div class="form-group">
<div> <div>
<button [disabled]="form.invalid" type="button" (click)="test(form)" class="btn btn-primary-outline"> <button [disabled]="form.invalid" mat-raised-button type="button" (click)="test(form)" class="btn btn-primary-outline">
Test Test
<div id="spinner"></div> <div id="spinner"></div>
</button> </button>
@ -53,7 +53,7 @@
<div class="form-group"> <div class="form-group">
<div> <div>
<button [disabled]="form.invalid" type="submit" id="save" class="btn btn-primary-outline">Submit</button> <button [disabled]="form.invalid" mat-raised-button type="submit" id="save" class="btn btn-primary-outline">Submit</button>
</div> </div>
</div> </div>
</form> </form>

@ -47,7 +47,7 @@
<div class="form-group"> <div class="form-group">
<div> <div>
<button [disabled]="form.invalid" type="button" (click)="test(form)" class="btn btn-primary-outline"> <button [disabled]="form.invalid" mat-raised-button type="button" (click)="test(form)" class="btn btn-primary-outline">
Test Test
<div id="spinner"></div> <div id="spinner"></div>
</button> </button>
@ -58,7 +58,7 @@
<div class="form-group"> <div class="form-group">
<div> <div>
<button [disabled]="form.invalid" type="submit" id="save" class="btn btn-primary-outline">Submit</button> <button [disabled]="form.invalid" mat-raised-button type="submit" id="save" class="btn btn-primary-outline">Submit</button>
</div> </div>
</div> </div>
</form> </form>

@ -3,6 +3,7 @@
<div *ngIf="form" class="small-middle-container"> <div *ngIf="form" class="small-middle-container">
<fieldset> <fieldset>
<legend>Legacy Mobile Notifications</legend> <legend>Legacy Mobile Notifications</legend>
<div class="lmobile-container">
<div class="col-md-6"> <div class="col-md-6">
<form novalidate [formGroup]="form" (ngSubmit)="onSubmit(form)"> <form novalidate [formGroup]="form" (ngSubmit)="onSubmit(form)">
<div class="row"> <div class="row">
@ -33,7 +34,7 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row lmobile-actions">
<div class="form-group"> <div class="form-group">
<label for="select" class="control-label">Users</label> <label for="select" class="control-label">Users</label>
<div> <div>
@ -46,19 +47,19 @@
<div class="form-group"> <div class="form-group">
<div> <div>
<button [disabled]="form.invalid" type="button" (click)="test(form)" class="btn btn-danger-outline">Send Test Notification</button> <button [disabled]="form.invalid" mat-raised-button type="button" (click)="test(form)" class="btn btn-danger-outline">Send Test Notification</button>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<div> <div>
<button [disabled]="form.invalid" type="button" (click)="remove(form)" class="btn btn-danger-outline">Remove User</button> <button [disabled]="form.invalid" mat-raised-button type="button" (click)="remove(form)" class="btn btn-danger-outline">Remove User</button>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<div> <div>
<button [disabled]="form.invalid" type="submit" id="save" class="btn btn-primary-outline">Submit</button> <button [disabled]="form.invalid" mat-raised-button type="submit" id="save" class="btn btn-primary-outline">Submit</button>
</div> </div>
</div> </div>
</div> </div>
@ -66,8 +67,9 @@
</div> </div>
<div class="col-md-6"> <div class="col-md-6 issue-content">
<notification-templates [templates]="templates" [showSubject]="false"></notification-templates> <notification-templates [templates]="templates" [showSubject]="false"></notification-templates>
</div> </div>
</div>
</fieldset> </fieldset>
</div> </div>

@ -1,15 +1,30 @@
@import "~styles/shared.scss"; @import "~styles/shared.scss";
::ng-deep ngb-accordion > div.card {
color:white;
padding-top: 0px;
}
::ng-deep ngb-accordion > div.card > div.card-header {
padding:0px;
}
.small-middle-container{ .small-middle-container{
margin: auto; margin: auto;
width: 95%; width: 95%;
margin-top:10px; margin-top:10px;
} }
.lmobile-actions{
display:flex;
justify-content: left;
align-items:flex-end;
}
.lmobile-actions .form-group{
margin-right:10px;
}
.lmobile-container{
display:flex;
margin-top:10px;
}
.issue-content{
justify-content: flex-end;
}
.mat-raised-button{
margin-right:10px;
}

@ -32,7 +32,7 @@
<div class="form-group"> <div class="form-group">
<div> <div>
<button [disabled]="form.invalid" type="button" (click)="test(form)" class="btn btn-primary-outline"> <button [disabled]="form.invalid" mat-raised-button type="button" (click)="test(form)" class="btn btn-primary-outline">
Test Test
<div id="spinner"></div> <div id="spinner"></div>
</button> </button>
@ -43,7 +43,7 @@
<div class="form-group"> <div class="form-group">
<div> <div>
<button [disabled]="form.invalid" type="submit" id="save" class="btn btn-primary-outline">Submit</button> <button [disabled]="form.invalid" mat-raised-button type="submit" id="save" class="btn btn-primary-outline">Submit</button>
</div> </div>
</div> </div>
</form> </form>

@ -74,7 +74,7 @@
<div class="form-group"> <div class="form-group">
<div> <div>
<button [disabled]="form.invalid" type="button" (click)="test(form)" class="btn btn-primary-outline"> <button [disabled]="form.invalid" mat-raised-button type="button" (click)="test(form)" class="btn btn-primary-outline">
Test Test
<div id="spinner"></div> <div id="spinner"></div>
</button> </button>
@ -85,7 +85,7 @@
<div class="form-group"> <div class="form-group">
<div> <div>
<button [disabled]="form.invalid" type="submit" id="save" class="btn btn-primary-outline">Submit</button> <button [disabled]="form.invalid" mat-raised-button type="submit" id="save" class="btn btn-primary-outline">Submit</button>
</div> </div>
</div> </div>
</form> </form>

@ -57,7 +57,7 @@
<div class="form-group"> <div class="form-group">
<div> <div>
<button [disabled]="form.invalid" type="button" (click)="test(form)" class="btn btn-primary-outline"> <button [disabled]="form.invalid" mat-raised-button type="button" (click)="test(form)" class="btn btn-primary-outline">
Test Test
<div id="spinner"></div> <div id="spinner"></div>
</button> </button>
@ -68,7 +68,7 @@
<div class="form-group"> <div class="form-group">
<div> <div>
<button [disabled]="form.invalid" type="submit" id="save" class="btn btn-primary-outline">Submit</button> <button [disabled]="form.invalid" mat-raised-button type="submit" id="save" class="btn btn-primary-outline">Submit</button>
</div> </div>
</div> </div>
</form> </form>

@ -43,7 +43,7 @@
<div class="form-group"> <div class="form-group">
<div> <div>
<button [disabled]="form.invalid" type="button" (click)="test(form)" class="btn btn-primary-outline"> <button [disabled]="form.invalid" mat-raised-button type="button" (click)="test(form)" class="btn btn-primary-outline">
Test Test
<div id="spinner"></div> <div id="spinner"></div>
</button> </button>
@ -52,7 +52,7 @@
<div class="form-group"> <div class="form-group">
<div> <div>
<button [disabled]="form.invalid" type="submit" id="save" class="btn btn-primary-outline">Submit</button> <button [disabled]="form.invalid" mat-raised-button type="submit" id="save" class="btn btn-primary-outline">Submit</button>
</div> </div>
</div> </div>
</form> </form>

@ -31,7 +31,7 @@
<div class="form-group"> <div class="form-group">
<div> <div>
<button [disabled]="form.invalid" type="button" (click)="test(form)" class="btn btn-primary-outline"> <button [disabled]="form.invalid" mat-raised-button type="button" (click)="test(form)" class="btn btn-primary-outline">
Test Test
<div id="spinner"></div> <div id="spinner"></div>
</button> </button>
@ -40,7 +40,7 @@
<div class="form-group"> <div class="form-group">
<div> <div>
<button [disabled]="form.invalid" type="submit" id="save" class="btn btn-primary-outline">Submit</button> <button [disabled]="form.invalid" mat-raised-button type="submit" id="save" class="btn btn-primary-outline">Submit</button>
</div> </div>
</div> </div>
</form> </form>

@ -145,3 +145,15 @@
hr{ hr{
border-top: 1px solid $ombi-background-primary; border-top: 1px solid $ombi-background-primary;
} }
.form-control{
background-color: $ombi-background-accent;
color:#FFF;
border: 1px solid $ombi-background-accent;
}
.form-control:focus{
background-color: $ombi-background-accent;
color:#FFF;
border: 1px solid $ombi-active;
}

Loading…
Cancel
Save