diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-08-28 09:14:37 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-08-28 09:14:37 -0400 |
| commit | 75af5d4536cc414d171c2fe6dca78e455eb18b37 (patch) | |
| tree | 4e00cf97b5f4f570b1901093bfa4e208749932a0 /web/sass-files | |
| parent | d107b392a6309a41eac6cd7d07d720a21968eb56 (diff) | |
| parent | f5fec3a157e6c9146a0c4e28dd5f70e6c066affd (diff) | |
| download | chat-75af5d4536cc414d171c2fe6dca78e455eb18b37.tar.gz chat-75af5d4536cc414d171c2fe6dca78e455eb18b37.tar.bz2 chat-75af5d4536cc414d171c2fe6dca78e455eb18b37.zip | |
Merge pull request #496 from mattermost/mm-2015
MM-2015 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')
| -rw-r--r-- | web/sass-files/sass/partials/_responsive.scss | 8 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_signup.scss | 42 |
2 files changed, 37 insertions, 13 deletions
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index 733d81c2b..682809f02 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -290,6 +290,14 @@ .signup-team__name { font-size: 2em; } + .btn.btn-full { + padding-left: 10px; + } + .btn { + .icon, .fa { + margin-right: 6px; + } + } } .modal { .info__label { 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 { |