Skip to content

Commit

Permalink
Merge pull request #2195 from sg00dwin/envfrom-headings
Browse files Browse the repository at this point in the history
Merged by openshift-bot
  • Loading branch information
OpenShift Bot committed Sep 29, 2017
2 parents 7f03cb7 + 2a61197 commit 752a6ae
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 10 deletions.
7 changes: 7 additions & 0 deletions app/styles/_typography.less
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,13 @@ a.subtle-link {
}
}

.section-label {
color: #757575;
font-size: @font-size-base - 3px;
font-weight: normal;
margin-top: @grid-gutter-width / 2;
text-transform: uppercase;
}

/* force a space where it may collapse */
.space-after:after {
Expand Down
4 changes: 2 additions & 2 deletions app/views/directives/edit-environment-variables.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div ng-repeat="container in $ctrl.containers">
<h3>Container {{container.name}}</h3>

<h4>Variables</h4>
<h4 class="section-label">Variables</h4>
<div ng-if="!$ctrl.canIUpdate || $ctrl.ngReadonly">
<span ng-if="!container.env.length">
No environment variables set in the {{$ctrl.apiObject.kind | humanizeKind}}
Expand Down Expand Up @@ -35,7 +35,7 @@ <h4>Variables</h4>
show-header>
</key-value-editor>

<h4>
<h4 class="section-label">
Environment From
<span class="pficon pficon-help"
aria-hidden="true"
Expand Down
4 changes: 2 additions & 2 deletions dist/scripts/templates.js
Original file line number Diff line number Diff line change
Expand Up @@ -6699,7 +6699,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<confirm-on-exit ng-if=\"$ctrl.canIUpdate && !$ctrl.ngReadonly\" dirty=\"$ctrl.form.$dirty\"></confirm-on-exit>\n" +
"<div ng-repeat=\"container in $ctrl.containers\">\n" +
"<h3>Container {{container.name}}</h3>\n" +
"<h4>Variables</h4>\n" +
"<h4 class=\"section-label\">Variables</h4>\n" +
"<div ng-if=\"!$ctrl.canIUpdate || $ctrl.ngReadonly\">\n" +
"<span ng-if=\"!container.env.length\">\n" +
"No environment variables set in the {{$ctrl.apiObject.kind | humanizeKind}} template for container {{container.name}}.\n" +
Expand All @@ -6709,7 +6709,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"</div>\n" +
"<key-value-editor ng-if=\"$ctrl.canIUpdate && !$ctrl.ngReadonly\" entries=\"container.env\" key-placeholder=\"Name\" value-placeholder=\"Value\" value-from-selector-options=\"$ctrl.valueFromObjects\" key-validator=\"[A-Za-z_][A-Za-z0-9_]*\" key-validator-error=\"Please enter a valid key.\" key-validator-error-tooltip=\"A valid environment variable name is an alphanumeric (a-z and 0-9) string beginning with a letter that may contain underscores.\" add-row-link=\"Add Variable\" add-row-with-selectors-link=\"Add Variable from Config Map or Secret\" show-header>\n" +
"</key-value-editor>\n" +
"<h4>\n" +
"<h4 class=\"section-label\">\n" +
"Environment From\n" +
"<span class=\"pficon pficon-help\" aria-hidden=\"true\" data-toggle=\"tooltip\" data-original-title=\"Environment From lets you add all key-value pairs from a config map or secret as environment variables.\"></span>\n" +
"</h4>\n" +
Expand Down
11 changes: 5 additions & 6 deletions dist/styles/main.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 752a6ae

Please sign in to comment.