From dd71074e64ccb9ea8c19b0644a993dbdb32e2d50 Mon Sep 17 00:00:00 2001 From: Tetranoir Date: Sat, 16 May 2015 22:00:30 -0700 Subject: [PATCH] cleaned up css; added wildcard to url routing for resetpassword; --- config.js | 1 + flashy.css | 43 ++++++------------------------------- templates/requestpasswordreset.html | 2 +- templates/resetpassword.html | 2 +- 4 files changed, 10 insertions(+), 38 deletions(-) diff --git a/config.js b/config.js index bd4cf8d..dd6b7e2 100644 --- a/config.js +++ b/config.js @@ -68,6 +68,7 @@ angular.module('flashy', [ }). state('resetpassword', { url: '/resetpassword', + url: '/resetpassword/*', templateUrl: 'templates/resetpassword.html', controller: 'ResetPasswordController' }); diff --git a/flashy.css b/flashy.css index 60cc72e..37f4fa6 100644 --- a/flashy.css +++ b/flashy.css @@ -1,39 +1,4 @@ -.diclaimer { - color:#00AFD8; -} - -.form-section { - width: 330px; - top: 50%; - position: relative; -} - -.form-inputs { - margin-top: 0px; - border: 0px none; - font: 16px/1.4 "Helvetica Neue","HelveticaNeue",Helvetica,Arial; - padding: 5px 10px 11px 13px; - width: 100%; - box-sizing: border-box; -} - -.form-buttons { - margin-top: 10px; - width: 100%; - font-size: 16px; -} - -.form-buttons .last-button { - float: right; -} - -.container { - position: relative; - width: 600px; - height: 80px; -} - -.angucomplete-dropdown { +.angucomplete-dropdown { border-color: #ececec; border-width: 1px; border-style: solid; @@ -63,4 +28,10 @@ .angucomplete-selected-row { background-color:#aaaaff; +} + +.container { + position: relative; + width: 600px; + height: 80px; } \ No newline at end of file diff --git a/templates/requestpasswordreset.html b/templates/requestpasswordreset.html index 8a8f675..9c43de2 100644 --- a/templates/requestpasswordreset.html +++ b/templates/requestpasswordreset.html @@ -1,5 +1,5 @@
-

Request Sent!

+

Request sent! Check your email in a few minutes.

diff --git a/templates/resetpassword.html b/templates/resetpassword.html index 592e90f..d8b2e96 100644 --- a/templates/resetpassword.html +++ b/templates/resetpassword.html @@ -1,5 +1,5 @@
-

Reset Password Success!

+

Reset password successful!

-- 1.9.1