Skip to content

Commit e6511c9

Browse files
sg00dwinsg00dwin
committed
Removing an inappropriate class used to wrap inline radio form controls.
And switch inline margin from left to right side to allow for alignment left. Fixes openshift#1240 Fixes openshift#1234
1 parent 3f779bc commit e6511c9

File tree

5 files changed

+41
-43
lines changed

5 files changed

+41
-43
lines changed

‎app/styles/_forms.less

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,3 +86,12 @@
8686
// the sections just above.
8787
margin-top: @line-height-computed;
8888
}
89+
90+
// Switch default bootstrap margin from left to the right side to enable left alignment of inputs at mobile
91+
.radio-inline,
92+
.radio-inline + .radio-inline,
93+
.checkbox-inline,
94+
.checkbox-inline + .checkbox-inline {
95+
margin-left: 0;
96+
margin-right: 10px;
97+
}

‎app/views/directives/edit-lifecycle-hook.html

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,22 @@
1010

1111
<div class="form-group">
1212
<label for="actionType" class="required">Lifecycle Action</label><br/>
13-
<div class="radio">
14-
<label class="radio-inline">
15-
<input type="radio"
16-
name="{{type}}-action-newpod"
17-
ng-model="action.type"
18-
value="execNewPod"
19-
aria-describedby="action-help">
20-
Run a specific command in a new pod
21-
</label>
22-
<label class="radio-inline">
23-
<input type="radio"
24-
name="{{type}}-action-images"
25-
ng-model="action.type"
26-
value="tagImages"
27-
aria-describedby="action-help">
28-
Tag image if the deployment succeeds
29-
</label>
30-
</div>
13+
<label class="radio-inline">
14+
<input type="radio"
15+
name="{{type}}-action-newpod"
16+
ng-model="action.type"
17+
value="execNewPod"
18+
aria-describedby="action-help">
19+
Run a specific command in a new pod
20+
</label>
21+
<label class="radio-inline">
22+
<input type="radio"
23+
name="{{type}}-action-images"
24+
ng-model="action.type"
25+
value="tagImages"
26+
aria-describedby="action-help">
27+
Tag image if the deployment succeeds
28+
</label>
3129
<div id="action-help" class="help-block">
3230
<span ng-if="action.type === 'execNewPod'">Runs a command in a new pod using the container from the deployment template. You can add additional environment variables and volumes.</span>
3331
<span ng-if="action.type === 'tagImages'">Tags the current image as an image stream tag if the deployment succeeds.</span>

‎app/views/directives/osc-persistent-volume-claim.html

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -89,25 +89,19 @@
8989
</div>
9090

9191
<div class="form-group" >
92-
<label class="required">Access Mode</label>
93-
<div class="radio">
94-
95-
<label class="radio-inline">
96-
<input type="radio" name="accessModes" ng-model="claim.accessModes" value="ReadWriteOnce" aria-describedby="access-modes-help" ng-checked="true" >
97-
Single User (RWO)
98-
</label>
99-
100-
<label class="radio-inline">
101-
<input type="radio" id="accessModes" name="accessModes" ng-model="claim.accessModes" value="ReadWriteMany" aria-describedby="access-modes-help" >
102-
Shared Access (RWX)
103-
</label>
104-
105-
<label class="radio-inline">
106-
<input type="radio" name="accessModes" ng-model="claim.accessModes" value="ReadOnlyMany" aria-describedby="access-modes-help">
107-
Read Only (ROX)
108-
</label>
109-
110-
</div>
92+
<label class="required">Access Mode</label><br/>
93+
<label class="radio-inline">
94+
<input type="radio" name="accessModes" ng-model="claim.accessModes" value="ReadWriteOnce" aria-describedby="access-modes-help" ng-checked="true" >
95+
Single User (RWO)
96+
</label>
97+
<label class="radio-inline">
98+
<input type="radio" id="accessModes" name="accessModes" ng-model="claim.accessModes" value="ReadWriteMany" aria-describedby="access-modes-help" >
99+
Shared Access (RWX)
100+
</label>
101+
<label class="radio-inline">
102+
<input type="radio" name="accessModes" ng-model="claim.accessModes" value="ReadOnlyMany" aria-describedby="access-modes-help">
103+
Read Only (ROX)
104+
</label>
111105
<div>
112106
<span id="access-modes-help" class="help-block">Permissions to the mounted volume.</span>
113107
</div>

