diff options
author | JoramWilander <jwawilander@gmail.com> | 2015-08-14 11:57:13 -0400 |
---|---|---|
committer | JoramWilander <jwawilander@gmail.com> | 2015-08-14 12:38:16 -0400 |
commit | 8feec04929f17eb99e2f121530b8596966161528 (patch) | |
tree | b0f398cd7b6593418cb70cc2bda1b1b22786b0c5 /web | |
parent | b704e9489b21b3bec17f5c8b573a1724781ee6f7 (diff) | |
download | chat-8feec04929f17eb99e2f121530b8596966161528.tar.gz chat-8feec04929f17eb99e2f121530b8596966161528.tar.bz2 chat-8feec04929f17eb99e2f121530b8596966161528.zip |
incorporate asaad's UI updates for google sign-up
Diffstat (limited to 'web')
-rw-r--r-- | web/react/components/signup_user_complete.jsx | 2 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_signup.scss | 17 | ||||
-rw-r--r-- | web/static/images/googleLogo.png | bin | 0 -> 3519 bytes |
3 files changed, 18 insertions, 1 deletions
diff --git a/web/react/components/signup_user_complete.jsx b/web/react/components/signup_user_complete.jsx index fd389e21f..0393e0413 100644 --- a/web/react/components/signup_user_complete.jsx +++ b/web/react/components/signup_user_complete.jsx @@ -164,7 +164,7 @@ module.exports = React.createClass({ if (authServices.indexOf(Constants.GOOGLE_SERVICE) >= 0) { signupMessage.push( - <a className='btn btn-custom-login gitlab' href={'/' + this.props.teamName + '/signup/google' + window.location.search}> + <a className='btn btn-custom-login google' href={'/' + this.props.teamName + '/signup/google' + window.location.search}> <span className='icon' /> <span>with Google</span> </a> diff --git a/web/sass-files/sass/partials/_signup.scss b/web/sass-files/sass/partials/_signup.scss index 3a6f73316..ddf2aab88 100644 --- a/web/sass-files/sass/partials/_signup.scss +++ b/web/sass-files/sass/partials/_signup.scss @@ -186,6 +186,23 @@ display: inline-block; } } + &.google { + background: #dd4b39; + &:hover { + background: darken(#dd4b39, 10%); + } + span { + vertical-align: middle; + } + .icon { + background: url("../images/googleLogo.png"); + width: 18px; + height: 18px; + margin-right: 8px; + @include background-size(100% 100%); + display: inline-block; + } + } } &.btn-default { color: #444; diff --git a/web/static/images/googleLogo.png b/web/static/images/googleLogo.png Binary files differnew file mode 100644 index 000000000..932d755db --- /dev/null +++ b/web/static/images/googleLogo.png |