Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

XWIKI-13912: Impossible to control contrast of the panel headers on Flamingo #2497

Merged
merged 12 commits into from
Jan 18, 2024
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@

.accordionTabTitleBar h1 {
display:block;
background-color: @xwiki-panel-header-bg;
background-color: @panel-header-bg;
background-image: url(@xwiki-accordion-title-bar-background);
background-repeat: no-repeat;
background-position: center left;
border-bottom: 1px solid @xwiki-border-color;
color: @xwiki-panel-header-text;
color: @panel-header-text;
font: 700 .8em / 1.8em sans-serif;
margin: 0;
overflow: hidden;
Expand All @@ -30,4 +30,4 @@
.openDetails {
cursor: pointer;
float: right;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
#mapping("menuSelectedEntryLinkColor" "@navbar-default-link-active-color")
#mapping("panelBackgroundColor", "@panel-bg")
#mapping("panelTextColor", "@panel-default-text")
#mapping("panelHeaderTextColor", "@xwiki-panel-header-text")
#mapping("panelHeaderBackgroundColor", "@xwiki-panel-header-bg")
#mapping("panelHeaderTextColor", "@panel-header-text")
#mapping("panelHeaderBackgroundColor", "@panel-header-bg")
#mapping("buttonPrimaryTextColor", "@btn-primary-color")
#mapping("buttonPrimaryBackgroundColor", "@btn-primary-bg")
#mapping("buttonSecondaryTextColor", "@btn-default-color")
Expand All @@ -54,4 +54,4 @@
#mapping("notificationSuccessColor", "@brand-success")
#mapping("notificationInfoColor", "@brand-info")
#mapping("notificationWarningColor", "@brand-warning")
#mapping("notificationErrorColor", "@brand-danger")
#mapping("notificationErrorColor", "@brand-danger")
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ h1.xwikipaneltitle {
.panel-title;
margin: @padding-small-vertical @padding-large-horizontal @padding-large-vertical;
padding: 0 0 @padding-large-vertical;
color: @xwiki-panel-header-text;
color: @panel-header-text;
border-bottom: @border-width solid @xwiki-page-content-bg;
box-shadow: 0 @border-width 0 @xwiki-border-color;
overflow: hidden;
Expand Down Expand Up @@ -58,4 +58,4 @@ a.panel-collapse-carret {
.panel-radio {
float: left;
padding: 15px
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,9 @@

@panel-bg: $theme.panelBackgroundColor;
@panel-default-text: $theme.panelTextColor;
@panel-header-bg: $theme.panelHeaderBackgroundColor;
@panel-header-text: $theme.panelHeaderTextColor;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't it be better to (additionally) keep the old variable names for backwards-compatibility?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressed in 5587492 👍

## Kept for backward compatibility
@xwiki-panel-header-bg: $theme.panelHeaderBackgroundColor;
@xwiki-panel-header-text: $theme.panelHeaderTextColor;

Expand Down Expand Up @@ -194,6 +197,7 @@
"legend-border-color": "color",
"panel-bg" : "color",
"panel-default-text" : "color",
"panel-header-text" : "color",
"breadcrumb-bg": "color",
"breadcrumb-color": "color",
"breadcrumb-separator": "escapedText",
Expand Down Expand Up @@ -225,13 +229,16 @@
## currently, it comes from the old color theme object (see colorThemeInit.vm)
// Default
@xwiki-border-color: $theme.borderColor;
@xwiki-panel-header-bg: $theme.panelHeaderBackgroundColor;
@xwiki-panel-header-text: $theme.panelHeaderTextColor;
@panel-header-bg: $theme.panelHeaderBackgroundColor;
@panel-header-text: $theme.panelHeaderTextColor;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here, wouldn't it be better to (additionally) keep the old variable names for backwards-compatibility?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressed in 5587492 👍

@xwiki-page-content-bg: $theme.pageContentBackgroundColor;
@xwiki-background-secondary-color: $theme.backgroundSecondaryColor;
@xwiki-page-header-bg-color: $theme.pageHeaderBackgroundColor;
@xwiki-page-header-bg-image: $stringtool.defaultString($theme.headerBackgroundImage, '""');
@xwiki-page-header-bg-position: $stringtool.defaultString($theme.headerBackgroundPosition, '""');
## Kept for backward compatibility
@xwiki-panel-header-bg: $theme.panelHeaderBackgroundColor;
@xwiki-panel-header-text: $theme.panelHeaderTextColor;

## Some values are changed from the bootstrap default in order to make sure there's no accessibility contrast issue
## Make sure the links are dark enough in the tmDrawer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -753,6 +753,19 @@
<validationRegExp/>
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
</panel-bg>
<panel-header-text>
<customDisplay/>
<disabled>0</disabled>
<name>panel-header-text</name>
<number>46</number>
<picker>0</picker>
<prettyName>panel-header-text</prettyName>
<size>30</size>
<unmodifiable>0</unmodifiable>
<validationMessage/>
<validationRegExp/>
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
</panel-header-text>
<text-color>
<customDisplay/>
<disabled>0</disabled>
Expand Down Expand Up @@ -1941,6 +1954,9 @@
<property>
<panel-bg/>
</property>
<property>
<panel-header-text/>
</property>
<property>
<text-color/>
</property>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -744,6 +744,19 @@
<validationRegExp/>
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
</panel-bg>
<panel-header-text>
<customDisplay/>
<disabled>0</disabled>
<name>panel-header-text</name>
<number>46</number>
<picker>0</picker>
<prettyName>panel-header-text</prettyName>
<size>30</size>
<unmodifiable>0</unmodifiable>
<validationMessage/>
<validationRegExp/>
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
</panel-header-text>
<text-color>
<customDisplay/>
<disabled>0</disabled>
Expand Down Expand Up @@ -2059,6 +2072,9 @@ a.list-group-item {
<property>
<panel-bg/>
</property>
<property>
<panel-header-text/>
</property>
<property>
<text-color/>
</property>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -753,6 +753,19 @@
<validationRegExp/>
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
</panel-bg>
<panel-header-text>
<customDisplay/>
<disabled>0</disabled>
<name>panel-header-text</name>
<number>46</number>
<picker>0</picker>
<prettyName>panel-header-text</prettyName>
<size>30</size>
<unmodifiable>0</unmodifiable>
<validationMessage/>
<validationRegExp/>
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
</panel-header-text>
<text-color>
<customDisplay/>
<disabled>0</disabled>
Expand Down Expand Up @@ -2050,6 +2063,9 @@ a.list-group-item {
<property>
<panel-bg>#060606</panel-bg>
</property>
<property>
<panel-default-text>#ffffff</panel-default-text>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like a bad merge.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressed in 9c640c2 👍

</property>
<property>
<text-color>#999999</text-color>
</property>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -753,6 +753,19 @@
<validationRegExp/>
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
</panel-bg>
<panel-header-text>
<customDisplay/>
<disabled>0</disabled>
<name>panel-header-text</name>
<number>46</number>
<picker>0</picker>
<prettyName>panel-header-text</prettyName>
<size>30</size>
<unmodifiable>0</unmodifiable>
<validationMessage/>
<validationRegExp/>
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
</panel-header-text>
<text-color>
<customDisplay/>
<disabled>0</disabled>
Expand Down Expand Up @@ -2155,6 +2168,9 @@ a.list-group-item {
<property>
<panel-bg>#222222</panel-bg>
</property>
<property>
<panel-header-text/>
</property>
<property>
<text-color>#ffffff</text-color>
</property>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -753,6 +753,19 @@
<validationRegExp/>
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
</panel-bg>
<panel-header-text>
<customDisplay/>
<disabled>0</disabled>
<name>panel-header-text</name>
<number>46</number>
<picker>0</picker>
<prettyName>panel-header-text</prettyName>
<size>30</size>
<unmodifiable>0</unmodifiable>
<validationMessage/>
<validationRegExp/>
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
</panel-header-text>
<text-color>
<customDisplay/>
<disabled>0</disabled>
Expand Down Expand Up @@ -2138,6 +2151,9 @@ a.list-group-item {
<property>
<panel-bg/>
</property>
<property>
<panel-header-text/>
</property>
<property>
<text-color/>
</property>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -744,6 +744,19 @@
<validationRegExp/>
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
</panel-bg>
<panel-header-text>
<customDisplay/>
<disabled>0</disabled>
<name>panel-header-text</name>
<number>46</number>
<picker>0</picker>
<prettyName>panel-header-text</prettyName>
<size>30</size>
<unmodifiable>0</unmodifiable>
<validationMessage/>
<validationRegExp/>
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
</panel-header-text>
<text-color>
<customDisplay/>
<disabled>0</disabled>
Expand Down Expand Up @@ -1944,6 +1957,9 @@
<property>
<panel-bg/>
</property>
<property>
<panel-header-text/>
</property>
<property>
<text-color/>
</property>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -744,6 +744,19 @@
<validationRegExp/>
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
</panel-bg>
<panel-header-text>
<customDisplay/>
<disabled>0</disabled>
<name>panel-header-text</name>
<number>46</number>
<picker>0</picker>
<prettyName>panel-header-text</prettyName>
<size>30</size>
<unmodifiable>0</unmodifiable>
<validationMessage/>
<validationRegExp/>
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
</panel-header-text>
<text-color>
<customDisplay/>
<disabled>0</disabled>
Expand Down Expand Up @@ -2320,6 +2333,9 @@ a.list-group-item {
<property>
<panel-bg/>
</property>
<property>
<panel-header-text/>
</property>
<property>
<text-color/>
</property>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -744,6 +744,19 @@
<validationRegExp/>
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
</panel-bg>
<panel-header-text>
<customDisplay/>
<disabled>0</disabled>
<name>panel-header-text</name>
<number>46</number>
<picker>0</picker>
<prettyName>panel-header-text</prettyName>
<size>30</size>
<unmodifiable>0</unmodifiable>
<validationMessage/>
<validationRegExp/>
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
</panel-header-text>
<text-color>
<customDisplay/>
<disabled>0</disabled>
Expand Down Expand Up @@ -2431,6 +2444,9 @@ div.main {
<property>
<panel-bg/>
</property>
<property>
<panel-header-text/>
</property>
<property>
<text-color/>
</property>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -744,6 +744,19 @@
<validationRegExp/>
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
</panel-bg>
<panel-header-text>
<customDisplay/>
<disabled>0</disabled>
<name>panel-header-text</name>
<number>46</number>
<picker>0</picker>
<prettyName>panel-header-text</prettyName>
<size>30</size>
<unmodifiable>0</unmodifiable>
<validationMessage/>
<validationRegExp/>
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
</panel-header-text>
<text-color>
<customDisplay/>
<disabled>0</disabled>
Expand Down Expand Up @@ -1997,6 +2010,9 @@ legend {
<property>
<panel-bg/>
</property>
<property>
<panel-header-text/>
</property>
<property>
<text-color/>
</property>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -753,6 +753,19 @@
<validationRegExp/>
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
</panel-bg>
<panel-header-text>
<customDisplay/>
<disabled>0</disabled>
<name>panel-header-text</name>
<number>46</number>
<picker>0</picker>
<prettyName>panel-header-text</prettyName>
<size>30</size>
<unmodifiable>0</unmodifiable>
<validationMessage/>
<validationRegExp/>
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
</panel-header-text>
<text-color>
<customDisplay/>
<disabled>0</disabled>
Expand Down Expand Up @@ -2003,6 +2016,9 @@ input,
<property>
<panel-bg/>
</property>
<property>
<panel-header-text/>
</property>
<property>
<text-color/>
</property>
Expand Down
Loading