change login box rendering a bit

I *think* this fixes #64... :)
RangerRick · Jan 23, 2016 · fa774d7 · fa774d7
1 parent 7ed0411
commit fa774d7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/lib/settings/settings.html b/lib/settings/settings.html
@@ -15,13 +15,13 @@
 						<span class="input-label">Username:</span>
 						<input id="loginUsername" type="text" autocomplete="off" autocapitalize="off" autocorrect="off" spellcheck="off" ng-model="user.username" name="username" autofocus="autofocus" required />
 					</label>
-					<label class="item item-input item-stacked-label">
+					<label class="item item-input item-stacked-label nobottom">
 						<span class="input-label">Password:</span>
 						<input id="loginPassword" type="password" autocomplete="off" autocapitalize="off" autocorrect="off" spellcheck="off" ng-model="user.password" name="password" required />
 					</label>
-					<ion-item class="item item-text-wrap nobottom">
-						Need a Twit-arr account? <a ng-click="goToTwitarr()" style="text-decoration:underline;cursor:pointer">Create one here.</a><br />
-						Lost your password? <a ng-click="goToLostPassword()" style="text-decoration:underline;cursor:pointer">Reset it here.</a>
+					<ion-item class="item item-text-wrap notop">
+						<p>Need a Twit-arr account? <a ng-click="goToTwitarr()" style="text-decoration:underline;cursor:pointer">Create one here.</a></p>
+						<p>Lost your password? <a ng-click="goToLostPassword()" style="text-decoration:underline;cursor:pointer">Reset it here.</a></p>
 					</ion-item>
 					<ion-item class="text-right notop">
 						<button class="button button-dark" ng-click="logIn(user)" ng-disabled="form.$invalid || !canSubmit(user)" style="margin-top: 0; margin-bottom: 0">Log In</button>

diff --git a/scss/cruisemonkey.scss b/scss/cruisemonkey.scss
@@ -535,6 +535,11 @@ ion-popover-view.fit ion-content {
 
 .settings {
 	$settings-border-color: $cmBackgroundAlternate;
+	.login-form {
+		p {
+			font-size: $font-size-base;
+		}
+	}
 	.item {
 		border: none;
 		/*border-color: $settings-border-color;*/
@@ -548,7 +553,9 @@ ion-popover-view.fit ion-content {
 			margin-bottom: 5px;
 			padding-left: 4px;
 			padding-right: 4px;
+			width: 100%;
 			border: 1px solid darken($cmBackgroundAlternate, 15%);
+			border-radius: 3px;
 		}
 	}
 	.heading {