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

Fix font icon style assignment (bsc#1231378) #9329

Merged
merged 2 commits into from
Oct 23, 2024
Merged

Fix font icon style assignment (bsc#1231378) #9329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f72efa4
Revert "Fixed missing pagination buttons icon"
Etheryte Oct 8, 2024
350d8c3
Fix font icon style assignment (bsc#1231378)
Etheryte Oct 9, 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
10 changes: 4 additions & 6 deletions java/code/src/com/redhat/rhn/frontend/taglibs/list/ListTagUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,9 @@ public static void renderPaginationLinks(PageContext pageContext,
for (String linkNameIn : linkNames) {
String[] linkData = links.get(linkNameIn);
ListTagUtil.write(pageContext, "<button ");
ListTagUtil.write(pageContext, "class=\"btn btn-default btn-xs");
ListTagUtil.write(pageContext, "class=\"btn btn-default btn-xs ");
ListTagUtil.write(pageContext, linkData[0]);

// if the link is disabled...
if (linkData[1] == null) {
ListTagUtil.write(pageContext, " disabled");
Expand All @@ -563,11 +565,7 @@ public static void renderPaginationLinks(PageContext pageContext,
}
ListTagUtil.write(pageContext, "\" title=\"");
ListTagUtil.write(pageContext, linkData[3]);
ListTagUtil.write(pageContext, "\">");
ListTagUtil.write(pageContext, "<i class=\"");
ListTagUtil.write(pageContext, linkData[0]);
ListTagUtil.write(pageContext, "\"></i>");
ListTagUtil.write(pageContext, "</button>");
ListTagUtil.write(pageContext, "\"></button>");
}
ListTagUtil.write(pageContext, "</div>");
}
Expand Down
1 change: 1 addition & 0 deletions java/spacewalk-java.changes.eth.fa2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Ensure icon fonts are loaded correctly on buttons (bsc#1231378)
8 changes: 8 additions & 0 deletions web/html/src/branding/css/susemanager/components/icons.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.fa,
[class^="fa-"] {
font-family: "FontAwesome";
}

[class*="spacewalk-icon-"] {
font-family: "spacewalk-icon";
}
8 changes: 8 additions & 0 deletions web/html/src/branding/css/susemanager/components/icons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.fa,
[class^="fa-"] {
font-family: "FontAwesome";
}

[class*="spacewalk-icon-"] {
font-family: "spacewalk-icon";
}
1 change: 1 addition & 0 deletions web/html/src/branding/css/susemanager/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
@import "./components/date-time-picker.less";
@import "./components/header.less";
@import "./components/address.less";
@import "./components/icons.less";

// Responsive overrides
@import "../base/responsive-rules.less";
1 change: 1 addition & 0 deletions web/html/src/branding/css/susemanager/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
@import "./components/legend.scss";
@import "./components/help-block.scss";
@import "./components/collapse.scss";
@import "./components/icons.scss";

@import "./bootstrap-fixes.scss";

Expand Down
1 change: 1 addition & 0 deletions web/spacewalk-web.changes.eth.fa2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Ensure icon fonts are loaded correctly on buttons (bsc#1231378)
Loading