Merge branch 'SachaG-social-buttons-improvements'

CHANGELOG.md

@@ -1,8 +1,11 @@
 # ChangeLog
 
+### v1.1.15
+
+* @SachaG added classes to the social buttons distinguishing which service. 
+
 ### v1.1.14
 
-* @SachaG added classes to the social buttons distinguishing which service.
 * @SachaG added tmeasday:check-npm-versions to check for the correct version of npm packages.
 * @ArthurPai updated T9n, which adds the Chinese language for accounts, so we can update it to v1.3.3
 * @ArthurPai fixed a forgotten update T9n translation in the PasswordOrService component.

README.md

@@ -1,6 +1,6 @@
 # React Accounts UI
 
-Current version 1.1.14
+Current version 1.1.15
 
 ## Features
 

imports/ui/components/LoginForm.jsx

@@ -493,7 +493,8 @@ export class LoginForm extends Tracker.Component {
             id: service,
             label: capitalize(service),
             disabled: waiting,
-            type: 'link',
+            type: 'button',
+            className: `btn-${service} ${service}`,
             onClick: this.oauthSignIn.bind(this, service)
           });
         });

imports/ui/components/PasswordOrService.jsx

@@ -15,7 +15,7 @@ export class PasswordOrService extends React.Component {
   }
 
   render () {
-    let { className, style = {} } = this.props;
+    let { className = "password-or-service", style = {} } = this.props;
     let { hasPasswordService, services } = this.state;
     labels = services;
     if (services.length > 2) {

package.js

@@ -1,6 +1,6 @@
 Package.describe({
   name: 'std:accounts-ui',
-  version: '1.1.14',
+  version: '1.1.15',
   summary: 'Accounts UI for React in Meteor 1.3',
   git: 'https://github.com/studiointeract/accounts-ui',
   documentation: 'README.md'