Merge pull request rauchg#153 from laughinghan/feature.sign-in-link-i…

…n-iframe Add "or sign in" link to iframe too
Hacker0x01 · Mar 4, 2016 · b2b481b · b2b481b
2 parents 6b1920a + a0e2ec9
commit b2b481b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -152,7 +152,7 @@ export default function slackin({
     let { name } = slack.org;
     let { active, total } = slack.users;
     if (!name) return res.send(404);
-    let dom = splash({ coc, path, name, channels, active, total, iframe: true });
+    let dom = splash({ coc, path, name, org, channels, active, total, iframe: true });
     res.type('html');
     res.send(dom.toHTML());
   });

diff --git a/lib/splash.js b/lib/splash.js
@@ -40,7 +40,7 @@ export default function splash({ path, name, org, coc, logo, active, total, chan
       ),
       dom('button.loading', 'Get my Invite')
     ),
-    !iframe && dom('p.signin',
+    dom('p.signin',
       'or ',
       dom(`a href=https://${org}.slack.com target=_top`, 'sign in'),
       '.'
@@ -297,22 +297,20 @@ function style({ logo, active, iframe } = {}){
     });
   }
 
-  if (!iframe) {
-    css.add('p.signin', {
-      'padding': '10px 0 10px',
-      'font-size': '11px'
-    });
+  css.add('p.signin', {
+    'padding': '10px 0 10px',
+    'font-size': '11px'
+  });
 
-    css.add('p.signin a', {
-      'color': pink,
-      'text-decoration': 'none'
-    });
+  css.add('p.signin a', {
+    'color': pink,
+    'text-decoration': 'none'
+  });
 
-    css.add('p.signin a:hover', {
-      'background-color': '#E01563',
-      color: '#fff'
-    });
-  }
+  css.add('p.signin a:hover', {
+    'background-color': '#E01563',
+    color: '#fff'
+  });
 
   if (!iframe) {
     css.add('footer', {