summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main/resources/templates/pages/login.html.ftl32
-rw-r--r--src/main/webapp/images/foursquarechurch.pngbin0 -> 5157 bytes
-rw-r--r--src/main/webapp/images/foursquarechurchlogin.pngbin6299 -> 0 bytes
-rw-r--r--src/main/webapp/style.css107
4 files changed, 35 insertions, 104 deletions
diff --git a/src/main/resources/templates/pages/login.html.ftl b/src/main/resources/templates/pages/login.html.ftl
index b88ea74..3cf6f33 100644
--- a/src/main/resources/templates/pages/login.html.ftl
+++ b/src/main/resources/templates/pages/login.html.ftl
@@ -13,28 +13,18 @@
<div id="content">
<div id="foursquarelogin">
- <div><img src="${staticRoot}/images/foursquarechurchlogin.png" alt="Puyallup Foursquare" /></div>
- <div class="inside">
- <div class="left">
- <form action="${dynamicRoot}/account/authenticate?redirect=${redirect!""}" method="post">
- <p>Login using your Foursquare Community Groups / Online Giving login.</p>
- <p>
- <div><label for="emailField">Login</label></div>
- <div><input id="emailField" type="text" name="email" tabindex="1" /></div>
- </p>
- <p>
- <div><label for="passwordField">Password &mdash; <a href="https://pfseawa.infellowship.com/UserLogin/ForgotPassword" target="_blank">forgot?</a></label></div>
- <div><input id="passwordField" type="password" name="password" tabindex="2" /></div>
- </p>
- <p class="submit"><input type="submit" value="Sign in" tabindex="3" /></p>
- <p id="noaccount">Don't have an account? <a href="https://pfseawa.infellowship.com/UserLogin/New">Sign up!</a></p>
- </form>
- </div>
- <div class="right">
- <div><img src="${staticRoot}/images/acts242.png" alt="Acts 2:42" /></div>
- <div><img src="${staticRoot}/images/leadershipdev.png" alt="Leadership Development" /></div>
- </div>
+ <div><img src="${staticRoot}/images/foursquarechurch.png" alt="Puyallup Foursquare" /></div>
+ <p>Login using your Foursquare Community Groups / Online Giving login.</p>
+ <div id="login-area">
+ <form action="${dynamicRoot}/account/authenticate?redirect=${redirect!""}" method="post">
+ <label>Username</label>
+ <input id="emailField" type="text" name="email" tabindex="1" />
+ <label>Password</label>
+ <input id="passwordField" type="password" name="password" tabindex="2" />
+ <input type="submit" value="Login" class="login-button" />
+ </form>
</div>
+ <a href="https://myfoursquarechurch.ccbchurch.com/w_password.php">Forgot username or password?</a>
</div>
</div>
</@commonpage>
diff --git a/src/main/webapp/images/foursquarechurch.png b/src/main/webapp/images/foursquarechurch.png
new file mode 100644
index 0000000..87dac15
--- /dev/null
+++ b/src/main/webapp/images/foursquarechurch.png
Binary files differ
diff --git a/src/main/webapp/images/foursquarechurchlogin.png b/src/main/webapp/images/foursquarechurchlogin.png
deleted file mode 100644
index 0d5f861..0000000
--- a/src/main/webapp/images/foursquarechurchlogin.png
+++ /dev/null
Binary files differ
diff --git a/src/main/webapp/style.css b/src/main/webapp/style.css
index 4562f1a..9c686e3 100644
--- a/src/main/webapp/style.css
+++ b/src/main/webapp/style.css
@@ -588,101 +588,42 @@ footer a:hover {
}
#foursquarelogin {
- background: url('/images/loginbg.png') repeat #666;
padding: 1em;
color: black;
- font: 12px/1.5 'Helvetica Neue', Arial, 'Liberation Sans', FreeSans, sans-serif;
+ font-family: 'Arial', 'Tahoma', sans-serif;
text-align: left;
- min-height: 380px;
- width: 760px;
+ width: 310px;
margin: 0 auto 0 auto;
}
-#foursquarelogin .inside {
- background: url('/images/faux_right_column.png') repeat-y 470px 0 white;
- width: 750px;
- min-height: 350px;
- margin: 0 auto 0 auto;
- -moz-box-shadow: 0 0 7px rgba(0, 0, 0, 0.5);
- -webkit-box-shadow: 0 0 7px rgba(0, 0, 0, 0.5);
- box-shadow: 0 0 7px rgba(0, 0, 0, 0.5);
-}
-
-#foursquarelogin .left {
- margin: 20px;
- padding: 20px;
- background: #f3f3f3;
- float: left;
- width: 400px;
- height: 270px;
- -moz-box-shadow: 0 -1px 1px #fff;
- -webkit-box-shadow: 0 -1px 1px #fff;
- box-shadow: 0 -1px 1px #fff;
- border: 1px solid;
- border-color: #eee #ddd #ccc;
-}
-
-#foursquarelogin label a {
- color: #888;
-}
-
-#foursquarelogin .right {
- float: left;
- width: 260px;
- margin-top: 20px;
-}
-
-#foursquarelogin .submit {
- float: left;
-}
-
-#foursquarelogin #noaccount {
- text-align: right;
-}
-
#foursquarelogin label {
- width: 100%;
display: block;
- text-align: left;
- font-size: 20px;
+ padding-bottom: 3px;
+ font-weight: normal;
+ font-size: 13px;
}
#foursquarelogin input {
- -webkit-appearance: none;
- -moz-border-radius: 0;
- -webkit-border-radius: 0;
- border-radius: 0;
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
- background-color: #fff;
- border: 1px solid;
- border-color: #848484 #c1c1c1 #e1e1e1;
- color: #000;
- outline: 0;
- padding: 2px 3px;
- font-size: 20px;
- font-family: Arial, sans-serif;
- height: 1.8em;
- width: 100%;
+ font-size: 14px;
+ width: 292px;
+ height: 28px;
+ padding: 0 8px;
+ border-radius: 3px;
+ border: 1px solid #ccc;
+ margin-bottom: 12px;
+ background: white;
}
#foursquarelogin input[type="submit"] {
- -webkit-appearance: none;
- -moz-border-radius: 25px;
- -webkit-border-radius: 25px;
- border-radius: 25px;
- background: #ddd url(../images/button.png) repeat-x;
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #fff), color-stop(1, #ddd));
- background: -moz-linear-gradient(top center, #fff 0%, #ddd 100%);
- border: 1px solid;
- border-color: #ddd #bbb #999;
- cursor: pointer;
- color: #333;
- font: bold 20px/1.2 Arial, sans-serif;
- outline: 0;
- overflow: visible;
- padding: 3px 10px 4px;
- text-shadow: #fff 0 1px 1px;
- text-decoration: none;
+ padding-top: 1px !important;
+ font-size: 13px !important;
+ background-color: #666;
+ transition: all .15s ease-in-out;
+ color: #eee;
+ border: 1px solid #666 !important;
+ width: 310px;
+ height: 28px;
+ padding: 0 8px;
+ border-radius: 3px;
+ margin-bottom: 12px;
}