From b8e5dbec8d09d76466b126a8b34a786adfa5767a Mon Sep 17 00:00:00 2001 From: Aleksandr Gumroian Date: Mon, 18 Jan 2021 21:59:26 +0100 Subject: [PATCH 1/6] Increase bottom margin of formFieldsSize --- src/bootstrap/constants.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bootstrap/constants.js b/src/bootstrap/constants.js index cec1509..d748c21 100644 --- a/src/bootstrap/constants.js +++ b/src/bootstrap/constants.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/) + * Copyright (C) 2019-2021 CZ.NIC z.s.p.o. (http://www.nic.cz/) * * This is free software, licensed under the GNU General Public License v3. * See /LICENSE for more information. @@ -7,5 +7,5 @@ /** Bootstrap column size for form fields */ // eslint-disable-next-line import/prefer-default-export -export const formFieldsSize = "card p-4 col-sm-12 col-lg-12 p-0 mb-3"; +export const formFieldsSize = "card p-4 col-sm-12 col-lg-12 p-0 mb-4"; export const buttonFormFieldsSize = "col-sm-12 col-lg-12 p-0 mb-3"; From 688192504ff1782cf43570a50dbdd0df1660d8cc Mon Sep 17 00:00:00 2001 From: Aleksandr Gumroian Date: Mon, 18 Jan 2021 22:03:19 +0100 Subject: [PATCH 2/6] Change formFieldsSize of ResetWiFiSettings card --- src/common/WiFiSettings/ResetWiFiSettings.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/WiFiSettings/ResetWiFiSettings.js b/src/common/WiFiSettings/ResetWiFiSettings.js index f79bcd5..8cf1948 100644 --- a/src/common/WiFiSettings/ResetWiFiSettings.js +++ b/src/common/WiFiSettings/ResetWiFiSettings.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/) + * Copyright (C) 2019-2021 CZ.NIC z.s.p.o. (http://www.nic.cz/) * * This is free software, licensed under the GNU General Public License v3. * See /LICENSE for more information. @@ -13,7 +13,7 @@ import { useAlert } from "../../alertContext/AlertContext"; import { ALERT_TYPES } from "../../bootstrap/Alert"; import { useAPIPost } from "../../api/hooks"; import { API_STATE } from "../../api/utils"; -import { buttonFormFieldsSize } from "../../bootstrap/constants"; +import { formFieldsSize } from "../../bootstrap/constants"; ResetWiFiSettings.propTypes = { ws: PropTypes.object.isRequired, @@ -51,7 +51,7 @@ export default function ResetWiFiSettings({ ws, endpoint }) { } return ( - <> +

{_("Reset Wi-Fi Settings")}

{_(` @@ -59,7 +59,7 @@ If a number of wireless cards doesn't match, you may try to reset the Wi-Fi sett current Wi-Fi configuration and restore the default values. `)}

-
+
- +
); } From af0fb80e455406c7fb4e317cd13636d1a18c4f55 Mon Sep 17 00:00:00 2001 From: Aleksandr Gumroian Date: Mon, 18 Jan 2021 22:09:01 +0100 Subject: [PATCH 3/6] Update Snapshots --- .../__snapshots__/WiFiSettings.test.js.snap | 34 +++++++++++-------- .../__snapshots__/RebootButton.test.js.snap | 2 +- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap b/src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap index 9ce9107..f822e54 100644 --- a/src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap +++ b/src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap @@ -251,7 +251,7 @@ exports[` Snapshot 2.4 GHz 1`] = ` exports[` Snapshot both modules disabled. 1`] = `
Snapshot both modules disabled. 1`] = `
-

- Reset Wi-Fi Settings -

-

- +

+

+ Reset Wi-Fi Settings +

+

+ If a number of wireless cards doesn't match, you may try to reset the Wi-Fi settings. Note that this will remove the current Wi-Fi configuration and restore the default values. -

-
- + +
`; diff --git a/src/common/__tests__/__snapshots__/RebootButton.test.js.snap b/src/common/__tests__/__snapshots__/RebootButton.test.js.snap index 4a819a1..1a2ced3 100644 --- a/src/common/__tests__/__snapshots__/RebootButton.test.js.snap +++ b/src/common/__tests__/__snapshots__/RebootButton.test.js.snap @@ -10,7 +10,7 @@ exports[` Render modal. 1`] = ` role="dialog" >