Commit 915810d4 by Galen Frechette

cleans up alignment of login and signup modals

parent 1d7b3015
...@@ -22,7 +22,11 @@ ...@@ -22,7 +22,11 @@
@include box-shadow(0 15px 80px 15px rgba(0,0,0, 0.5)); @include box-shadow(0 15px 80px 15px rgba(0,0,0, 0.5));
color: #fff; color: #fff;
display: none; display: none;
left: 50%;
margin-left: -(grid-width(6)) / 2;
padding: 8px; padding: 8px;
position: absolute;
top: 170px;
width: grid-width(6); width: grid-width(6);
z-index: 10; z-index: 10;
...@@ -30,28 +34,13 @@ ...@@ -30,28 +34,13 @@
display: block; display: block;
} }
&.login-modal {
@include vertically-and-horizontally-centered(410px, grid-width(6));
.inner-wrapper {
height: 410px;
}
}
&.signup-modal {
@include vertically-and-horizontally-centered(965px, grid-width(6));
.inner-wrapper {
height: 965px;
}
}
.inner-wrapper { .inner-wrapper {
background: rgb(240,240,240); background: rgb(240,240,240);
@include border-radius(0px); @include border-radius(0px);
border: 1px solid rgba(0, 0, 0, 0.9); border: 1px solid rgba(0, 0, 0, 0.9);
@include box-shadow(inset 0 1px 0 0 rgba(255, 255, 255, 0.7)); @include box-shadow(inset 0 1px 0 0 rgba(255, 255, 255, 0.7));
overflow: hidden; overflow: hidden;
padding-bottom: 30px;
position: relative; position: relative;
header { header {
...@@ -107,7 +96,7 @@ ...@@ -107,7 +96,7 @@
form { form {
margin-bottom: 12px; margin-bottom: 12px;
padding: 0px 20px; padding: 0px 40px;
position: relative; position: relative;
z-index: 2; z-index: 2;
...@@ -145,19 +134,17 @@ ...@@ -145,19 +134,17 @@
} }
a { a {
//color: $base-font-color;
font: normal 1.2rem/1.6rem $serif; font: normal 1.2rem/1.6rem $serif;
text-decoration: underline; text-decoration: underline;
&:hover { &:hover {
//color: $lighter-base-font-color;
} }
} }
} }
.honor-code-summary { .honor-code-summary {
margin-bottom: 20px; margin-bottom: 20px;
padding: 0px 10px; padding: 0px;
position: relative; position: relative;
p { p {
...@@ -201,13 +188,13 @@ ...@@ -201,13 +188,13 @@
} }
.submit { .submit {
padding-top: 18px; padding-top: 10px;
input[type="submit"] { input[type="submit"] {
display: block; display: block;
height: 45px; height: 45px;
margin: 0 auto; margin: 0 auto;
width: 70%; width: 100%;
} }
} }
} }
......
...@@ -1708,29 +1708,15 @@ header.app { ...@@ -1708,29 +1708,15 @@ header.app {
box-shadow: 0 15px 80px 15px rgba(0, 0, 0, 0.5); box-shadow: 0 15px 80px 15px rgba(0, 0, 0, 0.5);
color: #fff; color: #fff;
display: none; display: none;
left: 50%;
margin-left: -242.5px;
padding: 8px; padding: 8px;
position: absolute;
top: 170px;
width: 485px; width: 485px;
z-index: 10; } z-index: 10; }
.modal.visible { .modal.visible {
display: block; } display: block; }
.modal.login-modal {
left: 50%;
margin-left: -242.5px;
min-height: 410px;
min-width: 485px;
position: absolute;
top: 150px; }
.modal.login-modal .inner-wrapper {
height: 410px; }
.modal.signup-modal {
left: 50%;
margin-left: -242.5px;
min-height: 965px;
min-width: 485px;
position: absolute;
top: 150px; }
.modal.signup-modal .inner-wrapper {
height: 965px; }
.modal .inner-wrapper { .modal .inner-wrapper {
background: #f0f0f0; background: #f0f0f0;
-webkit-border-radius: 0px; -webkit-border-radius: 0px;
...@@ -1741,6 +1727,7 @@ header.app { ...@@ -1741,6 +1727,7 @@ header.app {
-moz-box-shadow: inset 0 1px 0 0 rgba(255, 255, 255, 0.7); -moz-box-shadow: inset 0 1px 0 0 rgba(255, 255, 255, 0.7);
box-shadow: inset 0 1px 0 0 rgba(255, 255, 255, 0.7); box-shadow: inset 0 1px 0 0 rgba(255, 255, 255, 0.7);
overflow: hidden; overflow: hidden;
padding-bottom: 30px;
position: relative; } position: relative; }
.modal .inner-wrapper header { .modal .inner-wrapper header {
margin-bottom: 30px; margin-bottom: 30px;
...@@ -1786,7 +1773,7 @@ header.app { ...@@ -1786,7 +1773,7 @@ header.app {
z-index: 2; } z-index: 2; }
.modal .inner-wrapper form { .modal .inner-wrapper form {
margin-bottom: 12px; margin-bottom: 12px;
padding: 0px 20px; padding: 0px 40px;
position: relative; position: relative;
z-index: 2; } z-index: 2; }
.modal .inner-wrapper form label { .modal .inner-wrapper form label {
...@@ -1826,7 +1813,7 @@ header.app { ...@@ -1826,7 +1813,7 @@ header.app {
text-decoration: underline; } text-decoration: underline; }
.modal .inner-wrapper form .honor-code-summary { .modal .inner-wrapper form .honor-code-summary {
margin-bottom: 20px; margin-bottom: 20px;
padding: 0px 10px; padding: 0px;
position: relative; } position: relative; }
.modal .inner-wrapper form .honor-code-summary p { .modal .inner-wrapper form .honor-code-summary p {
color: #a0a0a0; color: #a0a0a0;
...@@ -1856,12 +1843,12 @@ header.app { ...@@ -1856,12 +1843,12 @@ header.app {
.modal .inner-wrapper form .honor-code-summary ul li:last-child { .modal .inner-wrapper form .honor-code-summary ul li:last-child {
margin-bottom: 0px; } margin-bottom: 0px; }
.modal .inner-wrapper form .submit { .modal .inner-wrapper form .submit {
padding-top: 18px; } padding-top: 10px; }
.modal .inner-wrapper form .submit input[type="submit"] { .modal .inner-wrapper form .submit input[type="submit"] {
display: block; display: block;
height: 45px; height: 45px;
margin: 0 auto; margin: 0 auto;
width: 70%; } width: 100%; }
.modal .inner-wrapper .login-extra { .modal .inner-wrapper .login-extra {
position: relative; position: relative;
z-index: 2; } z-index: 2; }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment