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

Fix progress bar location #6199

Merged
merged 2 commits into from
Jan 24, 2022
Merged

Fix progress bar location #6199

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
7c33f65
Fix progress bar location
timja Jan 21, 2022
84a068b
Revert unneeded change
timja Jan 21, 2022
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
9 changes: 4 additions & 5 deletions core/src/main/resources/lib/hudson/buildCaption.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ THE SOFTWARE.
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
<h1 class="build-caption page-headline">
<l:icon alt="${it.iconColor.description}" class="${it.buildStatusIconClassName} icon-xlg" tooltip="${it.iconColor.description}"/>
<span class="jenkins-icon-adjacent">
<d:invokeBody trim="true"/>
</span>
<j:if test="${it.building}">
<div class="build-caption-progress-container" style="float:right">
<table class="middle-align"><tr>
Expand All @@ -43,8 +47,6 @@ THE SOFTWARE.
</tr></table>
</div>
</j:if>

<l:icon alt="${it.iconColor.description}" class="${it.buildStatusIconClassName} icon-xlg" tooltip="${it.iconColor.description}"/>
<script>
(function(){
function updateBuildCaptionIcon(){
Expand All @@ -71,8 +73,5 @@ THE SOFTWARE.

})();
</script>
<span class="jenkins-icon-adjacent">
<d:invokeBody trim="true"/>
</span>
</h1>
</j:jelly>
1 change: 1 addition & 0 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 @@ -1523,6 +1523,7 @@ svg.icon-xlg {

.jenkins-icon-adjacent {
margin-left: 0.5rem;
width: 100%;
Copy link
Member Author

Choose a reason for hiding this comment

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

I think this is safe, from core usages it is at least

}

/* -------------- Unclassified ---------- */
Expand Down