Skip to content

Commit 8929e7c

Browse files
authored
Merge branch 'form-ui-changes' into form-ui-dev-merge
2 parents d17d0ff + 0d7c9b2 commit 8929e7c

3 files changed

Lines changed: 7 additions & 40 deletions

File tree

assets/css/udoit4-theme.css

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1477,42 +1477,3 @@
14771477
display: none !important;
14781478
}
14791479
}
1480-
1481-
/* The separator class is for a horizontal line with text in the middle on various forms */
1482-
1483-
.separator {
1484-
display: flex;
1485-
align-items: center;
1486-
text-align: center;
1487-
text-transform: uppercase;
1488-
font-weight: 600;
1489-
}
1490-
1491-
.separator::before,
1492-
.separator::after {
1493-
content: '';
1494-
flex: 1;
1495-
border-bottom: 1px solid var(--border-color);
1496-
}
1497-
1498-
.separator:not(:empty)::before {
1499-
margin-right: .5em;
1500-
margin-left: 1.5rem;
1501-
border-width: 2px;
1502-
border-color: var(--gray);
1503-
}
1504-
1505-
.separator:not(:empty)::after {
1506-
margin-left: .5em;
1507-
margin-right: 1.5rem;
1508-
border-width: 2px;
1509-
border-color: var(--gray);
1510-
}
1511-
1512-
.separator-pipe {
1513-
height: 1.5em;
1514-
width: 0px;
1515-
box-sizing: content-box;
1516-
align-self: center;
1517-
border-inline-start: 1px solid var(--border-color);
1518-
}

assets/js/Components/Forms/ContrastForm.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ export default function ContrastForm({
2222
setFormErrors
2323
}) {
2424

25+
const FORM_OPTIONS = {
26+
SET_COLOR: settings.UFIXIT_OPTIONS.EDIT_ATTRIBUTE
27+
}
28+
2529
const GRADIENT_KEYWORDS = new Set([
2630
'linear', 'radial', 'repeating-linear', 'repeating-radial', 'gradient',
2731
'to', 'top', 'bottom', 'left', 'right', 'circle', 'ellipse', 'at', 'center'

src/Services/EqualAccessService.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@ public function generateReport($json) {
5656
$issues = array();
5757
$skipRules = $this->getSkipRules();
5858

59-
foreach ($json["results"] as $results) {
59+
if (array_key_exists("results", $json)) {
60+
61+
foreach ($json["results"] as $results) {
6062
$equalAccessRule = $results["ruleId"];
6163
$xpathQuery = $results["path"]["dom"];
6264
$metadata = null;

0 commit comments

Comments
 (0)