Skip to content

Commit f697f50

Browse files
author
OpenShift Bot
authored
Merge pull request #987 from sg00dwin/pipeline-stage-issue925
Merged by openshift-bot
2 parents 99070c1 + d226fc5 commit f697f50

File tree

4 files changed

+24
-9
lines changed

4 files changed

+24
-9
lines changed

app/styles/_pipeline.less

+15-4
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@
261261
.pipeline .pipeline-stage {
262262
padding-right: (@pipeline-padding * 5.2);
263263
padding-bottom: (@pipeline-padding + 5);
264-
width: 50%;
264+
width: (100% / 2);
265265
&:before {
266266
bottom: auto;
267267
content: '\2192';
@@ -286,21 +286,32 @@
286286
.build-summary {
287287
border-bottom-width: 0;
288288
border-right: 1px solid @build-pipeline-border-color;
289-
.flex(@columns: 0 0 175px);
289+
.flex(@columns: 0 0 125px);
290290
.flex-direction(@direction: column);
291291
.justify-content(@justify: center);
292292
}
293293
}
294294

295295
@media (min-width: @screen-md-min) {
296296
.pipeline .pipeline-stage {
297-
width: 33.333333%;
297+
width: (100% / 4);
298298
}
299299
}
300300

301301
@media (min-width: @screen-lg-min) {
302302
.pipeline .pipeline-stage {
303-
width: 25%;
303+
width: (100% / 5);
304+
}
305+
}
306+
@media (min-width: (@screen-lg-min + 200)) {
307+
.pipeline .pipeline-stage {
308+
width: (100% / 6);
309+
}
310+
}
311+
312+
@media (min-width: @screen-xlg-min) {
313+
.pipeline .pipeline-stage {
314+
width: (100% / 7);
304315
}
305316
}
306317

app/views/directives/_build-pipeline-expanded.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<div class="pipeline">
3232
<div class="pipeline-stage" ng-repeat="stage in jenkinsStatus.stages track by stage.id">
3333
<div column class="pipeline-stage-column">
34-
<div class="pipeline-stage-name" ng-class="build.status.phase">
34+
<div title="{{stage.name}}" class="pipeline-stage-name" ng-class="build.status.phase">
3535
{{stage.name}}
3636
</div>
3737
<pipeline-status ng-if="stage.status" status="stage.status"></pipeline-status>

dist/scripts/templates.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5247,7 +5247,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
52475247
"<div class=\"pipeline\">\n" +
52485248
"<div class=\"pipeline-stage\" ng-repeat=\"stage in jenkinsStatus.stages track by stage.id\">\n" +
52495249
"<div column class=\"pipeline-stage-column\">\n" +
5250-
"<div class=\"pipeline-stage-name\" ng-class=\"build.status.phase\">\n" +
5250+
"<div title=\"{{stage.name}}\" class=\"pipeline-stage-name\" ng-class=\"build.status.phase\">\n" +
52515251
"{{stage.name}}\n" +
52525252
"</div>\n" +
52535253
"<pipeline-status ng-if=\"stage.status\" status=\"stage.status\"></pipeline-status>\n" +

dist/styles/main.css

+7-3
Original file line numberDiff line numberDiff line change
@@ -4578,12 +4578,16 @@ to{background-color:transparent}
45784578
@media (min-width:600px){.build-links,.build-timestamp{padding-top:0}
45794579
.build-pipeline{-webkit-flex-direction:row;-moz-flex-direction:row;-ms-flex-direction:row;flex-direction:row;display:-webkit-flex;display:-moz-flex;display:-ms-flexbox;display:-ms-flex;display:flex}
45804580
.build-pipeline .build-name{white-space:nowrap}
4581-
.build-summary{border-bottom-width:0;border-right:1px solid #d1d1d1;-webkit-flex:0 0 175px;-moz-flex:0 0 175px;-ms-flex:0 0 175px;flex:0 0 175px;-webkit-flex-direction:column;-moz-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-justify-content:center;-moz-justify-content:center;justify-content:center}
4581+
.build-summary{border-bottom-width:0;border-right:1px solid #d1d1d1;-webkit-flex:0 0 125px;-moz-flex:0 0 125px;-ms-flex:0 0 125px;flex:0 0 125px;-webkit-flex-direction:column;-moz-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-justify-content:center;-moz-justify-content:center;justify-content:center}
45824582
}
45834583
.console-os .top-header,.pipeline-status-bar{display:-webkit-flex;display:-moz-flex;display:-ms-flexbox;display:-ms-flex}
4584-
@media (min-width:992px){.pipeline .pipeline-stage{width:33.333333%}
4584+
@media (min-width:992px){.pipeline .pipeline-stage{width:25%}
45854585
}
4586-
@media (min-width:1200px){.pipeline .pipeline-stage{width:25%}
4586+
@media (min-width:1200px){.pipeline .pipeline-stage{width:20%}
4587+
}
4588+
@media (min-width:1400px){.pipeline .pipeline-stage{width:16.66666667%}
4589+
}
4590+
@media (min-width:1600px){.pipeline .pipeline-stage{width:14.28571429%}
45874591
}
45884592
.pipeline-status-bar .clip1:before,.pipeline-status-bar .clip2:before,.pipeline-status-bar .pipeline-line:before{background-color:#d1d1d1}
45894593
.pipeline-status-bar .inner-circle-fill{background-color:#fff;opacity:0}

0 commit comments

Comments
 (0)