Merge pull request #491 from Ajay-aot/bugfix/FWF-4402-sdpr-changes

custom theming updates for patch 7.0.1

Author: arun-s-aot

forms-flow-admin/src/components/users/users.scss

@@ -46,4 +46,8 @@
 
 .success {
     color: var(--color-success);
+}
+
+.popover{
+    font-family: var(--primary-font) !important;
 }

forms-flow-nav/src/constants/constants.js

@@ -203,5 +203,4 @@ export const IS_ENTERPRISE = window._env_?.REACT_APP_IS_ENTERPRISE || false;
 
 
 export const USER_NAME_DISPLAY_CLAIM =
-   window._env_?.REACT_APP_USER_NAME_DISPLAY_CLAIM ||
-  process.env.REACT_APP_USER_NAME_DISPLAY_CLAIM;
+   window.env?.REACT_APP_USER_NAME_DISPLAY_CLAIM;

forms-flow-nav/src/root.component.js

@@ -10,7 +10,7 @@ import PropTypes from "prop-types";
 export default function Root(props) {
   const customLogoPath =  StyleServices?.getCSSVariable("--custom-logo-path");
   const customTitle = StyleServices?.getCSSVariable("--custom-title");
-  const customLogoAlignment =  StyleServices?.getCSSVariable("--custom-logo-horizontal-align");
+  const customLogoAlignment =  StyleServices?.getCSSVariable("--custom-logo-horizontal-align")?.toLowerCase();
   const logoAlignmentClass = useMemo(() => {
     switch (customLogoAlignment) {
       case "left":

forms-flow-theme/scss/_button.scss

@@ -75,7 +75,7 @@ $btn-font-weight: bold;
 }
 
 .delete_button {
-  color: var(--ff-danger);
+  color: var(--default-danger-color) !important;
   cursor: pointer;
   transition: transform 0.5s, color 0.5s;
 

forms-flow-theme/scss/_forms.scss

@@ -459,7 +459,7 @@ select option:hover {
   border-top: 0.1875rem dashed var(--ff-gray-300);
 }
 
-//custom switch for sdpr
+//custom styles  for sdpr
 .custom-switch-checkbox {
   background-color: #EDEBE9 !important;
   border: none !important;
@@ -499,4 +499,17 @@ select option:hover {
     outline: none !important;
     box-shadow: none !important;
   }
-}
+}
+
+.btn-danger{
+  background-color: var(--default-danger-color) !important;
+}
+
+div.text-danger,
+p.text-danger,
+i.text-danger,
+span.text-danger,
+.btn-link.text-danger,
+.modal-title.text-danger {
+  color: var(--default-danger-color) !important;
+}

forms-flow-theme/scss/_theme.scss

@@ -205,7 +205,7 @@ $theme-colors: map-merge($theme-colors, $custom-colors);
   --default-danger-color: #dc3545;
 }
 
-$danger: --default-danger-color;
+$danger: var(--default-danger-color);
 
 body {
   color: var(--default-font-color) !important;