From d8832778fec9f6ba8f4af438654f2d6420bd91c7 Mon Sep 17 00:00:00 2001 From: "C. Lucas" Date: Thu, 18 Jan 2024 14:48:48 +0100 Subject: [PATCH] XWIKI-13912: Impossible to control contrast of the panel headers on Flamingo (#2497) * Added the panel header text color to the ThemeSheet.xml * Changed the name of the variable to fit other variables in the tab * Updated color themes * Fixed property name * Fixed colortheme files and homogeneized property names * Fixed codestyle * Fixed consistency * Fixed backward compatibility --- .../main/resources/flamingo/less/accordion.less | 6 +++--- .../flamingo/less/colorThemeMappingOutput.vm | 6 +++--- .../main/resources/flamingo/less/panels.less | 2 +- .../resources/flamingo/less/variablesInit.vm | 11 +++++++++-- .../main/resources/FlamingoThemes/Cerulean.xml | 16 ++++++++++++++++ .../src/main/resources/FlamingoThemes/Cosmo.xml | 16 ++++++++++++++++ .../main/resources/FlamingoThemes/Cyborg.xml | 16 ++++++++++++++++ .../main/resources/FlamingoThemes/Darkly.xml | 16 ++++++++++++++++ .../main/resources/FlamingoThemes/Flatly.xml | 16 ++++++++++++++++ .../main/resources/FlamingoThemes/Journal.xml | 16 ++++++++++++++++ .../src/main/resources/FlamingoThemes/Lumen.xml | 16 ++++++++++++++++ .../src/main/resources/FlamingoThemes/Paper.xml | 16 ++++++++++++++++ .../main/resources/FlamingoThemes/Readable.xml | 16 ++++++++++++++++ .../main/resources/FlamingoThemes/Sandstone.xml | 16 ++++++++++++++++ .../main/resources/FlamingoThemes/Simplex.xml | 16 ++++++++++++++++ .../src/main/resources/FlamingoThemes/Slate.xml | 16 ++++++++++++++++ .../main/resources/FlamingoThemes/Spacelab.xml | 16 ++++++++++++++++ .../main/resources/FlamingoThemes/Superhero.xml | 17 +++++++++++++++++ .../main/resources/FlamingoThemes/United.xml | 16 ++++++++++++++++ .../src/main/resources/FlamingoThemes/Yeti.xml | 16 ++++++++++++++++ .../main/resources/FlamingoThemes/Charcoal.xml | 16 ++++++++++++++++ .../main/resources/FlamingoThemes/Garden.xml | 16 ++++++++++++++++ .../main/resources/FlamingoThemes/Iceberg.xml | 16 ++++++++++++++++ .../src/main/resources/FlamingoThemes/Kitty.xml | 16 ++++++++++++++++ .../main/resources/FlamingoThemes/Marina.xml | 16 ++++++++++++++++ .../resources/FlamingoThemesCode/ThemeSheet.xml | 3 ++- .../FlamingoThemesCode/ThemeTemplate.xml | 16 ++++++++++++++++ 27 files changed, 371 insertions(+), 10 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..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,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; @@ -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..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 @@ -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") @@ -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 81c7a6e7ce39..df9a3a8ff0f4 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, h2.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; 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 3c4c6d829f6a..143432181c38 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,6 +98,9 @@ @panel-bg: $theme.panelBackgroundColor; @panel-default-text: $theme.panelTextColor; + @panel-header-bg: $theme.panelHeaderBackgroundColor; + @panel-header-text: $theme.panelHeaderTextColor; + ## Kept for backward compatibility @xwiki-panel-header-bg: $theme.panelHeaderBackgroundColor; @xwiki-panel-header-text: $theme.panelHeaderTextColor; @@ -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", @@ -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; @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 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 6208958dc13a..2612abdffde0 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 @@ -753,6 +753,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-text + 46 + 0 + panel-header-text + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 @@ -1941,6 +1954,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 b70bef84d4ef..9bc7b1032539 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 @@ -744,6 +744,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-text + 46 + 0 + panel-header-text + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 @@ -2059,6 +2072,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 1f50305627ef..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 @@ -753,6 +753,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-text + 46 + 0 + panel-header-text + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 @@ -2050,6 +2063,9 @@ a.list-group-item { #060606 + + #ffffff + #999999 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 8113c6e9ff3d..b3fb840e65ab 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 @@ -753,6 +753,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-text + 46 + 0 + panel-header-text + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 @@ -2155,6 +2168,9 @@ a.list-group-item { #222222 + + + #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 394e3472d621..53ff40d2f936 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 @@ -753,6 +753,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-text + 46 + 0 + panel-header-text + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 @@ -2138,6 +2151,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 9630d842cc32..c480dda4af9b 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 @@ -744,6 +744,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-text + 46 + 0 + panel-header-text + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 @@ -1944,6 +1957,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 2c423cc545fd..d7da6951c32a 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 @@ -744,6 +744,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-text + 46 + 0 + panel-header-text + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 @@ -2320,6 +2333,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 e37bcfa27a37..dc6c9f1006f7 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 @@ -744,6 +744,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-text + 46 + 0 + panel-header-text + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 @@ -2431,6 +2444,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 6377e76d434e..9bc4a35a70e4 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 @@ -744,6 +744,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-text + 46 + 0 + panel-header-text + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 @@ -1997,6 +2010,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 0f23fc92f551..f246329e5208 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 @@ -753,6 +753,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-text + 46 + 0 + panel-header-text + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 @@ -2003,6 +2016,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 aaf2aa262119..46fb6fa1116c 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 @@ -744,6 +744,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-text + 46 + 0 + panel-header-text + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 @@ -1973,6 +1986,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 595181f79987..3a38239fdc42 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 @@ -753,6 +753,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-text + 46 + 0 + panel-header-text + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 @@ -2261,6 +2274,9 @@ ul.nav.nav-pills.nav-stacked li{ #272b30 + + + #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 0eb8c5e63a98..d187f46d82f5 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 @@ -744,6 +744,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-text + 46 + 0 + panel-header-text + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 @@ -1947,6 +1960,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 866d5f31d927..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 @@ -753,6 +753,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-text + 46 + 0 + panel-header-text + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 @@ -2126,6 +2139,7 @@ div.main { } @xwiki-panel-header-text: @navbar-default-color; +@panel-header-text: @navbar-default-color; @xwiki-page-content-bg: @body-bg; @text-muted: @navbar-default-color; @@ -2163,6 +2177,9 @@ div.main { #2b3e50 + + + #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 bfde2577b206..3e38ef4e7314 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 @@ -753,6 +753,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-text + 46 + 0 + panel-header-text + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 @@ -1865,6 +1878,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 12bbbebedf05..8ccc1ebe6316 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 @@ -744,6 +744,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-text + 46 + 0 + panel-header-text + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 @@ -2240,6 +2253,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 fff89bbee77c..615aed7c4faf 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 @@ -744,6 +744,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-text + 46 + 0 + panel-header-text + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 @@ -937,6 +950,9 @@ #F5F5F5 + + + #333333 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 4ba971a5a934..2fb0923ad334 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 @@ -753,6 +753,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-text + 46 + 0 + panel-header-text + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 @@ -959,6 +972,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 3458fe55b262..88d1ce6d8830 100644 --- 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 @@ -753,6 +753,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-text + 46 + 0 + panel-header-text + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 @@ -1013,6 +1026,9 @@ #fafafa + + + 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 cc21f19fc00c..31134ee363b8 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 @@ -753,6 +753,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-text + 46 + 0 + panel-header-text + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 @@ -949,6 +962,9 @@ #faf2fa + + + #633d63 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 b315722d983d..eb7d3d016628 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 @@ -753,6 +753,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-text + 46 + 0 + panel-header-text + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 @@ -956,6 +969,9 @@ + + + #091154 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 6aded42084cf..16ce728b0775 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 @@ -124,7 +124,8 @@ "legend-border-color": "color" }, "panels": { - "panel-bg" : "color" + "panel-bg" : "color", + "panel-header-text" : "color" }, "breadcrumb": { "breadcrumb-bg": "color", 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 5854e41d2c79..816006336b34 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 @@ -744,6 +744,19 @@ com.xpn.xwiki.objects.classes.StringClass + + + 0 + panel-header-text + 46 + 0 + panel-header-text + 30 + 0 + + + com.xpn.xwiki.objects.classes.StringClass + 0 @@ -936,6 +949,9 @@ + + +