Merge branch 'fix-icons-color' into 'dev'

Update icon color classes & refactoring

See merge request turris/reforis/foris-js!233

src/bootstrap/PasswordInput.js

@@ -49,7 +49,7 @@ function PasswordInput({ withEye, newPass, ...props }) {
                     <FontAwesomeIcon
                         icon={isHidden ? faEye : faEyeSlash}
                         style={{ width: "1.25rem" }}
-                        className="text-dark"
+                        className="text-secondary"
                     />
                 </button>
             )}

src/common/WiFiSettings/WiFiGuestForm.js

@@ -68,14 +68,11 @@ export default function WifiGuestForm({
                         }))}
                         {...props}
                     >
-                        <div className="input-group-append">
+                        <WiFiQRCode
-                            <WiFiQRCode
+                            SSID={formData.SSID}
-                                SSID={formData.SSID}
+                            password={formData.password}
-                                password={formData.password}
+                        />
-                            />
-                        </div>
                     </TextInput>
-
                     <PasswordInput
                         withEye
                         label={_("Password")}

src/common/WiFiSettings/WiFiQRCode.js

@@ -42,7 +42,7 @@ export default function WiFiQRCode({ SSID, password }) {
                     icon="fa-solid fa-qrcode"
                     title={_("Show QR code")}
                     aria-label={_("Show QR code")}
-                    className="text-dark"
+                    className="text-secondary"
                 />
             </button>
             {modal ? (
@@ -70,17 +70,26 @@ function QRCodeModal({ shown, setShown, SSID, password }) {
             <ModalHeader setShown={setShown} title={_("Wi-Fi QR Code")} />
             <ModalBody>
                 <QRCode
+                    className="d-block mx-auto img-logo-black"
                     renderAs="svg"
                     value={toQRCodeContent(SSID, password)}
                     level="M"
                     size={350}
                     includeMargin
-                    style={{ display: "block", margin: "auto" }}
                 />
             </ModalBody>
             <ModalFooter>
                 <Button
-                    className="btn-outline-primary"
+                    className="btn-secondary"
+                    onClick={(e) => {
+                        e.preventDefault();
+                        setShown(false);
+                    }}
+                >
+                    {_("Close")}
+                </Button>
+                <Button
+                    className="btn-primary"
                     onClick={(e) => {
                         e.preventDefault();
                         createAndDownloadPdf(SSID, password);

src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap

@@ -339,7 +339,7 @@ exports[`<WiFiSettings/> Snapshot guest network. 1`] = `
 - First value
 + Second value
 
-@@ -524,10 +524,91 @@
+@@ -524,10 +524,87 @@
             <small>
               Enables Wi-Fi for guests, which is separated from LAN network. Devices connected to this network are allowed to access the internet, but aren't allowed to access other devices and the configuration interface of the router. Parameters of the guest network can be set in the Guest network tab.
             </small>
@@ -363,18 +363,14 @@ exports[`<WiFiSettings/> Snapshot guest network. 1`] = `
 +             type="text"
 +             value="TestGuestSSID"
 +           />
-+           <div
++           <button
-+             class="input-group-append"
++             class="input-group-text"
++             type="button"
 +           >
-+             <button
++             <i
-+               class="input-group-text"
++               class="fa"
-+               type="button"
++             />
-+             >
++           </button>
-+               <i
-+                 class="fa"
-+               />
-+             </button>
-+           </div>
 +         </div>
 +         <div
 +           class="form-text"
@@ -431,7 +427,7 @@ exports[`<WiFiSettings/> Snapshot guest network. 1`] = `
           class="form-check form-switch mb-3 d-flex align-items-center"
         >
           <input
-@@ -550,10 +631,11 @@
+@@ -550,10 +627,11 @@
         <div
           class="text-end"
         >