Przeglądaj źródła

Merge pull request #2140 from weseek/support/open-external-account-login-button

Support/open external account login button
Yuki Takei 5 lat temu
rodzic
commit
73f44d024d

+ 2 - 2
src/client/js/components/LoginForm.jsx

@@ -101,7 +101,7 @@ class LoginForm extends React.Component {
   renderExternalAuthLoginForm() {
     const { isLocalStrategySetup, isLdapStrategySetup, objOfIsExternalAuthEnableds } = this.props;
     const isExternalAuthCollapsible = isLocalStrategySetup || isLdapStrategySetup;
-    const collapsibleClass = isExternalAuthCollapsible ? 'collapse collapse-external-auth collapse-anchor' : '';
+    const collapsibleClass = isExternalAuthCollapsible ? 'collapse collapse-external-auth' : '';
 
     return (
       <>
@@ -122,7 +122,7 @@ class LoginForm extends React.Component {
         <div className="text-center">
           <button
             type="button"
-            className="collapse-anchor btn btn-xs btn-collapse-external-auth mb-3"
+            className="btn btn-secondary btn-xs mb-3"
             data-toggle={isExternalAuthCollapsible ? 'collapse' : ''}
             data-target="#external-auth"
             aria-expanded="false"

+ 0 - 16
src/client/styles/scss/_login.scss

@@ -225,22 +225,6 @@
     }
   }
 
-  // external-auth
-  .btn-collapse-external-auth {
-    color: white;
-    background-color: rgba(lighten(black, 20%), 0.4);
-    border: none;
-
-    .btn-label {
-      padding: 9px 15px;
-      margin: -8px 20px -8px -20px;
-    }
-
-    &:focus {
-      border: none;
-    }
-  }
-
   // footer link text
   .link-growi-org {
     font-size: smaller;

+ 0 - 17
src/server/views/login.html

@@ -135,23 +135,6 @@
 
 
 {% block body_end %}
-<!-- [TODO][GW-1865] -->
-{% if isExternalAuthCollapsible %}
-<script>
-  const isMobile = /iphone|ipad|android/.test(window.navigator.userAgent.toLowerCase());
-
-  if (!isMobile) {
-    $(".collapse-anchor").hover(
-      function() {
-        $('.collapse-external-auth').collapse('show');
-      },
-      function() {
-        $('.collapse-external-auth').collapse('hide');
-      }
-    );
-  }
-</script>
-{% endif %}
 <script>
   $('#register-form input[name="registerForm[username]"]').change(function(e) {
     var username = $(this).val();