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

[JENKINS 62750] Transform rss bar items into transparent buttons #4816

Merged
merged 2 commits into from
Jun 24, 2020
Merged

[JENKINS 62750] Transform rss bar items into transparent buttons #4816

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
8aa2d99
Transform rss bar items into buttons
fqueiruga Jun 22, 2020
984a534
Update the RSS feed buttons for log recorders
fqueiruga Jun 22, 2020
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
32 changes: 23 additions & 9 deletions core/src/main/resources/hudson/logging/LogRecorderManager/feeds.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,27 @@ THE SOFTWARE.
<!-- list of feed links -->
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout">
<div align="right">
<l:svgIcon class="icon-small" tooltip="Atom feed" href="${imagesURL}/material-icons/svg-sprite-communication-symbol.svg#ic_rss_feed_24px" />
<st:nbsp/><st:nbsp/><st:nbsp/><st:nbsp/>
<a href="rss">${%All}</a>
<st:nbsp/><st:nbsp/><st:nbsp/><st:nbsp/>
<a href="rss?level=SEVERE">${%&gt; SEVERE}</a>
<st:nbsp/><st:nbsp/><st:nbsp/><st:nbsp/>
<a href="rss?level=WARNING">${%&gt; WARNING}</a>
</div>
<div align="right">
<a href="rss" class="yui-button link-button">
<span class="leading-icon">
<l:svgIcon class="icon-small" tooltip="Atom feed"
href="${imagesURL}/material-icons/svg-sprite-communication-symbol.svg#ic_rss_feed_24px"/>
</span>
<span>${%All}</span>
</a>
<a href="rss?level=SEVERE" class="yui-button link-button">
<span class="leading-icon">
<l:svgIcon class="icon-small" tooltip="Atom feed"
href="${imagesURL}/material-icons/svg-sprite-communication-symbol.svg#ic_rss_feed_24px"/>
</span>
<span>${%SEVERE}</span>
</a>
<a href="rss?level=WARNING" class="yui-button link-button">
<span class="leading-icon">
<l:svgIcon class="icon-small" tooltip="Atom feed"
href="${imagesURL}/material-icons/svg-sprite-communication-symbol.svg#ic_rss_feed_24px"/>
</span>
<span>${%WARNING}</span>
</a>
</div>
</j:jelly>
56 changes: 37 additions & 19 deletions core/src/main/resources/lib/hudson/rssBar.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,41 @@ THE SOFTWARE.
-->

<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
<div id="rss-bar">
<a href="${rootURL}/legend" class="rss-bar-legend-link">${%Legend}</a>
<span class="rss-bar-item">
<a href="rssAll"><l:svgIcon class="icon-small" tooltip="Atom feed" href="${imagesURL}/material-icons/svg-sprite-communication-symbol.svg#ic_rss_feed_24px" /></a>
<st:nbsp/>
<a href="rssAll" class="rss-bar-item-link">Atom feed ${%for all}</a>
</span>
<span class="rss-bar-item">
<a href="rssFailed" class="rss-bar-item-icon-link"><l:svgIcon class="icon-small" tooltip="Atom feed" href="${imagesURL}/material-icons/svg-sprite-communication-symbol.svg#ic_rss_feed_24px" /></a>
<st:nbsp/>
<a href="rssFailed" class="rss-bar-item-link">Atom feed ${%for failures}</a>
</span>
<span class="rss-bar-item">
<a href="rssLatest" class="rss-bar-item-icon-link" ><l:svgIcon class="icon-small" tooltip="Atom feed" href="${imagesURL}/material-icons/svg-sprite-communication-symbol.svg#ic_rss_feed_24px" /></a>
<st:nbsp/>
<a href="rssLatest" class="rss-bar-item-link">Atom feed ${%for just latest builds}</a>
</span>
</div>
<j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout"
xmlns:t="/lib/hudson" xmlns:f="/lib/form">
<div id="rss-bar">
<a href="${rootURL}/legend" class="yui-button link-button rss-bar-legend-link">${%Legend}</a>


<span class="rss-bar-item">
<a href="rssAll" class="yui-button link-button rss-bar-item-link">
<span class="leading-icon">
<l:svgIcon class="icon-small" tooltip="Atom feed"
ariaHidden="true"
href="${imagesURL}/material-icons/svg-sprite-communication-symbol.svg#ic_rss_feed_24px"/>
</span>
<span>Atom feed ${%for all}</span>
</a>
</span>
<span class="rss-bar-item">
<a href="rssFailed" class="yui-button link-button rss-bar-item-link">
<span class="leading-icon">
<l:svgIcon class="icon-small" tooltip="Atom feed"
ariaHidden="true"
href="${imagesURL}/material-icons/svg-sprite-communication-symbol.svg#ic_rss_feed_24px"/>
</span>
<span>Atom feed ${%for failures}</span>
</a>
</span>
<span class="rss-bar-item">
<a href="rssLatest" class="yui-button link-button rss-bar-item-link">
<span class="leading-icon">
<l:svgIcon class="icon-small" tooltip="Atom feed"
ariaHidden="true"
href="${imagesURL}/material-icons/svg-sprite-communication-symbol.svg#ic_rss_feed_24px"/>
</span>
<span>Atom feed ${%for just latest builds}</span>
</a>
</span>
</div>
</j:jelly>
2 changes: 2 additions & 0 deletions war/src/main/less/abstracts/colors.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@
--btn-secondary-bg: var(--btn-text-color);
--btn-secondary-border: #9ba7af;
--btn-text-color: var(--white);
--btn-link-bg--hover: #f8f8f8;
--btn-link-bg--active: #eaeff2;
Comment on lines +106 to +107
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will enable theming support for the background


// Help area
--help-area-bg-color: var(--very-light-grey);
Expand Down
4 changes: 0 additions & 4 deletions war/src/main/less/base/style.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1844,10 +1844,6 @@ body.no-sticker #bottom-sticker {
border: 0;
}

#rss-bar .rss-bar-item {
padding-left: 1em;
}

/* -------------------------------------- */


Expand Down
12 changes: 6 additions & 6 deletions war/src/main/less/modules/buttons.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,21 +59,21 @@
}

.button-link {
color: var(--primary);
color: var(--primary-hover);
background-color: transparent;
border-color: transparent;

&:hover,
&:focus {
color: var(--primary-hover);
background-color: #f8f8f8;
border-color: #f8f8f8;
color: var(--primary);
background-color: var(--btn-link-bg--hover);
border-color: var(--btn-link-bg--hover);
}

&:active {
color: var(--primary-active);
background-color: #eaeff2;
border-color: #eaeff2;
background-color: var(--btn-link-bg--active);
border-color: var(--btn-link-bg--active);
}
}

Expand Down