Skip to content

Commit 422dd12

Browse files
committed
custom theming changes added
1 parent 7e82bd7 commit 422dd12

File tree

6 files changed

+23
-7
lines changed

6 files changed

+23
-7
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,8 @@
4646

4747
.success {
4848
color: var(--color-success);
49+
}
50+
51+
.popover{
52+
font-family: var(--primary-font) !important;
4953
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,5 +203,4 @@ export const IS_ENTERPRISE = window._env_?.REACT_APP_IS_ENTERPRISE || false;
203203

204204

205205
export const USER_NAME_DISPLAY_CLAIM =
206-
window._env_?.REACT_APP_USER_NAME_DISPLAY_CLAIM ||
207-
process.env.REACT_APP_USER_NAME_DISPLAY_CLAIM;
206+
window.env?.REACT_APP_USER_NAME_DISPLAY_CLAIM;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import PropTypes from "prop-types";
1010
export default function Root(props) {
1111
const customLogoPath = StyleServices?.getCSSVariable("--custom-logo-path");
1212
const customTitle = StyleServices?.getCSSVariable("--custom-title");
13-
const customLogoAlignment = StyleServices?.getCSSVariable("--custom-logo-horizontal-align");
13+
const customLogoAlignment = StyleServices?.getCSSVariable("--custom-logo-horizontal-align")?.toLowerCase();
1414
const logoAlignmentClass = useMemo(() => {
1515
switch (customLogoAlignment) {
1616
case "left":

forms-flow-theme/scss/_button.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ $btn-font-weight: bold;
7575
}
7676

7777
.delete_button {
78-
color: var(--ff-danger);
78+
color: var(--default-danger-color) !important;
7979
cursor: pointer;
8080
transition: transform 0.5s, color 0.5s;
8181

forms-flow-theme/scss/_forms.scss

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ select option:hover {
459459
border-top: 0.1875rem dashed var(--ff-gray-300);
460460
}
461461

462-
//custom switch for sdpr
462+
//custom styles for sdpr
463463
.custom-switch-checkbox {
464464
background-color: #EDEBE9 !important;
465465
border: none !important;
@@ -499,4 +499,17 @@ select option:hover {
499499
outline: none !important;
500500
box-shadow: none !important;
501501
}
502-
}
502+
}
503+
504+
.btn-danger{
505+
background-color: var(--default-danger-color) !important;
506+
}
507+
508+
div.text-danger,
509+
p.text-danger,
510+
i.text-danger,
511+
span.text-danger,
512+
.btn-link.text-danger,
513+
.modal-title.text-danger {
514+
color: var(--default-danger-color) !important;
515+
}

forms-flow-theme/scss/_theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ $theme-colors: map-merge($theme-colors, $custom-colors);
205205
--default-danger-color: #dc3545;
206206
}
207207

208-
$danger: --default-danger-color;
208+
$danger: var(--default-danger-color);
209209

210210
body {
211211
color: var(--default-font-color) !important;

0 commit comments

Comments
 (0)