Fix overnuking of rounded corners. Fixes KelvinTegelaar#518.

homotechsual · Jan 6, 2022 · 0a861f3 · 0a861f3
1 parent 56a4e2b
commit 0a861f3
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git a/src/components/Wizard.js b/src/components/Wizard.js
@@ -105,7 +105,9 @@ export default class Wizard extends React.Component {
  <>
  <CButton type="submit" className="text-white" disabled={submitting}>
  Submit
- {submitting && <FontAwesomeIcon icon={faCircleNotch} spin size="1x" />}
+ {submitting && (
+ <FontAwesomeIcon icon={faCircleNotch} spin className="me-2" size="1x" />
+ )}
  </CButton>
  </>
  )}

diff --git a/src/scss/_variables.scss b/src/scss/_variables.scss
@@ -279,7 +279,7 @@ $search-group-header-bg: #eeeeee;
 // Quickly modify global styling by enabling or disabling optional features.
 
 // $enable-caret: true !default;
-$enable-rounded: false;
+$enable-rounded: true;
 $enable-shadows: true;
 // $enable-gradients: false !default;
 // $enable-transitions: true !default;

diff --git a/src/views/cipp/CIPPSettings.js b/src/views/cipp/CIPPSettings.js
@@ -161,7 +161,7 @@ const GeneralSettings = () => {
  className="mt-3"
  >
  {permissionsResult.isFetching && (
- <FontAwesomeIcon icon={faCircleNotch} spin size="1x" />
+ <FontAwesomeIcon icon={faCircleNotch} spin className="me-2" size="1x" />
  )}
  Run Permissions Check
  </CButton>
@@ -186,7 +186,7 @@ const GeneralSettings = () => {
  className="mt-3"
  >
  {clearCacheResult.isFetching && (
- <FontAwesomeIcon icon={faCircleNotch} spin size="1x" />
+ <FontAwesomeIcon icon={faCircleNotch} spin className="me-2" size="1x" />
  )}
  Clear Cache
  </CButton>
@@ -222,7 +222,7 @@ const GeneralSettings = () => {
  <br />
  <CButton onClick={() => handleCheckAccess()} disabled={accessCheckResult.isFetching}>
  {accessCheckResult.isFetching && (
- <FontAwesomeIcon icon={faCircleNotch} spin size="1x" />
+ <FontAwesomeIcon icon={faCircleNotch} spin className="me-2" size="1x" />
  )}
  Run access check
  </CButton>
@@ -445,7 +445,9 @@ const NotificationsSettings = () => {
  return (
  <>
  {notificationListResult.isUninitialized && listNotification()}
- {notificationListResult.isFetching && <FontAwesomeIcon icon={faCircleNotch} spin size="1x" />}
+ {notificationListResult.isFetching && (
+ <FontAwesomeIcon icon={faCircleNotch} spin className="me-2" size="1x" />
+ )}
  {!notificationListResult.isFetching && notificationListResult.error && (
  <span>Error loading data</span>
  )}

diff --git a/src/views/identity/administration/AddUser.js b/src/views/identity/administration/AddUser.js
@@ -386,7 +386,12 @@ const AddUser = () => {
  <CButton type="submit" disabled={submitting || formDisabled}>
  Edit User
  {postResults.isFetching && (
- <FontAwesomeIcon icon={faCircleNotch} spin size="1x" />
+ <FontAwesomeIcon
+ icon={faCircleNotch}
+ spin
+ className="me-2"
+ size="1x"
+ />
  )}
  </CButton>
  </CCol>

diff --git a/src/views/identity/administration/EditUser.js b/src/views/identity/administration/EditUser.js
@@ -386,7 +386,7 @@ const EditUser = () => {
  <CButton type="submit" disabled={submitting || formDisabled}>
  Edit User
  {postResults.isFetching && (
- <FontAwesomeIcon icon={faCircleNotch} spin size="1x" />
+ <FontAwesomeIcon icon={faCircleNotch} spin className="me-2" size="1x" />
  )}
  </CButton>
  </CCol>

diff --git a/src/views/tenant/standards/IndividualDomain.js b/src/views/tenant/standards/IndividualDomain.js
@@ -93,7 +93,7 @@ const IndividualDomainCheck = () => {
  color="primary"
  >
  {isFetching && (
- <FontAwesomeIcon icon={faCircleNotch} spin size="1x" className="mx-1" />
+ <FontAwesomeIcon icon={faCircleNotch} spin size="1x" className="me-2" />
  )}
  Check Domain
  </CButton>