Skip to content

Commit 2fed35a

Browse files
committed
Let mobile users scroll Jenkinsfile examples
Some snippets are too wide to see on small screens. Let users scroll. Includes some other minor style improvements.
1 parent ac02e04 commit 2fed35a

File tree

7 files changed

+29
-6
lines changed

7 files changed

+29
-6
lines changed

Diff for: app/scripts/services/modals.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ angular.module("openshiftConsole")
3535
$uibModal.open({
3636
animation: true,
3737
templateUrl: 'views/modals/jenkinsfile-examples-modal.html',
38-
controller: 'JenkinsfileExamplesModalController'
38+
controller: 'JenkinsfileExamplesModalController',
39+
size: 'lg'
3940
});
4041
},
4142

Diff for: app/styles/_core.less

+12
Original file line numberDiff line numberDiff line change
@@ -1019,6 +1019,18 @@ a.disabled-link {
10191019
}
10201020
}
10211021

1022+
.jenkinsfile-examples-modal {
1023+
.jenkinsfile-examples p:last-child {
1024+
// Use `modal-body` bottom margin and padding.
1025+
margin-bottom: 0;
1026+
padding-bottom: 0;
1027+
}
1028+
.modal-footer {
1029+
margin-top: 0;
1030+
padding-top: 0;
1031+
}
1032+
}
1033+
10221034
.ace-inline {
10231035
height: 300px;
10241036
}

Diff for: app/styles/_forms.less

+8-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,14 @@
2929
border: 1px solid @color-pf-black-300;
3030
}
3131

32-
.jenkinsfile-examples .copy-to-clipboard {
33-
margin-top: 3px;
32+
.jenkinsfile-examples {
33+
p {
34+
// Show scrollbars as needed on small screens.
35+
overflow: auto;
36+
}
37+
.copy-to-clipboard {
38+
margin-top: 3px;
39+
}
3440
}
3541

3642
.compute-resource {

Diff for: app/views/modals/jenkinsfile-examples-modal.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div>
1+
<div class="jenkinsfile-examples-modal">
22
<div class="modal-body">
33
<h2>Jenkinsfile Examples</h2>
44
<ng-include src="'views/edit/jenkinsfile-examples.html'"></ng-include>

Diff for: dist/scripts/scripts.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -4117,7 +4117,8 @@ showJenkinsfileExamples:function() {
41174117
a.open({
41184118
animation:!0,
41194119
templateUrl:"views/modals/jenkinsfile-examples-modal.html",
4120-
controller:"JenkinsfileExamplesModalController"
4120+
controller:"JenkinsfileExamplesModalController",
4121+
size:"lg"
41214122
});
41224123
},
41234124
showComputeUnitsHelp:function() {

Diff for: dist/scripts/templates.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10076,7 +10076,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1007610076

1007710077

1007810078
$templateCache.put('views/modals/jenkinsfile-examples-modal.html',
10079-
"<div>\n" +
10079+
"<div class=\"jenkinsfile-examples-modal\">\n" +
1008010080
"<div class=\"modal-body\">\n" +
1008110081
"<h2>Jenkinsfile Examples</h2>\n" +
1008210082
"<ng-include src=\"'views/edit/jenkinsfile-examples.html'\"></ng-include>\n" +

Diff for: dist/styles/main.css

+3
Original file line numberDiff line numberDiff line change
@@ -3585,6 +3585,7 @@ to{transform:rotate(359deg)}
35853585
.copy-to-clipboard-multiline pre{background-color:#fff;max-width:100%;overflow-x:auto}
35863586
.input-group-addon.wildcard-prefix{padding-left:10px}
35873587
.editor-examples{padding:19px;margin-bottom:20px;border:1px solid #d1d1d1}
3588+
.jenkinsfile-examples p{overflow:auto}
35883589
.jenkinsfile-examples .copy-to-clipboard{margin-top:3px}
35893590
.compute-resource{margin-bottom:5px}
35903591
@media (max-width:767px){.compute-resource .inline-select{margin-top:5px}
@@ -3974,6 +3975,8 @@ a.disabled-link:active,a.disabled-link:focus,a.disabled-link:hover{color:#bbb;te
39743975
.modal-debug-terminal .modal-body .empty-state-message{margin-top:60px}
39753976
.modal-debug-terminal .modal-body kubernetes-container-terminal{text-align:center;overflow:hidden}
39763977
.modal-debug-terminal .modal-footer{padding-top:0}
3978+
.jenkinsfile-examples-modal .jenkinsfile-examples p:last-child{margin-bottom:0;padding-bottom:0}
3979+
.jenkinsfile-examples-modal .modal-footer{margin-top:0;padding-top:0}
39773980
.ace-inline{height:300px}
39783981
.ace-inline-small{height:200px}
39793982
#from-file .editor{height:350px}

0 commit comments

Comments
 (0)