summaryrefslogtreecommitdiffstats
path: root/web/sass-files
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-07-24 12:14:47 -0400
committerJoram Wilander <jwawilander@gmail.com>2015-07-24 12:14:47 -0400
commit1c7ff66d988dcff10f89779996813f02a3a67436 (patch)
tree2ccda39ee28f4a76d55b9b5edccd63ef20c3b708 /web/sass-files
parent4f9c40e60b31936977da357214bf1b9fd99a68d7 (diff)
parent9c2d4d39ccb4a3a3134a5bcabbbe43a266653662 (diff)
downloadchat-1c7ff66d988dcff10f89779996813f02a3a67436.tar.gz
chat-1c7ff66d988dcff10f89779996813f02a3a67436.tar.bz2
chat-1c7ff66d988dcff10f89779996813f02a3a67436.zip
Merge pull request #249 from asaadmahmoodspin/master
Complete signup page UI changes
Diffstat (limited to 'web/sass-files')
-rw-r--r--web/sass-files/sass/partials/_signup.scss66
1 files changed, 64 insertions, 2 deletions
diff --git a/web/sass-files/sass/partials/_signup.scss b/web/sass-files/sass/partials/_signup.scss
index db22718d2..826394a10 100644
--- a/web/sass-files/sass/partials/_signup.scss
+++ b/web/sass-files/sass/partials/_signup.scss
@@ -23,6 +23,9 @@
font-weight: 600;
margin: 0 0 1.3em 0;
font-size: 1.4em;
+ &.extra-margin {
+ margin-bottom: 2.5em;
+ }
}
h4 {
font-size: em(18px);
@@ -44,6 +47,11 @@
form {
margin-bottom: 0.8em;
}
+ .form__hint {
+ font-size: 0.95em;
+ color: #999;
+ margin: 10px 0;
+ }
.external-link {
position: absolute;
bottom: 0;
@@ -61,10 +69,53 @@
.form-control {
height: em(38px);
}
+ .or__container {
+ height: 1px;
+ background: #dddddd;
+ text-align: center;
+ margin: 2em 0;
+ span {
+ width: 33px;
+ top: -10px;
+ position: relative;
+ line-height: 20px;
+ font-weight: 600;
+ background: #fff;
+ display: inline-block;
+ }
+ }
.btn {
padding: em(7px) em(15px);
font-weight: 600;
font-size: em(13px);
+ &.btn-custom-login {
+ display: block;
+ min-width: 200px;
+ width: 200px;
+ padding: 0 1em;
+ margin: 1em auto;
+ height: 40px;
+ line-height: 35px;
+ color: #fff;
+ @include border-radius(2px);
+ &.gitlab {
+ background: #554488;
+ &:hover {
+ background: darken(#554488, 10%);
+ }
+ span {
+ vertical-align: middle;
+ }
+ .icon {
+ background: url("../images/gitlabLogo.png");
+ width: 18px;
+ height: 18px;
+ margin-right: 8px;
+ @include background-size(100% 100%);
+ display: inline-block;
+ }
+ }
+ }
&.btn-default {
color: #444;
}
@@ -90,9 +141,20 @@
}
.has-error {
.control-label {
- margin-top: 5px;
+ background: #f2f2f2;
+ padding: 0.7em 1em;
+ @include border-radius(3px);
+ margin: 1em 0 0;
font-size: 14px;
- font-weight: 600;
+ font-weight: normal;
+ color: #999;
+ width: 100%;
+ &:before {
+ @extend .fa;
+ content: "\f071";
+ margin-right: 4px;
+ color: #aaa;
+ }
}
}
.reset-form {