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

* Created a breadcrumb-link-color variable in the colorTheme
xwiki · Nov 6, 2024 · 31e4719 · 31e4719
1 parent e535ff9
commit 31e4719
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 3 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,9 +19,9 @@
 
     // Styles for the tree navigation.
     &.dropdown {
-      /* We make sure the dropdown toggle carets and the links get the same colors. */
-      & > .dropdown-toggle, & > a {
-        color: @breadcrumb-color;
+      /* We make sure the dropdown links get their own specific color. */
+      & > a {
+        color: @breadcrumb-link-color;
         &:hover, &:focus {
           color: @breadcrumb-active-color;
         }
@@ -39,6 +39,7 @@
         line-height: .5rem;
 
         &:hover, &:focus {
+          color: @breadcrumb-active-color;  
           /* We want to revert the default from bootstrap where the outline is removed... */
           outline: revert;
         }

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,9 @@
 @target-size-minimum:               24px;
 @target-size-recommended:           44px;
 
+// Specific color for links in the breadcrumb (except the last one pointing to the current page)
+@breadcrumb-link-color:             @breadcrumb-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/...eme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemesCode/ThemeClass.xml b/...eme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemesCode/ThemeClass.xml
@@ -150,6 +150,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>48</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>

diff --git a/...eme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemesCode/ThemeSheet.xml b/...eme/xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemesCode/ThemeSheet.xml
@@ -130,6 +130,7 @@
   "breadcrumb": {
     "breadcrumb-bg": "color",
     "breadcrumb-color": "color",
+    "breadcrumb-link-color": "color",
     "breadcrumb-separator": "escapedText"
   },
   "advanced": {

diff --git a/.../xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemesCode/ThemeTemplate.xml b/.../xwiki-platform-flamingo-theme-ui/src/main/resources/FlamingoThemesCode/ThemeTemplate.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>48</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>