XWIKI-21115: @breadcrumb-color doesn't apply to links in the Breadcru…

…mb (#3536) * Updated the color used by the links in the breadcrumb dropdown. * Updated the color used by the links in the breadcrumb bar. * Created a breadcrumb-link-color variable in the colorTheme * Updated the existing colorTheme pages to use this new property for the link. Note: I doubt this is really needed for the change to work, but it makes things more consistent and easier to understand. * Fixed the default to fit the former looks
xwiki · Nov 7, 2024 · 35425fd · 35425fd
1 parent ae810cb
commit 35425fd
Show file tree

Hide file tree

Showing 27 changed files with 379 additions and 0 deletions.
diff --git a/.../xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/breadcrumbs.less b/.../xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/breadcrumbs.less
@@ -19,6 +19,14 @@
 
     // Styles for the tree navigation.
     &.dropdown {
+      /* We make sure the links get their own specific color. */
+      & > a {
+        color: @breadcrumb-link-color;
+        &:hover, &:focus {
+          color: @breadcrumb-active-color;
+        }
+      }
+
       > .dropdown-toggle {
         color: @breadcrumb-color;
         cursor: pointer;

diff --git a/...in/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/variables.less b/...in/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/variables.less
@@ -9,6 +9,10 @@
 @target-size-minimum:               24px;
 @target-size-recommended:           44px;
 
+// Specific color for links in the breadcrumb (except the last one pointing to the current page)
+// By default it uses the same color as the other links, but the colorTheme can override this value.
+@breadcrumb-link-color:             @link-color;
+
 //
 // Variables of bootstrap overrided by XWiki
 // --------------------------------------------------

diff --git a/.../xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/variablesInit.vm b/.../xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/variablesInit.vm
@@ -200,6 +200,7 @@
       "panel-header-text" : "color",
       "breadcrumb-bg": "color",
       "breadcrumb-color": "color",
+      "breadcrumb-link-color": "color",
       "breadcrumb-separator": "escapedText",
       "table-bg": "color",
       "table-bg-hover": "color",

diff --git a/...e/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cerulean.xml b/...e/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cerulean.xml
@@ -164,6 +164,19 @@
         <validationRegExp/>
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </breadcrumb-color>
+      <breadcrumb-link-color>
+        <customDisplay/>
+        <disabled>0</disabled>
+        <name>breadcrumb-link-color</name>
+        <number>60</number>
+        <picker>0</picker>
+        <prettyName>breadcrumb-link-color</prettyName>
+        <size>30</size>
+        <unmodifiable>0</unmodifiable>
+        <validationMessage/>
+        <validationRegExp/>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </breadcrumb-link-color>
       <breadcrumb-separator>
         <customDisplay/>
         <disabled>0</disabled>
@@ -817,6 +830,9 @@
     <property>
       <breadcrumb-color/>
     </property>
+    <property>
+      <breadcrumb-link-color/>
+    </property>
     <property>
       <breadcrumb-separator/>
     </property>

diff --git a/...heme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cosmo.xml b/...heme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cosmo.xml
@@ -155,6 +155,19 @@
         <validationRegExp/>
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </breadcrumb-color>
+      <breadcrumb-link-color>
+        <customDisplay/>
+        <disabled>0</disabled>
+        <name>breadcrumb-link-color</name>
+        <number>60</number>
+        <picker>0</picker>
+        <prettyName>breadcrumb-link-color</prettyName>
+        <size>30</size>
+        <unmodifiable>0</unmodifiable>
+        <validationMessage/>
+        <validationRegExp/>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </breadcrumb-link-color>
       <breadcrumb-separator>
         <customDisplay/>
         <disabled>0</disabled>
@@ -808,6 +821,9 @@
     <property>
       <breadcrumb-color/>
     </property>
+    <property>
+      <breadcrumb-link-color/>
+    </property>
     <property>
       <breadcrumb-separator/>
     </property>

diff --git a/...eme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cyborg.xml b/...eme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cyborg.xml
@@ -164,6 +164,19 @@
         <validationRegExp/>
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </breadcrumb-color>
+      <breadcrumb-link-color>
+        <customDisplay/>
+        <disabled>0</disabled>
+        <name>breadcrumb-link-color</name>
+        <number>60</number>
+        <picker>0</picker>
+        <prettyName>breadcrumb-link-color</prettyName>
+        <size>30</size>
+        <unmodifiable>0</unmodifiable>
+        <validationMessage/>
+        <validationRegExp/>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </breadcrumb-link-color>
       <breadcrumb-separator>
         <customDisplay/>
         <disabled>0</disabled>
@@ -817,6 +830,9 @@
     <property>
       <breadcrumb-color/>
     </property>
+    <property>
+      <breadcrumb-link-color/>
+    </property>
     <property>
       <breadcrumb-separator/>
     </property>

diff --git a/...eme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Darkly.xml b/...eme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Darkly.xml
@@ -164,6 +164,19 @@
         <validationRegExp/>
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </breadcrumb-color>
+      <breadcrumb-link-color>
+        <customDisplay/>
+        <disabled>0</disabled>
+        <name>breadcrumb-link-color</name>
+        <number>60</number>
+        <picker>0</picker>
+        <prettyName>breadcrumb-link-color</prettyName>
+        <size>30</size>
+        <unmodifiable>0</unmodifiable>
+        <validationMessage/>
+        <validationRegExp/>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </breadcrumb-link-color>
       <breadcrumb-separator>
         <customDisplay/>
         <disabled>0</disabled>
@@ -817,6 +830,9 @@
     <property>
       <breadcrumb-color/>
     </property>
+    <property>
+      <breadcrumb-link-color/>
+    </property>
     <property>
       <breadcrumb-separator/>
     </property>

diff --git a/...eme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Flatly.xml b/...eme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Flatly.xml
@@ -164,6 +164,19 @@
         <validationRegExp/>
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </breadcrumb-color>
+      <breadcrumb-link-color>
+        <customDisplay/>
+        <disabled>0</disabled>
+        <name>breadcrumb-link-color</name>
+        <number>60</number>
+        <picker>0</picker>
+        <prettyName>breadcrumb-link-color</prettyName>
+        <size>30</size>
+        <unmodifiable>0</unmodifiable>
+        <validationMessage/>
+        <validationRegExp/>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </breadcrumb-link-color>
       <breadcrumb-separator>
         <customDisplay/>
         <disabled>0</disabled>
@@ -817,6 +830,9 @@
     <property>
       <breadcrumb-color/>
     </property>
+    <property>
+      <breadcrumb-link-color/>
+    </property>
     <property>
       <breadcrumb-separator/>
     </property>

diff --git a/...me/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Journal.xml b/...me/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Journal.xml
@@ -155,6 +155,19 @@
         <validationRegExp/>
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </breadcrumb-color>
+      <breadcrumb-link-color>
+        <customDisplay/>
+        <disabled>0</disabled>
+        <name>breadcrumb-link-color</name>
+        <number>60</number>
+        <picker>0</picker>
+        <prettyName>breadcrumb-link-color</prettyName>
+        <size>30</size>
+        <unmodifiable>0</unmodifiable>
+        <validationMessage/>
+        <validationRegExp/>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </breadcrumb-link-color>
       <breadcrumb-separator>
         <customDisplay/>
         <disabled>0</disabled>
@@ -808,6 +821,9 @@
     <property>
       <breadcrumb-color/>
     </property>
+    <property>
+      <breadcrumb-link-color/>
+    </property>
     <property>
       <breadcrumb-separator/>
     </property>

diff --git a/...heme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Lumen.xml b/...heme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Lumen.xml
@@ -155,6 +155,19 @@
         <validationRegExp/>
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </breadcrumb-color>
+      <breadcrumb-link-color>
+        <customDisplay/>
+        <disabled>0</disabled>
+        <name>breadcrumb-link-color</name>
+        <number>60</number>
+        <picker>0</picker>
+        <prettyName>breadcrumb-link-color</prettyName>
+        <size>30</size>
+        <unmodifiable>0</unmodifiable>
+        <validationMessage/>
+        <validationRegExp/>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </breadcrumb-link-color>
       <breadcrumb-separator>
         <customDisplay/>
         <disabled>0</disabled>
@@ -808,6 +821,9 @@
     <property>
       <breadcrumb-color/>
     </property>
+    <property>
+      <breadcrumb-link-color/>
+    </property>
     <property>
       <breadcrumb-separator/>
     </property>

diff --git a/...heme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Paper.xml b/...heme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Paper.xml
@@ -155,6 +155,19 @@
         <validationRegExp/>
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </breadcrumb-color>
+      <breadcrumb-link-color>
+        <customDisplay/>
+        <disabled>0</disabled>
+        <name>breadcrumb-link-color</name>
+        <number>60</number>
+        <picker>0</picker>
+        <prettyName>breadcrumb-link-color</prettyName>
+        <size>30</size>
+        <unmodifiable>0</unmodifiable>
+        <validationMessage/>
+        <validationRegExp/>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </breadcrumb-link-color>
       <breadcrumb-separator>
         <customDisplay/>
         <disabled>0</disabled>
@@ -808,6 +821,9 @@
     <property>
       <breadcrumb-color/>
     </property>
+    <property>
+      <breadcrumb-link-color/>
+    </property>
     <property>
       <breadcrumb-separator/>
     </property>

diff --git a/...e/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Readable.xml b/...e/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Readable.xml
@@ -155,6 +155,19 @@
         <validationRegExp/>
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </breadcrumb-color>
+      <breadcrumb-link-color>
+        <customDisplay/>
+        <disabled>0</disabled>
+        <name>breadcrumb-link-color</name>
+        <number>60</number>
+        <picker>0</picker>
+        <prettyName>breadcrumb-link-color</prettyName>
+        <size>30</size>
+        <unmodifiable>0</unmodifiable>
+        <validationMessage/>
+        <validationRegExp/>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </breadcrumb-link-color>
       <breadcrumb-separator>
         <customDisplay/>
         <disabled>0</disabled>
@@ -808,6 +821,9 @@
     <property>
       <breadcrumb-color/>
     </property>
+    <property>
+      <breadcrumb-link-color/>
+    </property>
     <property>
       <breadcrumb-separator/>
     </property>

diff --git a/.../xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Sandstone.xml b/.../xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Sandstone.xml
@@ -164,6 +164,19 @@
         <validationRegExp/>
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </breadcrumb-color>
+      <breadcrumb-link-color>
+        <customDisplay/>
+        <disabled>0</disabled>
+        <name>breadcrumb-link-color</name>
+        <number>60</number>
+        <picker>0</picker>
+        <prettyName>breadcrumb-link-color</prettyName>
+        <size>30</size>
+        <unmodifiable>0</unmodifiable>
+        <validationMessage/>
+        <validationRegExp/>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </breadcrumb-link-color>
       <breadcrumb-separator>
         <customDisplay/>
         <disabled>0</disabled>
@@ -817,6 +830,9 @@
     <property>
       <breadcrumb-color/>
     </property>
+    <property>
+      <breadcrumb-link-color/>
+    </property>
     <property>
       <breadcrumb-separator/>
     </property>

diff --git a/...me/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Simplex.xml b/...me/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Simplex.xml
@@ -155,6 +155,19 @@
         <validationRegExp/>
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </breadcrumb-color>
+      <breadcrumb-link-color>
+        <customDisplay/>
+        <disabled>0</disabled>
+        <name>breadcrumb-link-color</name>
+        <number>60</number>
+        <picker>0</picker>
+        <prettyName>breadcrumb-link-color</prettyName>
+        <size>30</size>
+        <unmodifiable>0</unmodifiable>
+        <validationMessage/>
+        <validationRegExp/>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </breadcrumb-link-color>
       <breadcrumb-separator>
         <customDisplay/>
         <disabled>0</disabled>
@@ -808,6 +821,9 @@
     <property>
       <breadcrumb-color/>
     </property>
+    <property>
+      <breadcrumb-link-color/>
+    </property>
     <property>
       <breadcrumb-separator/>
     </property>

diff --git a/...heme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Slate.xml b/...heme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Slate.xml
@@ -164,6 +164,19 @@
         <validationRegExp/>
         <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
       </breadcrumb-color>
+      <breadcrumb-link-color>
+        <customDisplay/>
+        <disabled>0</disabled>
+        <name>breadcrumb-link-color</name>
+        <number>60</number>
+        <picker>0</picker>
+        <prettyName>breadcrumb-link-color</prettyName>
+        <size>30</size>
+        <unmodifiable>0</unmodifiable>
+        <validationMessage/>
+        <validationRegExp/>
+        <classType>com.xpn.xwiki.objects.classes.StringClass</classType>
+      </breadcrumb-link-color>
       <breadcrumb-separator>
         <customDisplay/>
         <disabled>0</disabled>
@@ -817,6 +830,9 @@
     <property>
       <breadcrumb-color/>
     </property>
+    <property>
+      <breadcrumb-link-color/>
+    </property>
     <property>
       <breadcrumb-separator/>
     </property>