‎dist/scripts/templates.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6858,7 +6858,6 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
68586858
"<fieldset ng-disabled=\"view.isDisabled\">\n" +
68596859
"<div class=\"form-group\">\n" +
68606860
"<label for=\"actionType\" class=\"required\">Lifecycle Action</label><br/>\n" +
6861-
"<div class=\"radio\">\n" +
68626861
"<label class=\"radio-inline\">\n" +
68636862
"<input type=\"radio\" name=\"{{type}}-action-newpod\" ng-model=\"action.type\" value=\"execNewPod\" aria-describedby=\"action-help\">\n" +
68646863
"Run a specific command in a new pod\n" +
@@ -6867,7 +6866,6 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
68676866
"<input type=\"radio\" name=\"{{type}}-action-images\" ng-model=\"action.type\" value=\"tagImages\" aria-describedby=\"action-help\">\n" +
68686867
"Tag image if the deployment succeeds\n" +
68696868
"</label>\n" +
6870-
"</div>\n" +
68716869
"<div id=\"action-help\" class=\"help-block\">\n" +
68726870
"<span ng-if=\"action.type === 'execNewPod'\">Runs a command in a new pod using the container from the deployment template. You can add additional environment variables and volumes.</span>\n" +
68736871
"<span ng-if=\"action.type === 'tagImages'\">Tags the current image as an image stream tag if the deployment succeeds.</span>\n" +
@@ -7995,8 +7993,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
79957993
"</div>\n" +
79967994
"</div>\n" +
79977995
"<div class=\"form-group\">\n" +
7998-
"<label class=\"required\">Access Mode</label>\n" +
7999-
"<div class=\"radio\">\n" +
7996+
"<label class=\"required\">Access Mode</label><br/>\n" +
80007997
"<label class=\"radio-inline\">\n" +
80017998
"<input type=\"radio\" name=\"accessModes\" ng-model=\"claim.accessModes\" value=\"ReadWriteOnce\" aria-describedby=\"access-modes-help\" ng-checked=\"true\">\n" +
80027999
"Single User (RWO)\n" +
@@ -8009,7 +8006,6 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
80098006
"<input type=\"radio\" name=\"accessModes\" ng-model=\"claim.accessModes\" value=\"ReadOnlyMany\" aria-describedby=\"access-modes-help\">\n" +
80108007
"Read Only (ROX)\n" +
80118008
"</label>\n" +
8012-
"</div>\n" +
80138009
"<div>\n" +
80148010
"<span id=\"access-modes-help\" class=\"help-block\">Permissions to the mounted volume.</span>\n" +
80158011
"</div>\n" +

‎dist/styles/main.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@ textarea.form-control{height:auto}
705705
.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{position:absolute;margin-left:-20px;margin-top:4px\9}
706706
.checkbox+.checkbox,.radio+.radio{margin-top:-5px}
707707
.checkbox-inline,.radio-inline{position:relative;display:inline-block;padding-left:20px;margin-bottom:0;vertical-align:middle;font-weight:400;cursor:pointer}
708-
.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}
708+
.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0}
709709
.checkbox-inline.disabled,.checkbox.disabled label,.radio-inline.disabled,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio label,fieldset[disabled] .radio-inline,fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}
710710
.form-control-static{padding-top:3px;padding-bottom:3px;margin-bottom:0;min-height:34px}
711711
.form-control-static.input-lg,.form-control-static.input-sm{padding-left:0;padding-right:0}
@@ -3600,6 +3600,7 @@ to{transform:rotate(359deg)}
36003600
}
36013601
.osc-file-input textarea{font-family:Menlo,Monaco,Consolas,monospace;margin:5px 0}
36023602
.health-checks-form .pause-rollouts-checkbox,.set-limits-form .pause-rollouts-checkbox{margin-top:21px}
3603+
.checkbox-inline,.checkbox-inline+.checkbox-inline,.radio-inline,.radio-inline+.radio-inline{margin-left:0;margin-right:10px}
36033604
.card-pf{box-shadow:0 3px 1px -2px rgba(0,0,0,.15),0 2px 2px 0 rgba(0,0,0,.1),0 1px 5px 0 rgba(0,0,0,.09)}
36043605
.card-pf .image-icon,.card-pf .template-icon{font-size:28px;line-height:1;margin-right:15px;opacity:.38}
36053606
.card-pf-badge{color:#999;font-size:11px;text-transform:uppercase}

0 commit comments

Comments
 (0)