summaryrefslogtreecommitdiffstats
path: root/web/sass-files/sass/partials/_signup.scss
diff options
context:
space:
mode:
authorJoramWilander <jwawilander@gmail.com>2015-08-28 08:37:55 -0400
committerJoramWilander <jwawilander@gmail.com>2015-08-28 08:37:55 -0400
commitf5fec3a157e6c9146a0c4e28dd5f70e6c066affd (patch)
tree176afd630a3afbe0ac3389695be6b4ce1c45d069 /web/sass-files/sass/partials/_signup.scss
parentdb7e8c12889485234fb2d1ba6556106e5fc7548b (diff)
downloadchat-f5fec3a157e6c9146a0c4e28dd5f70e6c066affd.tar.gz
chat-f5fec3a157e6c9146a0c4e28dd5f70e6c066affd.tar.bz2
chat-f5fec3a157e6c9146a0c4e28dd5f70e6c066affd.zip
Added the ability to create a team with SSO services and added the ability to turn off email sign up.
Diffstat (limited to 'web/sass-files/sass/partials/_signup.scss')
-rw-r--r--web/sass-files/sass/partials/_signup.scss42
1 files changed, 29 insertions, 13 deletions
diff --git a/web/sass-files/sass/partials/_signup.scss b/web/sass-files/sass/partials/_signup.scss
index ddf2aab88..2fb56e537 100644
--- a/web/sass-files/sass/partials/_signup.scss
+++ b/web/sass-files/sass/partials/_signup.scss
@@ -156,9 +156,21 @@
}
.btn {
+ font-size: 1em;
padding: em(7px) em(15px);
font-weight: 600;
margin-right: 5px;
+ .fa {
+ font-size: 17px;
+ margin-right: 8px;
+ }
+ .icon {
+ width: 18px;
+ height: 18px;
+ margin-right: 8px;
+ @include background-size(100% 100%);
+ display: inline-block;
+ }
&.btn-custom-login {
display: block;
min-width: 200px;
@@ -166,7 +178,7 @@
padding: 0 1em;
margin: 1em auto;
height: 40px;
- line-height: 35px;
+ line-height: 34px;
color: #fff;
@include border-radius(2px);
&.gitlab {
@@ -178,12 +190,7 @@
vertical-align: middle;
}
.icon {
- background: url("../images/gitlabLogo.png");
- width: 18px;
- height: 18px;
- margin-right: 8px;
- @include background-size(100% 100%);
- display: inline-block;
+ background-image: url("../images/gitlabLogo.png");
}
}
&.google {
@@ -195,13 +202,22 @@
vertical-align: middle;
}
.icon {
- background: url("../images/googleLogo.png");
- width: 18px;
- height: 18px;
- margin-right: 8px;
- @include background-size(100% 100%);
- display: inline-block;
+ background-image: url("../images/googleLogo.png");
+ }
+ }
+ &.email {
+ background: #2389D7;
+ &:hover {
+ background: darken(#2389D7, 10%);
}
+ span {
+ vertical-align: middle;
+ }
+ }
+ &.btn-full {
+ width: 100%;
+ text-align: left;
+ padding-left: 35px;
}
}
&.btn-default {