Skip to content

Commit dec0491

Browse files
committed
Revert #14832 and Improve Tree Resource Contrast to Fix #16465
This PR reverts #14832 and implements improved color contrast and icon styling to resolve the usability issue described in #16465. - Restores the previous SCSS files removed in #14832 - Adjusts color variables for better contrast and clarity - Aligns MODX 3 tree display with MODX 2 behavior for hidden/unpublished resources Fixes #16465. Requires asset build to see changes.
1 parent 618ffaf commit dec0491

File tree

3 files changed

+20
-26
lines changed

3 files changed

+20
-26
lines changed

_build/templates/default/sass/_colors-and-vars.scss

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ $treeHeaderBorder: 1px solid #CDCDCD;
132132
$treeHeaderBg: $lightestGray;
133133
$treeBg: $lightestGray;
134134
$treeBgSelected: #D6E7F8;
135-
$treeColor: $darkGray;
135+
$treeColor: darken($darkGray,10%);
136136
$treeColorDesaturated: lighten(desaturate($treeColor,100%), 25%);
137137
$treeColor_2: #728DA7;
138138
$treePseudoRootBg: #F1F1F1;
@@ -145,17 +145,16 @@ $treeItemBg: $white;
145145
$treeItemColor: $mediumGray;
146146

147147
$iconColor: $treeText;
148+
$unpublished: $treeText;
148149

149150
$deactivatedTextColor: lighten($treeColor, 35%); // do not use 50% here - makes base color nearly invisible
150151
$disabledTextColor: $deactivatedTextColor;
151152

152-
$unpublished: lighten($treeText, 10%) !important;
153-
$hidden: $treeText;
154-
$unpubText: normal;
155-
$hiddenText: italic;
156-
// locked is already signaled with lock-icon, no need to use other semantic style here
157-
// as italic is used for "unpublished"
158-
$lockedText: inherit; // italic;
153+
$hidden: darken($treeText,5%) !important;
154+
$unpubText: italic;
155+
/* locked is already signaled with lock-icon, no need to use other semantic style here
156+
as italic is used for "unpublished" */
157+
$lockedText: inherit; //italic;
159158

160159
$delTextColor: fade-out(darken(lighten(desaturate($red,50%), 33%), 25%), 0.5) !important;
161160
$delTextStyle: normal;

_build/templates/default/sass/_tree.scss

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -219,15 +219,20 @@
219219

220220
i.icon,
221221
i.icon-large {
222-
color: $unpublished;
223222
font-style: normal;
223+
color: $treeColor;
224224
}
225225
}
226226

227227
.hidemenu,
228228
.hidemenu a span {
229229
color: $hidden;
230-
font-style: $hiddenText;
230+
font-style: normal;
231+
232+
&.unpublished,
233+
&.unpublished a span {
234+
font-style: $unpubText;
235+
}
231236

232237
i.icon,
233238
i.icon-large {
@@ -241,8 +246,7 @@
241246

242247
i.icon,
243248
i.icon-large {
244-
color: $delTextColor;
245-
font-style: normal;
249+
color: $delTextColor; // font-style: normal;
246250
}
247251

248252
a span {

_build/templates/default/sass/index.scss

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ hr {
128128

129129
.not-installed {
130130
color: $mediumGray;
131-
font-style: $hiddenText;
131+
font-style: $hidden;
132132
}
133133

134134
.yellow {
@@ -1640,28 +1640,19 @@ iframe[classname="x-hidden"] {
16401640
font: normal 18px $bodyfonts;
16411641
text-decoration: none;
16421642

1643-
&.menu_hidden {
1644-
font-style: $hiddenText;
1645-
1646-
&:hover {
1647-
color: darken($colorSplash, 10%);
1648-
}
1649-
}
1650-
16511643
&.not_published {
1652-
color: $unpublished;
1644+
font-style: $unpubText;
16531645

16541646
&:hover {
16551647
color: darken($colorSplash, 10%);
16561648
}
16571649
}
16581650

1659-
&.deleted {
1660-
color: $delTextColor;
1661-
text-decoration: $delTextDeco;
1651+
&.menu_hidden {
1652+
color: $hidden;
16621653

16631654
&:hover {
1664-
color: darken($colorSplash, 10%);
1655+
color: darken($colorSplash, 10%) !important;
16651656
}
16661657
}
16671658
}

0 commit comments

Comments
 (0)