Merge branch 'master' of github.com:studiointeract/react-accounts-ui-…

…bootstrap Conflicts: package.js
studiointeract · Nov 10, 2016 · 690a062 · 690a062
2 parents 7adb5ca + 57eb29a
commit 690a062
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 16 deletions.
diff --git a/package.js b/package.js
@@ -10,11 +10,10 @@ Package.onUse(function(api) {
   api.versionsFrom('1.3');
   api.use('ecmascript');
   api.use('underscore');
-  api.use('fourseven:scss@3.4.1');
   api.use('std:accounts-ui@1.2.9');
 
   api.addFiles([
-    'styles.scss', 'social-buttons.css'
+    'styles.css', 'social-buttons.css'
   ], 'client');
 
   api.mainModule('main.jsx');

diff --git a/styles.css b/styles.css
@@ -0,0 +1,11 @@
+form.accounts button, form.accounts .btn, form.accounts a {
+  margin-right: 6px;
+}
+form.accounts .social-buttons .btn {
+  margin-bottom: 0.75em;
+}
+form.accounts .form-group.required .form-control-label:after {
+  content: " *";
+  color: red;
+}
+
diff --git a/styles.scss b/styles.scss