Merge pull request #698 from Senyoret1/m-margin

Fixes for the modal windows bottom margin
skycoin · Mar 13, 2021 · 756e74b · 756e74b
2 parents c9a8103 + 49c029d
commit 756e74b
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 46 deletions.
diff --git a/static/skywire-manager-src/src/app/components/layout/edit-label/edit-label.component.html b/static/skywire-manager-src/src/app/components/layout/edit-label/edit-label.component.html
@@ -3,6 +3,6 @@
     <mat-form-field>
       <input #firstInput [placeholder]="'edit-label.label' | translate" formControlName="label" maxlength="66" matInput>
     </mat-form-field>
-    <app-button class="float-right" color="primary" (action)="save()">{{ 'common.save' | translate }}</app-button>
   </form>
+  <app-button class="float-right" color="primary" (action)="save()">{{ 'common.save' | translate }}</app-button>
 </app-dialog>
diff --git a/...-manager-src/src/app/components/layout/filters-selection/filters-selection.component.html b/...-manager-src/src/app/components/layout/filters-selection/filters-selection.component.html
@@ -21,15 +21,15 @@
         </mat-select>
       </mat-form-field>
     </ng-container>
-
-    <!-- button. -->
-    <app-button
-      #button
-      (action)="apply()"
-      color="primary"
-      class="float-right"
-    >
-      {{ 'common.ok' | translate }}
-    </app-button>
   </form>
+
+  <!-- button. -->
+  <app-button
+    #button
+    (action)="apply()"
+    color="primary"
+    class="float-right"
+  >
+    {{ 'common.ok' | translate }}
+  </app-button>
 </app-dialog>
diff --git a/...ysocks-client-settings/edit-skysocks-client-note/edit-skysocks-client-note.component.html b/...ysocks-client-settings/edit-skysocks-client-note/edit-skysocks-client-note.component.html
@@ -3,6 +3,6 @@
     <mat-form-field>
       <input #firstInput [placeholder]="'apps.vpn-socks-client-settings.change-note-dialog.note' | translate" formControlName="note" maxlength="100" matInput>
     </mat-form-field>
-    <app-button class="float-right" color="primary" type="mat-raised-button" (action)="finish()">{{ 'common.save' | translate }}</app-button>
   </form>
+  <app-button class="float-right" color="primary" type="mat-raised-button" (action)="finish()">{{ 'common.save' | translate }}</app-button>
 </app-dialog>
diff --git a/...pps/skysocks-client-settings/skysocks-client-filter/skysocks-client-filter.component.html b/...pps/skysocks-client-settings/skysocks-client-filter/skysocks-client-filter.component.html
@@ -45,16 +45,16 @@
         matInput
       >
     </mat-form-field>
-
-    <!-- button. -->
-    <app-button
-      #button
-      (action)="apply()"
-      type="mat-raised-button"
-      color="primary"
-      class="float-right"
-    >
-      {{ 'apps.vpn-socks-client-settings.filter-dialog.apply' | translate }}
-    </app-button>
   </form>
+
+  <!-- button. -->
+  <app-button
+    #button
+    (action)="apply()"
+    type="mat-raised-button"
+    color="primary"
+    class="float-right"
+  >
+    {{ 'apps.vpn-socks-client-settings.filter-dialog.apply' | translate }}
+  </app-button>
 </app-dialog>
diff --git a/...skysocks-client-settings/skysocks-client-password/skysocks-client-password.component.html b/...skysocks-client-settings/skysocks-client-password/skysocks-client-password.component.html
@@ -12,8 +12,9 @@
         matInput
       >
     </mat-form-field>
-    <app-button class="float-right" color="primary" type="mat-raised-button" (action)="finish()">
-      {{ 'apps.vpn-socks-client-settings.password-dialog.continue-button' | translate }}
-    </app-button>
   </form>
+
+  <app-button class="float-right" color="primary" type="mat-raised-button" (action)="finish()">
+    {{ 'apps.vpn-socks-client-settings.password-dialog.continue-button' | translate }}
+  </app-button>
 </app-dialog>
diff --git a/...p/components/pages/node/apps/node-apps/skysocks-settings/skysocks-settings.component.html b/...p/components/pages/node/apps/node-apps/skysocks-settings/skysocks-settings.component.html
@@ -37,15 +37,15 @@
         <mat-icon [inline]="true" class="help-icon" [matTooltip]="'apps.vpn-socks-server-settings.secure-mode-info' | translate">help</mat-icon>
       </mat-checkbox>
     </div>
-
-    <app-button
-      #button
-      (action)="saveChanges()"
-      [disabled]="!form.valid"
-      color="primary"
-      class="float-right"
-    >
-      {{ 'apps.vpn-socks-server-settings.save' | translate }}
-    </app-button>
   </form>
+
+  <app-button
+    #button
+    (action)="saveChanges()"
+    [disabled]="!form.valid"
+    color="primary"
+    class="float-right"
+  >
+    {{ 'apps.vpn-socks-server-settings.save' | translate }}
+  </app-button>
 </app-dialog>
diff --git a/...onents/pages/node/routing/transport-list/create-transport/create-transport.component.html b/...onents/pages/node/routing/transport-list/create-transport/create-transport.component.html
@@ -39,15 +39,15 @@
         {{ 'transports.dialog.errors.transport-type-error' | translate }}
       </mat-error>
     </mat-form-field>
-
-    <app-button
-      #button
-      (action)="create()"
-      [disabled]="!form.valid"
-      color="primary"
-      class="float-right"
-    >
-      {{ 'transports.create' | translate }}
-    </app-button>
   </form>
+
+  <app-button
+    #button
+    (action)="create()"
+    [disabled]="!form.valid"
+    color="primary"
+    class="float-right"
+  >
+    {{ 'transports.create' | translate }}
+  </app-button>
 </app-dialog>