From a5f43e7056c19a1a7745e74602e0eb8d4eb9f1dc Mon Sep 17 00:00:00 2001 From: Sereza7 Date: Thu, 13 Jul 2023 14:28:35 +0200 Subject: [PATCH 1/9] XWIKI-13912: Impossible to control contrast of the panel headers on Flamingo * Added the panel header text color to the ThemeSheet.xml * Changed the name of the variable to fit other variables in the tab --- .../src/main/resources/flamingo/less/accordion.less | 4 ++-- .../resources/flamingo/less/colorThemeMappingOutput.vm | 4 ++-- .../src/main/resources/flamingo/less/panels.less | 4 ++-- .../src/main/resources/flamingo/less/variablesInit.vm | 7 ++++--- .../src/main/resources/FlamingoThemes/Superhero.xml | 2 +- .../src/main/resources/FlamingoThemesCode/ThemeSheet.xml | 3 ++- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/accordion.less b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/accordion.less index 47ec616d3aca..f663040a12cc 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/accordion.less +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/accordion.less @@ -9,7 +9,7 @@ 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; @@ -30,4 +30,4 @@ .openDetails { cursor: pointer; float: right; -} \ No newline at end of file +} diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/colorThemeMappingOutput.vm b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/colorThemeMappingOutput.vm index 3cf4683c96f8..e7b35323d24b 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/colorThemeMappingOutput.vm +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/colorThemeMappingOutput.vm @@ -42,7 +42,7 @@ #mapping("menuSelectedEntryLinkColor" "@navbar-default-link-active-color") #mapping("panelBackgroundColor", "@panel-bg") #mapping("panelTextColor", "@panel-default-text") -#mapping("panelHeaderTextColor", "@xwiki-panel-header-text") +#mapping("panelHeaderTextColor", "@panel-header-text") #mapping("panelHeaderBackgroundColor", "@xwiki-panel-header-bg") #mapping("buttonPrimaryTextColor", "@btn-primary-color") #mapping("buttonPrimaryBackgroundColor", "@btn-primary-bg") @@ -54,4 +54,4 @@ #mapping("notificationSuccessColor", "@brand-success") #mapping("notificationInfoColor", "@brand-info") #mapping("notificationWarningColor", "@brand-warning") -#mapping("notificationErrorColor", "@brand-danger") \ No newline at end of file +#mapping("notificationErrorColor", "@brand-danger") diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/panels.less b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/panels.less index 638306a589f8..244bef73fdd6 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/panels.less +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/panels.less @@ -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; @@ -55,4 +55,4 @@ a.panel-collapse-carret { .panel-radio { float: left; padding: 15px -} \ No newline at end of file +} diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/variablesInit.vm b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/variablesInit.vm index c72e59efa273..bf07131d7462 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/variablesInit.vm +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/variablesInit.vm @@ -99,7 +99,7 @@ @panel-bg: $theme.panelBackgroundColor; @panel-default-text: $theme.panelTextColor; @xwiki-panel-header-bg: $theme.panelHeaderBackgroundColor; - @xwiki-panel-header-text: $theme.panelHeaderTextColor; + @panel-header-text: $theme.panelHeaderTextColor; ## ## XWiki variables: LESS variables specific to XWiki @@ -194,6 +194,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", @@ -226,7 +227,7 @@ // Default @xwiki-border-color: $theme.borderColor; @xwiki-panel-header-bg: $theme.panelHeaderBackgroundColor; - @xwiki-panel-header-text: $theme.panelHeaderTextColor; + @panel-header-text: $theme.panelHeaderTextColor; @xwiki-page-content-bg: $theme.pageContentBackgroundColor; @xwiki-background-secondary-color: $theme.backgroundSecondaryColor; @xwiki-page-header-bg-color: $theme.pageHeaderBackgroundColor; @@ -283,4 +284,4 @@ @xwiki-icon-edit-section: "\f040"; @xwiki-icon-spinner: "$xwiki.getSkinFile('icons/xwiki/spinner.gif')"; @xwiki-icon-spinner-height: 16px; -@xwiki-icon-link-external: "$xwiki.getSkinFile('icons/xwiki/external-link.png')"; \ No newline at end of file +@xwiki-icon-link-external: "$xwiki.getSkinFile('icons/xwiki/external-link.png')"; diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Superhero.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Superhero.xml index 01f8d83eb58b..088c24497d4b 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Superhero.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Superhero.xml @@ -2138,7 +2138,7 @@ div.main { box-shadow: none; } -@xwiki-panel-header-text: @navbar-default-color; +@panel-header-text: @navbar-default-color; @xwiki-page-content-bg: @body-bg; @text-muted: @navbar-default-color; diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemesCode/ThemeSheet.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemesCode/ThemeSheet.xml index c3e5d22861e1..c3f78970ed81 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemesCode/ThemeSheet.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemesCode/ThemeSheet.xml @@ -125,7 +125,8 @@ }, "panels": { "panel-bg" : "color", - "panel-default-text" : "color" + "panel-default-text" : "color", + "panel-header-text" : "color" }, "breadcrumb": { "breadcrumb-bg": "color", From 983ebcdb6a8a5212558e0f710278869f9fb9b7e0 Mon Sep 17 00:00:00 2001 From: Sereza7 Date: Wed, 20 Sep 2023 09:50:07 +0200 Subject: [PATCH 2/9] XWIKI-13912: Impossible to control contrast of the panel headers on Flamingo * Updated color themes --- .../main/resources/FlamingoThemes/Cerulean.xml | 13 +++++++++++++ .../src/main/resources/FlamingoThemes/Cosmo.xml | 13 +++++++++++++ .../src/main/resources/FlamingoThemes/Cyborg.xml | 13 +++++++++++++ .../src/main/resources/FlamingoThemes/Darkly.xml | 13 +++++++++++++ .../src/main/resources/FlamingoThemes/Flatly.xml | 13 +++++++++++++ .../main/resources/FlamingoThemes/Journal.xml | 13 +++++++++++++ .../src/main/resources/FlamingoThemes/Lumen.xml | 13 +++++++++++++ .../src/main/resources/FlamingoThemes/Paper.xml | 13 +++++++++++++ .../main/resources/FlamingoThemes/Readable.xml | 13 +++++++++++++ .../main/resources/FlamingoThemes/Sandstone.xml | 13 +++++++++++++ .../main/resources/FlamingoThemes/Simplex.xml | 13 +++++++++++++ .../src/main/resources/FlamingoThemes/Slate.xml | 13 +++++++++++++ .../main/resources/FlamingoThemes/Spacelab.xml | 13 +++++++++++++ .../main/resources/FlamingoThemes/Superhero.xml | 13 +++++++++++++ .../src/main/resources/FlamingoThemes/United.xml | 13 +++++++++++++ .../src/main/resources/FlamingoThemes/Yeti.xml | 13 +++++++++++++ .../main/resources/FlamingoThemes/Charcoal.xml | 13 +++++++++++++ .../src/main/resources/FlamingoThemes/Garden.xml | 16 ++++++++++++++++ .../main/resources/FlamingoThemes/Iceberg.xml | 16 ++++++++++++++++ .../src/main/resources/FlamingoThemes/Kitty.xml | 13 +++++++++++++ .../src/main/resources/FlamingoThemes/Marina.xml | 16 ++++++++++++++++ .../FlamingoThemesCode/ThemeTemplate.xml | 16 ++++++++++++++++ 22 files changed, 298 insertions(+) diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cerulean.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cerulean.xml index d213d608e058..cfc5a79508c1 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cerulean.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cerulean.xml @@ -766,6 +766,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-color + 46 + 0 + panel-header-color + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cosmo.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cosmo.xml index 77be542d646c..c14f7565a278 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cosmo.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cosmo.xml @@ -757,6 +757,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-color + 46 + 0 + panel-header-color + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cyborg.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cyborg.xml index 4bde1b857594..1460fb850c8b 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cyborg.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cyborg.xml @@ -766,6 +766,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-color + 46 + 0 + panel-header-color + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Darkly.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Darkly.xml index 9a6f704d179b..087d16c393cb 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Darkly.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Darkly.xml @@ -766,6 +766,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-color + 46 + 0 + panel-header-color + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Flatly.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Flatly.xml index 6d8c68408695..b448ed57b6d2 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Flatly.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Flatly.xml @@ -766,6 +766,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-color + 46 + 0 + panel-header-color + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Journal.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Journal.xml index 375ab1c1e52e..d53369f602d2 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Journal.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Journal.xml @@ -757,6 +757,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-color + 46 + 0 + panel-header-color + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Lumen.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Lumen.xml index b8713f747e1a..6d5811202d36 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Lumen.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Lumen.xml @@ -757,6 +757,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-color + 46 + 0 + panel-header-color + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Paper.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Paper.xml index 099d56046315..7a4a1ebf4352 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Paper.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Paper.xml @@ -757,6 +757,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-color + 46 + 0 + panel-header-color + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Readable.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Readable.xml index 215370d91d80..3398c9cef495 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Readable.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Readable.xml @@ -757,6 +757,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-color + 46 + 0 + panel-header-color + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Sandstone.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Sandstone.xml index 36da68f9d21b..d170f09d887f 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Sandstone.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Sandstone.xml @@ -766,6 +766,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-color + 46 + 0 + panel-header-color + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Simplex.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Simplex.xml index 3ce60fb30758..64599a85e9d4 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Simplex.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Simplex.xml @@ -757,6 +757,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-color + 46 + 0 + panel-header-color + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Slate.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Slate.xml index 988451a7615b..5bd0e5a4b6f5 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Slate.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Slate.xml @@ -766,6 +766,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-color + 46 + 0 + panel-header-color + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Spacelab.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Spacelab.xml index 5dec83763ff0..ba74666907cd 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Spacelab.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Spacelab.xml @@ -757,6 +757,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-color + 46 + 0 + panel-header-color + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Superhero.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Superhero.xml index 088c24497d4b..3a3d9b453905 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Superhero.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Superhero.xml @@ -766,6 +766,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-color + 46 + 0 + panel-header-color + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/United.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/United.xml index 04dae73e4b40..ce0344e1d607 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/United.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/United.xml @@ -766,6 +766,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-color + 46 + 0 + panel-header-color + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Yeti.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Yeti.xml index 478607256088..c07e1794c9e0 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Yeti.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Yeti.xml @@ -757,6 +757,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-color + 46 + 0 + panel-header-color + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Charcoal.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Charcoal.xml index bc5a36725190..9a396b344c48 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Charcoal.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Charcoal.xml @@ -757,6 +757,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-color + 46 + 0 + panel-header-color + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Garden.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Garden.xml index 6c54005da991..0c97f9d31056 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Garden.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Garden.xml @@ -766,6 +766,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-color + 46 + 0 + panel-header-color + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 @@ -975,6 +988,9 @@ body{ + + + #030f02 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Iceberg.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Iceberg.xml index 5dfd2b0377af..3f42e4e860e1 100755 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Iceberg.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Iceberg.xml @@ -766,6 +766,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-color + 46 + 0 + panel-header-color + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 @@ -1020,6 +1033,9 @@ + + + diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Kitty.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Kitty.xml index 593b4d5f3c17..0ae8adb3877c 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Kitty.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Kitty.xml @@ -766,6 +766,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-color + 46 + 0 + panel-header-color + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Marina.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Marina.xml index 0da21954d494..ca73c4b93524 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Marina.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Marina.xml @@ -766,6 +766,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-color + 46 + 0 + panel-header-color + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 @@ -972,6 +985,9 @@ + + + #091154 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemesCode/ThemeTemplate.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemesCode/ThemeTemplate.xml index c3828c86b4b1..c9b5f1f4b760 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemesCode/ThemeTemplate.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemesCode/ThemeTemplate.xml @@ -757,6 +757,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-color + 46 + 0 + panel-header-color + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 @@ -952,6 +965,9 @@ + + + From 5e32302ac2360d3382927b6c8d543188cba84d5b Mon Sep 17 00:00:00 2001 From: Sereza7 Date: Wed, 20 Sep 2023 10:05:09 +0200 Subject: [PATCH 3/9] XWIKI-13912: Impossible to control contrast of the panel headers on Flamingo * Fixed property name --- .../src/main/resources/FlamingoThemes/Cerulean.xml | 8 ++++---- .../src/main/resources/FlamingoThemes/Cosmo.xml | 8 ++++---- .../src/main/resources/FlamingoThemes/Cyborg.xml | 8 ++++---- .../src/main/resources/FlamingoThemes/Darkly.xml | 8 ++++---- .../src/main/resources/FlamingoThemes/Flatly.xml | 8 ++++---- .../src/main/resources/FlamingoThemes/Journal.xml | 8 ++++---- .../src/main/resources/FlamingoThemes/Lumen.xml | 8 ++++---- .../src/main/resources/FlamingoThemes/Paper.xml | 8 ++++---- .../src/main/resources/FlamingoThemes/Readable.xml | 8 ++++---- .../src/main/resources/FlamingoThemes/Sandstone.xml | 8 ++++---- .../src/main/resources/FlamingoThemes/Simplex.xml | 8 ++++---- .../src/main/resources/FlamingoThemes/Slate.xml | 8 ++++---- .../src/main/resources/FlamingoThemes/Spacelab.xml | 8 ++++---- .../src/main/resources/FlamingoThemes/Superhero.xml | 8 ++++---- .../src/main/resources/FlamingoThemes/United.xml | 8 ++++---- .../src/main/resources/FlamingoThemes/Yeti.xml | 8 ++++---- .../src/main/resources/FlamingoThemes/Charcoal.xml | 8 ++++---- .../src/main/resources/FlamingoThemes/Garden.xml | 10 +++++----- .../src/main/resources/FlamingoThemes/Iceberg.xml | 10 +++++----- .../src/main/resources/FlamingoThemes/Kitty.xml | 8 ++++---- .../src/main/resources/FlamingoThemes/Marina.xml | 10 +++++----- .../resources/FlamingoThemesCode/ThemeTemplate.xml | 10 +++++----- 22 files changed, 92 insertions(+), 92 deletions(-) diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cerulean.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cerulean.xml index cfc5a79508c1..45c78d0db87f 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cerulean.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cerulean.xml @@ -766,19 +766,19 @@ com.xpn.xwiki.objects.classes.StringClass - + 0 - panel-header-color + panel-header-text 46 0 - panel-header-color + panel-header-text 30 0 com.xpn.xwiki.objects.classes.StringClass - + 0 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cosmo.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cosmo.xml index c14f7565a278..51cfff8174f7 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cosmo.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cosmo.xml @@ -757,19 +757,19 @@ com.xpn.xwiki.objects.classes.StringClass - + 0 - panel-header-color + panel-header-text 46 0 - panel-header-color + panel-header-text 30 0 com.xpn.xwiki.objects.classes.StringClass - + 0 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cyborg.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cyborg.xml index 1460fb850c8b..afc5ba272dc3 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cyborg.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cyborg.xml @@ -766,19 +766,19 @@ com.xpn.xwiki.objects.classes.StringClass - + 0 - panel-header-color + panel-header-text 46 0 - panel-header-color + panel-header-text 30 0 com.xpn.xwiki.objects.classes.StringClass - + 0 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Darkly.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Darkly.xml index 087d16c393cb..43233b64ec8a 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Darkly.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Darkly.xml @@ -766,19 +766,19 @@ com.xpn.xwiki.objects.classes.StringClass - + 0 - panel-header-color + panel-header-text 46 0 - panel-header-color + panel-header-text 30 0 com.xpn.xwiki.objects.classes.StringClass - + 0 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Flatly.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Flatly.xml index b448ed57b6d2..2adebc9599d0 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Flatly.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Flatly.xml @@ -766,19 +766,19 @@ com.xpn.xwiki.objects.classes.StringClass - + 0 - panel-header-color + panel-header-text 46 0 - panel-header-color + panel-header-text 30 0 com.xpn.xwiki.objects.classes.StringClass - + 0 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Journal.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Journal.xml index d53369f602d2..bf733b09cd13 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Journal.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Journal.xml @@ -757,19 +757,19 @@ com.xpn.xwiki.objects.classes.StringClass - + 0 - panel-header-color + panel-header-text 46 0 - panel-header-color + panel-header-text 30 0 com.xpn.xwiki.objects.classes.StringClass - + 0 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Lumen.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Lumen.xml index 6d5811202d36..4b2370bd73dd 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Lumen.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Lumen.xml @@ -757,19 +757,19 @@ com.xpn.xwiki.objects.classes.StringClass - + 0 - panel-header-color + panel-header-text 46 0 - panel-header-color + panel-header-text 30 0 com.xpn.xwiki.objects.classes.StringClass - + 0 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Paper.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Paper.xml index 7a4a1ebf4352..fd2934cc9e32 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Paper.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Paper.xml @@ -757,19 +757,19 @@ com.xpn.xwiki.objects.classes.StringClass - + 0 - panel-header-color + panel-header-text 46 0 - panel-header-color + panel-header-text 30 0 com.xpn.xwiki.objects.classes.StringClass - + 0 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Readable.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Readable.xml index 3398c9cef495..b06dcb7d1d93 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Readable.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Readable.xml @@ -757,19 +757,19 @@ com.xpn.xwiki.objects.classes.StringClass - + 0 - panel-header-color + panel-header-text 46 0 - panel-header-color + panel-header-text 30 0 com.xpn.xwiki.objects.classes.StringClass - + 0 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Sandstone.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Sandstone.xml index d170f09d887f..0c0cd44d4b24 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Sandstone.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Sandstone.xml @@ -766,19 +766,19 @@ com.xpn.xwiki.objects.classes.StringClass - + 0 - panel-header-color + panel-header-text 46 0 - panel-header-color + panel-header-text 30 0 com.xpn.xwiki.objects.classes.StringClass - + 0 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Simplex.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Simplex.xml index 64599a85e9d4..fb8d621919ad 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Simplex.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Simplex.xml @@ -757,19 +757,19 @@ com.xpn.xwiki.objects.classes.StringClass - + 0 - panel-header-color + panel-header-text 46 0 - panel-header-color + panel-header-text 30 0 com.xpn.xwiki.objects.classes.StringClass - + 0 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Slate.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Slate.xml index 5bd0e5a4b6f5..e7919bd61280 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Slate.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Slate.xml @@ -766,19 +766,19 @@ com.xpn.xwiki.objects.classes.StringClass - + 0 - panel-header-color + panel-header-text 46 0 - panel-header-color + panel-header-text 30 0 com.xpn.xwiki.objects.classes.StringClass - + 0 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Spacelab.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Spacelab.xml index ba74666907cd..d36e7d9c3f9d 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Spacelab.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Spacelab.xml @@ -757,19 +757,19 @@ com.xpn.xwiki.objects.classes.StringClass - + 0 - panel-header-color + panel-header-text 46 0 - panel-header-color + panel-header-text 30 0 com.xpn.xwiki.objects.classes.StringClass - + 0 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Superhero.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Superhero.xml index 3a3d9b453905..0171e20f7471 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Superhero.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Superhero.xml @@ -766,19 +766,19 @@ com.xpn.xwiki.objects.classes.StringClass - + 0 - panel-header-color + panel-header-text 46 0 - panel-header-color + panel-header-text 30 0 com.xpn.xwiki.objects.classes.StringClass - + 0 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/United.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/United.xml index ce0344e1d607..3690c1fd87cd 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/United.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/United.xml @@ -766,19 +766,19 @@ com.xpn.xwiki.objects.classes.StringClass - + 0 - panel-header-color + panel-header-text 46 0 - panel-header-color + panel-header-text 30 0 com.xpn.xwiki.objects.classes.StringClass - + 0 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Yeti.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Yeti.xml index c07e1794c9e0..6dcd16deadd1 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Yeti.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Yeti.xml @@ -757,19 +757,19 @@ com.xpn.xwiki.objects.classes.StringClass - + 0 - panel-header-color + panel-header-text 46 0 - panel-header-color + panel-header-text 30 0 com.xpn.xwiki.objects.classes.StringClass - + 0 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Charcoal.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Charcoal.xml index 9a396b344c48..f7b06b8197a5 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Charcoal.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Charcoal.xml @@ -757,19 +757,19 @@ com.xpn.xwiki.objects.classes.StringClass - + 0 - panel-header-color + panel-header-text 46 0 - panel-header-color + panel-header-text 30 0 com.xpn.xwiki.objects.classes.StringClass - + 0 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Garden.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Garden.xml index 0c97f9d31056..7701b22fde40 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Garden.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Garden.xml @@ -766,19 +766,19 @@ com.xpn.xwiki.objects.classes.StringClass - + 0 - panel-header-color + panel-header-text 46 0 - panel-header-color + panel-header-text 30 0 com.xpn.xwiki.objects.classes.StringClass - + 0 @@ -989,7 +989,7 @@ body{ - + #030f02 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Iceberg.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Iceberg.xml index 3f42e4e860e1..b91ec5a6a6f8 100755 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Iceberg.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Iceberg.xml @@ -766,19 +766,19 @@ com.xpn.xwiki.objects.classes.StringClass - + 0 - panel-header-color + panel-header-text 46 0 - panel-header-color + panel-header-text 30 0 com.xpn.xwiki.objects.classes.StringClass - + 0 @@ -1034,7 +1034,7 @@ - + diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Kitty.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Kitty.xml index 0ae8adb3877c..4e8581b6d472 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Kitty.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Kitty.xml @@ -766,19 +766,19 @@ com.xpn.xwiki.objects.classes.StringClass - + 0 - panel-header-color + panel-header-text 46 0 - panel-header-color + panel-header-text 30 0 com.xpn.xwiki.objects.classes.StringClass - + 0 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Marina.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Marina.xml index ca73c4b93524..a0a1bd05ddb1 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Marina.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Marina.xml @@ -766,19 +766,19 @@ com.xpn.xwiki.objects.classes.StringClass - + 0 - panel-header-color + panel-header-text 46 0 - panel-header-color + panel-header-text 30 0 com.xpn.xwiki.objects.classes.StringClass - + 0 @@ -986,7 +986,7 @@ - + #091154 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemesCode/ThemeTemplate.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemesCode/ThemeTemplate.xml index c9b5f1f4b760..3d84e72ed283 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemesCode/ThemeTemplate.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemesCode/ThemeTemplate.xml @@ -757,19 +757,19 @@ com.xpn.xwiki.objects.classes.StringClass - + 0 - panel-header-color + panel-header-text 46 0 - panel-header-color + panel-header-text 30 0 com.xpn.xwiki.objects.classes.StringClass - + 0 @@ -966,7 +966,7 @@ - + From 6db564c9ed5d0be1a5d8324af835eee3b8f4aa3a Mon Sep 17 00:00:00 2001 From: Sereza7 Date: Fri, 20 Oct 2023 16:53:06 +0200 Subject: [PATCH 4/9] XWIKI-13912: Impossible to control contrast of the panel headers on Flamingo * Fixed colortheme files and homogeneized property names --- .../src/main/resources/flamingo/less/accordion.less | 2 +- .../resources/flamingo/less/colorThemeMappingOutput.vm | 2 +- .../src/main/resources/flamingo/less/variablesInit.vm | 8 ++++---- .../src/main/resources/FlamingoThemes/Cerulean.xml | 3 +++ .../src/main/resources/FlamingoThemes/Cosmo.xml | 3 +++ .../src/main/resources/FlamingoThemes/Cyborg.xml | 3 +++ .../src/main/resources/FlamingoThemes/Darkly.xml | 3 +++ .../src/main/resources/FlamingoThemes/Flatly.xml | 3 +++ .../src/main/resources/FlamingoThemes/Journal.xml | 3 +++ .../src/main/resources/FlamingoThemes/Lumen.xml | 3 +++ .../src/main/resources/FlamingoThemes/Paper.xml | 3 +++ .../src/main/resources/FlamingoThemes/Readable.xml | 3 +++ .../src/main/resources/FlamingoThemes/Sandstone.xml | 3 +++ .../src/main/resources/FlamingoThemes/Simplex.xml | 3 +++ .../src/main/resources/FlamingoThemes/Slate.xml | 3 +++ .../src/main/resources/FlamingoThemes/Spacelab.xml | 3 +++ .../src/main/resources/FlamingoThemes/Superhero.xml | 3 +++ .../src/main/resources/FlamingoThemes/United.xml | 3 +++ .../src/main/resources/FlamingoThemes/Yeti.xml | 3 +++ .../src/main/resources/FlamingoThemes/Charcoal.xml | 3 +++ 20 files changed, 57 insertions(+), 6 deletions(-) diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/accordion.less b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/accordion.less index f663040a12cc..aa03d5fdb0c2 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/accordion.less +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/accordion.less @@ -4,7 +4,7 @@ .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; diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/colorThemeMappingOutput.vm b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/colorThemeMappingOutput.vm index e7b35323d24b..adeeb14500b0 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/colorThemeMappingOutput.vm +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/colorThemeMappingOutput.vm @@ -43,7 +43,7 @@ #mapping("panelBackgroundColor", "@panel-bg") #mapping("panelTextColor", "@panel-default-text") #mapping("panelHeaderTextColor", "@panel-header-text") -#mapping("panelHeaderBackgroundColor", "@xwiki-panel-header-bg") +#mapping("panelHeaderBackgroundColor", "@panel-header-bg") #mapping("buttonPrimaryTextColor", "@btn-primary-color") #mapping("buttonPrimaryBackgroundColor", "@btn-primary-bg") #mapping("buttonSecondaryTextColor", "@btn-default-color") diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/variablesInit.vm b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/variablesInit.vm index bf07131d7462..0b0effb7d48b 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/variablesInit.vm +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/variablesInit.vm @@ -98,8 +98,8 @@ @panel-bg: $theme.panelBackgroundColor; @panel-default-text: $theme.panelTextColor; - @xwiki-panel-header-bg: $theme.panelHeaderBackgroundColor; - @panel-header-text: $theme.panelHeaderTextColor; + @panel-header-bg: $theme.panelHeaderBackgroundColor; + @panel-header-text: $theme.panelHeaderTextColor; ## ## XWiki variables: LESS variables specific to XWiki @@ -226,8 +226,8 @@ ## currently, it comes from the old color theme object (see colorThemeInit.vm) // Default @xwiki-border-color: $theme.borderColor; - @xwiki-panel-header-bg: $theme.panelHeaderBackgroundColor; - @panel-header-text: $theme.panelHeaderTextColor; + @panel-header-bg: $theme.panelHeaderBackgroundColor; + @panel-header-text: $theme.panelHeaderTextColor; @xwiki-page-content-bg: $theme.pageContentBackgroundColor; @xwiki-background-secondary-color: $theme.backgroundSecondaryColor; @xwiki-page-header-bg-color: $theme.pageHeaderBackgroundColor; diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cerulean.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cerulean.xml index 45c78d0db87f..daaf7c1aee66 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cerulean.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cerulean.xml @@ -1970,6 +1970,9 @@ + + + diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cosmo.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cosmo.xml index 51cfff8174f7..a35cd319f7bd 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cosmo.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cosmo.xml @@ -2088,6 +2088,9 @@ a.list-group-item { + + + diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cyborg.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cyborg.xml index afc5ba272dc3..5e69b1988854 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cyborg.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cyborg.xml @@ -2076,6 +2076,9 @@ a.list-group-item { #060606 + + + #ffffff diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Darkly.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Darkly.xml index 43233b64ec8a..5db4a8421b2b 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Darkly.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Darkly.xml @@ -2184,6 +2184,9 @@ a.list-group-item { + + + #ffffff diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Flatly.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Flatly.xml index 2adebc9599d0..8cfe213bc695 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Flatly.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Flatly.xml @@ -2167,6 +2167,9 @@ a.list-group-item { + + + diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Journal.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Journal.xml index bf733b09cd13..6519c24e78ec 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Journal.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Journal.xml @@ -1973,6 +1973,9 @@ + + + diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Lumen.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Lumen.xml index 4b2370bd73dd..7bffd87e343f 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Lumen.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Lumen.xml @@ -2349,6 +2349,9 @@ a.list-group-item { + + + diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Paper.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Paper.xml index fd2934cc9e32..14b3d464da7a 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Paper.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Paper.xml @@ -2460,6 +2460,9 @@ div.main { + + + diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Readable.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Readable.xml index b06dcb7d1d93..b6608121e5be 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Readable.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Readable.xml @@ -2026,6 +2026,9 @@ legend { + + + diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Sandstone.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Sandstone.xml index 0c0cd44d4b24..770da3f08fc3 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Sandstone.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Sandstone.xml @@ -2032,6 +2032,9 @@ input, + + + diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Simplex.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Simplex.xml index fb8d621919ad..7d9ae9458566 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Simplex.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Simplex.xml @@ -2002,6 +2002,9 @@ label { + + + diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Slate.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Slate.xml index e7919bd61280..9395e457e011 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Slate.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Slate.xml @@ -2290,6 +2290,9 @@ ul.nav.nav-pills.nav-stacked li{ + + + #c8c8c8 diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Spacelab.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Spacelab.xml index d36e7d9c3f9d..a293b28ea664 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Spacelab.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Spacelab.xml @@ -1977,6 +1977,9 @@ + + + diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Superhero.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Superhero.xml index 0171e20f7471..269d453f254d 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Superhero.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Superhero.xml @@ -2192,6 +2192,9 @@ div.main { #ffffff + + + #ffffff diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/United.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/United.xml index 3690c1fd87cd..976db4e845d4 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/United.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/United.xml @@ -1894,6 +1894,9 @@ + + + diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Yeti.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Yeti.xml index 6dcd16deadd1..69f16e9cfabe 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Yeti.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Yeti.xml @@ -2268,6 +2268,9 @@ input[type="checkbox"] { + + + diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Charcoal.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Charcoal.xml index f7b06b8197a5..ef6b4802d14b 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Charcoal.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Charcoal.xml @@ -966,6 +966,9 @@ #333333 + + + #333333 From 337d02ea37f138bf1208138d71f77648fc2f1b71 Mon Sep 17 00:00:00 2001 From: Sereza7 Date: Tue, 24 Oct 2023 10:35:10 +0200 Subject: [PATCH 5/9] XWIKI-13912: Impossible to control contrast of the panel headers on Flamingo * Fixed codestyle * Fixed consistency --- .../src/main/resources/flamingo/less/variablesInit.vm | 4 ++-- .../src/main/resources/FlamingoThemes/Kitty.xml | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/variablesInit.vm b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/variablesInit.vm index 66b9c51a11d5..752fbbeb9b33 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/variablesInit.vm +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/variablesInit.vm @@ -98,7 +98,7 @@ @panel-bg: $theme.panelBackgroundColor; @panel-default-text: $theme.panelTextColor; - @panel-header-bg: $theme.panelHeaderBackgroundColor; + @panel-header-bg: $theme.panelHeaderBackgroundColor; @panel-header-text: $theme.panelHeaderTextColor; ## @@ -226,7 +226,7 @@ ## currently, it comes from the old color theme object (see colorThemeInit.vm) // Default @xwiki-border-color: $theme.borderColor; - @panel-header-bg: $theme.panelHeaderBackgroundColor; + @panel-header-bg: $theme.panelHeaderBackgroundColor; @panel-header-text: $theme.panelHeaderTextColor; @xwiki-page-content-bg: $theme.pageContentBackgroundColor; @xwiki-background-secondary-color: $theme.backgroundSecondaryColor; diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Kitty.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Kitty.xml index 4e8581b6d472..d9715acaadb2 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Kitty.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemes/Kitty.xml @@ -978,6 +978,9 @@ #470b47 + + + #633d63 From 558749259766abd5e3cd5e8bfbf16fceed5bca47 Mon Sep 17 00:00:00 2001 From: Sereza7 Date: Fri, 27 Oct 2023 16:05:20 +0200 Subject: [PATCH 6/9] XWIKI-13912: Impossible to control contrast of the panel headers on Flamingo * Fixed backward compatibility --- .../src/main/resources/flamingo/less/variablesInit.vm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/variablesInit.vm b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/variablesInit.vm index 752fbbeb9b33..689b3c46d0fe 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/variablesInit.vm +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/variablesInit.vm @@ -100,6 +100,9 @@ @panel-default-text: $theme.panelTextColor; @panel-header-bg: $theme.panelHeaderBackgroundColor; @panel-header-text: $theme.panelHeaderTextColor; + ## Kept for backward compatibility + @panel-header-bg: $theme.panelHeaderBackgroundColor; + @panel-header-text: $theme.panelHeaderTextColor; ## ## XWiki variables: LESS variables specific to XWiki @@ -233,6 +236,9 @@ @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 From dc4c9d593fead0265fddad2e214ce066f44c344b Mon Sep 17 00:00:00 2001 From: Sereza7 Date: Fri, 27 Oct 2023 16:27:07 +0200 Subject: [PATCH 7/9] XWIKI-13912: Impossible to control contrast of the panel headers on Flamingo * Fixed backward compatibility --- .../src/main/resources/flamingo/less/variablesInit.vm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/variablesInit.vm b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/variablesInit.vm index 689b3c46d0fe..6d41d9b3ba15 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/variablesInit.vm +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/variablesInit.vm @@ -101,8 +101,8 @@ @panel-header-bg: $theme.panelHeaderBackgroundColor; @panel-header-text: $theme.panelHeaderTextColor; ## Kept for backward compatibility - @panel-header-bg: $theme.panelHeaderBackgroundColor; - @panel-header-text: $theme.panelHeaderTextColor; + @xwiki-panel-header-bg: $theme.panelHeaderBackgroundColor; + @xwiki-panel-header-text: $theme.panelHeaderTextColor; ## ## XWiki variables: LESS variables specific to XWiki From 9c640c2eaae7adb96e7a584c41293f63e6e580b0 Mon Sep 17 00:00:00 2001 From: Sereza7 Date: Fri, 3 Nov 2023 13:43:21 +0100 Subject: [PATCH 8/9] XWIKI-13912: Impossible to control contrast of the panel headers on Flamingo * Fixed bad merge --- .../src/main/resources/FlamingoThemes/Cyborg.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cyborg.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cyborg.xml index 18613ba743c8..ec3dc9d236c1 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cyborg.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cyborg.xml @@ -2064,7 +2064,7 @@ a.list-group-item { #060606 - #ffffff + #ffffff #999999 From afc21a6f696fc2ef84bb681067afe1ad954535b2 Mon Sep 17 00:00:00 2001 From: Sereza7 Date: Thu, 11 Jan 2024 17:04:52 +0100 Subject: [PATCH 9/9] XWIKI-13912: Impossible to control contrast of the panel headers on Flamingo * Fixed backward compatibility --- .../src/main/resources/FlamingoThemes/Superhero.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Superhero.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Superhero.xml index 27753c9d09b3..dc8f2daa0157 100644 --- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Superhero.xml +++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Superhero.xml @@ -2138,6 +2138,7 @@ div.main { box-shadow: none; } +@xwiki-panel-header-text: @navbar-default-color; @panel-header-text: @navbar-default-color; @xwiki-page-content-bg: @body-bg; @text-muted: @navbar-default-color;