From 7c27952ff60b96bb69dd60c3495f777d1dba3f28 Mon Sep 17 00:00:00 2001 From: Panayiotis Lipiridis Date: Mon, 4 Apr 2016 22:36:35 +0200 Subject: [PATCH] Updated Bootstrap Social ..and remove plus from Google sign in icon --- .../bootstrap-social/bootstrap-social.less | 27 +++++-------------- server/views/account/signin.jade | 4 +-- 2 files changed, 8 insertions(+), 23 deletions(-) diff --git a/client/less/lib/bootstrap-social/bootstrap-social.less b/client/less/lib/bootstrap-social/bootstrap-social.less index a2b61fae6c6..a333b57a082 100755 --- a/client/less/lib/bootstrap-social/bootstrap-social.less +++ b/client/less/lib/bootstrap-social/bootstrap-social.less @@ -32,7 +32,7 @@ } &.btn-lg { padding-left: (@bs-height-lg + @padding-large-horizontal); - :first-child { + > :first-child { line-height: @bs-height-lg; width: @bs-height-lg; font-size: 1.8em; @@ -40,7 +40,7 @@ } &.btn-sm { padding-left: (@bs-height-sm + @padding-small-horizontal); - :first-child { + > :first-child { line-height: @bs-height-sm; width: @bs-height-sm; font-size: 1.4em; @@ -48,7 +48,7 @@ } &.btn-xs { padding-left: (@bs-height-xs + @padding-small-horizontal); - :first-child { + > :first-child { line-height: @bs-height-xs; width: @bs-height-xs; font-size: 1.2em; @@ -61,7 +61,7 @@ height: (@bs-height-base + 2); width: (@bs-height-base + 2); padding: 0; - :first-child { + > :first-child { border: none; text-align: center; width: 100%!important; @@ -86,29 +86,14 @@ } } -.btn-social(@color-bg, @color: @color-bg) { +.btn-social(@color-bg, @color: #fff) { background-color: @color-bg; .button-variant(@color, @color-bg, rgba(0,0,0,.2)); } -.btn-adn { .btn-social(#d87a68); } -.btn-bitbucket { .btn-social(#205081); } -.btn-dropbox { .btn-social(#1087dd); } .btn-facebook { .btn-social(#3b5998); } -.btn-flickr { .btn-social(#ff0084); } -.btn-foursquare { .btn-social(#f94877); } .btn-github { .btn-social(#444444); } -.btn-google-plus { .btn-social(#dd4b39); } -.btn-instagram { .btn-social(#3f729b); } +.btn-google { .btn-social(#dd4b39); } .btn-linkedin { .btn-social(#007bb6); } -.btn-microsoft { .btn-social(#2672ec); } -.btn-openid { .btn-social(#f7931e); } -.btn-pinterest { .btn-social(#cb2027); } -.btn-reddit { .btn-social(#eff7ff, #000); } -.btn-soundcloud { .btn-social(#ff5500); } -.btn-tumblr { .btn-social(#2c4762); } .btn-twitter { .btn-social(#55acee); } -.btn-vimeo { .btn-social(#1ab7ea); } -.btn-vk { .btn-social(#587ea3); } -.btn-yahoo { .btn-social(#720e9e); } diff --git a/server/views/account/signin.jade b/server/views/account/signin.jade index 70033323126..c16ca36bbc8 100644 --- a/server/views/account/signin.jade +++ b/server/views/account/signin.jade @@ -8,8 +8,8 @@ block content a.btn.btn-lg.btn-block.btn-social.btn-facebook(href='/auth/facebook') i.fa.fa-facebook | Sign in with Facebook - a.btn.btn-lg.btn-block.btn-social.btn-google-plus(href='/auth/google') - i.fa.fa-google-plus + a.btn.btn-lg.btn-block.btn-social.btn-google(href='/auth/google') + i.fa.fa-google | Sign in with Google a.btn.btn-lg.btn-block.btn-social.btn-linkedin(href='/auth/linkedin') i.fa.fa-linkedin