Merge remote-tracking branch 'origin/twitter-login'

3 files changed, 16 insertions, 1 deletions

diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index 59af6a71f..c06c6c1f3 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -760,6 +760,21 @@ input.final-submit {
     }
 }
 
+.btn--twitter {
+    @include button-reset(#55acee, darken(#55acee, 10%), #55acee, #fff, darken(#55acee, 5%), darken(#55acee, 10%), #55acee, #fff);
+
+    &:visited {
+        color: #fff;
+    }
+
+    img {
+        margin-right: 0.5em;
+        vertical-align: -0.2em;
+        height: 1.3em;
+        width: auto;
+    }
+}
+
 // Under the button to override its text transform and width
 .btn--social {
     display: block;
diff --git a/web/i/twitter-icon-32.png b/web/i/twitter-icon-32.png
new file mode 100644
index 000000000..9f6cefd9f
--- /dev/null
+++ b/web/i/twitter-icon-32.png
diff --git a/web/js/fixmystreet.js b/web/js/fixmystreet.js
index 07c1a1a6b..0a15982f5 100644
--- a/web/js/fixmystreet.js
+++ b/web/js/fixmystreet.js
@@ -128,7 +128,7 @@ $(function(){
         $('#form_name').addClass('required').removeClass('valid');
     } );
 
-    $('#facebook_sign_in').click(function(e){
+    $('#facebook_sign_in, #twitter_sign_in').click(function(e){
         $('#form_email').removeClass();
         $('#form_rznvy').removeClass();
         $('#email').removeClass();