Przeglądaj źródła

fix styles with bootstrap not using scss extend

kaori 3 lat temu
rodzic
commit
701067fa00

+ 19 - 17
packages/app/src/components/InstallerForm.tsx

@@ -106,26 +106,28 @@ const InstallerForm = memo((): JSX.Element => {
       <div className="row">
         <form role="form" id="register-form" className="col-md-12" onSubmit={submitHandler}>
           <div className="dropdown mb-3">
-            <div className="d-flex dropdown-with-icon">
-              <i className="icon-bubbles border-0 rounded-0" />
-              <button
-                type="button"
-                className="btn btn-secondary dropdown-toggle text-right w-100 border-0 shadow-none"
-                id="dropdownLanguage"
-                data-testid="dropdownLanguage"
-                data-toggle="dropdown"
-                aria-haspopup="true"
-                aria-expanded="true"
-              >
-                <span className="float-left">
-                  {t('meta.display_name')}
-                </span>
-              </button>
-              <input
+            <div className="input-group">
+              <div className="input-group-prepend">
+                <i className="input-group-text icon-bubbles border-0 rounded-0" />
+              </div>
+                <button
+                  type="button"
+                  className="btn btn-secondary dropdown-toggle form-control text-right rounded-right"
+                  id="dropdownLanguage"
+                  data-testid="dropdownLanguage"
+                  data-toggle="dropdown"
+                  aria-haspopup="true"
+                  aria-expanded="true"
+                >
+                  <span className="float-left">
+                    {t('meta.display_name')}
+                  </span>
+                </button>
+                <input
                 type="hidden"
                 name="registerForm[app:globalLang]"
               />
-              <div className="dropdown-menu" aria-labelledby="dropdownLanguage">
+                <div className="dropdown-menu" aria-labelledby="dropdownLanguage">
                 {
                   i18nConfig.locales.map((locale) => {
                     let fixedT;

+ 0 - 11
packages/app/src/components/Layout/NoLoginLayout.module.scss

@@ -63,17 +63,6 @@
     }
   }
 
-  .dropdown-with-icon {
-    .dropdown-toggle {
-      @extend %form-control;
-      background: green;
-    }
-    i {
-      @extend %input-group-text;
-      margin-right: -1px;
-    }
-  }
-
   .input-group {
     margin-bottom: 10px;