Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 8 commits into from
Nov 7, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
39e119f
XWIKI-21116: @dropdown-link-color doesn't apply to breadcrumb's dropd…
Sereza7 Oct 3, 2024
603ab92
XWIKI-21115: @breadcrumb-color doesn't apply to links in the Breadcrumb
Sereza7 Oct 3, 2024
b17e0d8
Merge remote-tracking branch 'origin/XWIKI-21115' into XWIKI-21115
Sereza7 Oct 3, 2024
e535ff9
Merge branch 'xwiki:master' into XWIKI-21115
Sereza7 Nov 6, 2024
31e4719
XWIKI-21115: @breadcrumb-color doesn't apply to links in the Breadcrumb
Sereza7 Nov 6, 2024
24ef54a
XWIKI-21115: @breadcrumb-color doesn't apply to links in the Breadcrumb
Sereza7 Nov 6, 2024
efa0f53
XWIKI-21115: @breadcrumb-color doesn't apply to links in the Breadcrumb
Sereza7 Nov 6, 2024
1182091
XWIKI-21115: @breadcrumb-color doesn't apply to links in the Breadcrumb
Sereza7 Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .../xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/breadcrumbs.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
michitux marked this conversation as resolved.
Show resolved Hide resolved
color: @breadcrumb-active-color;
}
}

> .dropdown-toggle {
color: @breadcrumb-color;
cursor: pointer;
Expand Down
4 changes: 4 additions & 0 deletions ...in/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/variables.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
// --------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions .../xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/variablesInit.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
16 changes: 16 additions & 0 deletions ...e/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cerulean.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -817,6 +830,9 @@
<property>
<breadcrumb-color/>
</property>
<property>
<breadcrumb-link-color/>
</property>
<property>
<breadcrumb-separator/>
</property>
Expand Down
16 changes: 16 additions & 0 deletions ...heme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cosmo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -808,6 +821,9 @@
<property>
<breadcrumb-color/>
</property>
<property>
<breadcrumb-link-color/>
</property>
<property>
<breadcrumb-separator/>
</property>
Expand Down
16 changes: 16 additions & 0 deletions ...eme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Cyborg.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -817,6 +830,9 @@
<property>
<breadcrumb-color/>
</property>
<property>
<breadcrumb-link-color/>
</property>
<property>
<breadcrumb-separator/>
</property>
Expand Down
16 changes: 16 additions & 0 deletions ...eme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Darkly.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -817,6 +830,9 @@
<property>
<breadcrumb-color/>
</property>
<property>
<breadcrumb-link-color/>
</property>
<property>
<breadcrumb-separator/>
</property>
Expand Down
16 changes: 16 additions & 0 deletions ...eme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Flatly.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -817,6 +830,9 @@
<property>
<breadcrumb-color/>
</property>
<property>
<breadcrumb-link-color/>
</property>
<property>
<breadcrumb-separator/>
</property>
Expand Down
16 changes: 16 additions & 0 deletions ...me/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Journal.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -808,6 +821,9 @@
<property>
<breadcrumb-color/>
</property>
<property>
<breadcrumb-link-color/>
</property>
<property>
<breadcrumb-separator/>
</property>
Expand Down
16 changes: 16 additions & 0 deletions ...heme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Lumen.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -808,6 +821,9 @@
<property>
<breadcrumb-color/>
</property>
<property>
<breadcrumb-link-color/>
</property>
<property>
<breadcrumb-separator/>
</property>
Expand Down
16 changes: 16 additions & 0 deletions ...heme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Paper.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -808,6 +821,9 @@
<property>
<breadcrumb-color/>
</property>
<property>
<breadcrumb-link-color/>
</property>
<property>
<breadcrumb-separator/>
</property>
Expand Down
16 changes: 16 additions & 0 deletions ...e/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Readable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -808,6 +821,9 @@
<property>
<breadcrumb-color/>
</property>
<property>
<breadcrumb-link-color/>
</property>
<property>
<breadcrumb-separator/>
</property>
Expand Down
16 changes: 16 additions & 0 deletions .../xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Sandstone.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -817,6 +830,9 @@
<property>
<breadcrumb-color/>
</property>
<property>
<breadcrumb-link-color/>
</property>
<property>
<breadcrumb-separator/>
</property>
Expand Down
16 changes: 16 additions & 0 deletions ...me/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Simplex.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -808,6 +821,9 @@
<property>
<breadcrumb-color/>
</property>
<property>
<breadcrumb-link-color/>
</property>
<property>
<breadcrumb-separator/>
</property>
Expand Down
16 changes: 16 additions & 0 deletions ...heme/xwiki-platform-flamingo-theme-bootswatch/src/main/resources/FlamingoThemes/Slate.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -817,6 +830,9 @@
<property>
<breadcrumb-color/>
</property>
<property>
<breadcrumb-link-color/>
</property>
<property>
<breadcrumb-separator/>
</property>
Expand Down
Loading
Loading