Fix Settings styling

app/settings/settings/settings.component.css

@@ -3,9 +3,16 @@
 }
 
 .input-field.switch-field {
-  padding: 0;
+  padding: 13 0 15;
+  border-width: 0 0 1 0;
+  border-color: #ebebed;
 }
 
-.btn {
-  margin: 20 0 0;
+.input-field.switch-field .label,
+.input-field.switch-field .switch {
+  vertical-align: middle;
+}
+
+.input-field.switch-field .switch {
+  margin: 0;
 }

app/settings/settings/settings.template.html

@@ -1,17 +1,17 @@
 <page-layout>
     <StackLayout>
         <loading-screen hideElement="hideonloading"></loading-screen>
-        
+
         <StackLayout id="hideonloading" class="cntnr">
             <StackLayout *ngIf="user" class="form">
-                <StackLayout orientation="horizontal" class="input-field switch-field">
+                <DockLayout class="input-field switch-field">
                     <Label class="label" text="Receive push notifications" textWrap="true"></Label>
-                    <Switch class="switch" [(ngModel)]="pushEnabled"></Switch>
-                </StackLayout>
-                <StackLayout orientation="horizontal" class="input-field switch-field">
+                    <Switch class="switch" dock="right" [(ngModel)]="pushEnabled"></Switch>
+                </DockLayout>
+                <DockLayout columns="*, auto" class="input-field switch-field">
                     <Label class="label" text="Receive email notifications" textWrap="true"></Label>
                     <Switch class="switch" [(ngModel)]="emailEnabled"></Switch>
-                </StackLayout>
+                </DockLayout>
             </StackLayout>
 
             <ScrollView class="cntnr">