@@ -78,8 +78,12 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
78
78
"<input type=\"number\" name=\"amount\" ng-attr-id=\"{{id}}\" ng-model=\"input.amount\" min=\"0\" ng-attr-placeholder=\"{{placeholder}}\" class=\"form-control\" ng-attr-aria-describedby=\"{{description ? id + '-help' : undefined}}\">\n" +
79
79
=======
80
80
"<label class=\"sr-only\" ng-attr-for=\"{{id}}\">Amount</label>\n" +
81
+ <<<<<<< 8a34936c48f608fee0ba519704760e330f592798
81
82
"<input type=\"number\" name=\"amount\" ng-attr-id=\"{{id}}\" ng-model=\"input.amount\" min=\"0\" pattern=\"\\d*\" ng-attr-placeholder=\"{{placeholder}}\" select-on-focus class=\"form-control\" ng-attr-aria-describedby=\"{{description ? id + '-help' : undefined}}\">\n" +
82
83
>>>>>>> Bug 1470976 - Support number input on iOS
84
+ =======
85
+ "<input type=\"number\" name=\"amount\" ng-attr-id=\"{{id}}\" ng-model=\"input.amount\" min=\"0\" pattern=\"\\d+(\\.\\d+)?\" ng-attr-placeholder=\"{{placeholder}}\" select-on-focus class=\"form-control\" ng-attr-aria-describedby=\"{{description ? id + '-help' : undefined}}\">\n" +
86
+ >>>>>>> Bug 1491495 - Allow decimals in some number inputs
83
87
"</div>\n" +
84
88
"<div class=\"resource-unit\">\n" +
85
89
"<label class=\"sr-only\" ng-attr-for=\"{{id}}-unit\" translate>Unit</label>\n" +
@@ -8511,7 +8515,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
8511
8515
"<div class=\"resource-size\" ng-class=\"{ 'has-error': persistentVolumeClaimForm.capacity.$invalid && persistentVolumeClaimForm.capacity.$touched && !claimDisabled }\">\n" +
8512
8516
"<div class=\"resource-amount\">\n" +
8513
8517
"<label for=\"claim-amount\" class=\"sr-only\">Amount</label>\n" +
8514
- "<input type=\"number\" name=\"capacity\" id=\"claim-amount\" ng-model=\"claim.amount\" required min=\"0\" pattern=\"\\d* \" select-on-focus class=\"form-control\" aria-describedby=\"claim-capacity-help\">\n" +
8518
+ "<input type=\"number\" name=\"capacity\" id=\"claim-amount\" ng-model=\"claim.amount\" required min=\"0\" pattern=\"\\d+(\\.\\d+)? \" select-on-focus class=\"form-control\" aria-describedby=\"claim-capacity-help\">\n" +
8515
8519
"</div>\n" +
8516
8520
"<div class=\"resource-unit\">\n" +
8517
8521
"<label class=\"sr-only\">Unit</label>\n" +
0 commit comments