Skip to content

Commit

Permalink
Move 'view details' link into it's own container that can wrap at mob…
Browse files Browse the repository at this point in the history
…ile.

Some adjustments needed for vertical alignment.
Reference #2182
  • Loading branch information
sg00dwin authored and cdcabrera committed Oct 12, 2017
1 parent 65b96ce commit 67fdf59
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 14 deletions.
12 changes: 11 additions & 1 deletion app/styles/_kve.less
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@
.key-value-editor-entry,
.environment-from-entry {
display: table;
margin-bottom: 15px;
padding-right: (@as-sortable-item-button-width * 2);
position: relative;
table-layout: fixed;
Expand All @@ -127,11 +128,12 @@
float: left;
padding-right: 5px;
position: relative;
width: 50%;
width: auto;
}
}
.environment-from-input {
float: left;
margin-bottom: 0;
padding-right: 5px;
width: 100%;
@media(min-width: @screen-md-min) {
Expand All @@ -144,6 +146,13 @@
}
}
}
.environment-from-entry {
.environment-from-view-details {
float: left;
line-height: 1;
padding: 6px 0 0;
}
}

.key-value-editor-input .ui-select {
@media(min-width: @screen-md-min) {
Expand All @@ -163,6 +172,7 @@
.key-value-editor .key-value-editor-input,
.key-value-editor-header {
float: left;
margin-bottom: 0;
padding-right: 5px;
width: 50%;
}
Expand Down
5 changes: 3 additions & 2 deletions app/views/directives/edit-environment-from.html
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,12 @@
role="button"
aria-label="Delete row"
ng-click="$ctrl.deleteEntry($index, 1)"></a>
</div>
<div class="environment-from-view-details">
<a
ng-if="entry.selectedEnvFrom"
href=""
ng-click="$ctrl.viewOverlayPanel(entry.selectedEnvFrom)"
class="pficon">View Details</a>
ng-click="$ctrl.viewOverlayPanel(entry.selectedEnvFrom)">View Details</a>
</div>
</div>

Expand Down
4 changes: 3 additions & 1 deletion dist/scripts/templates.js
Original file line number Diff line number Diff line change
Expand Up @@ -6638,7 +6638,9 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<div ng-if=\"!$ctrl.isReadonlyAny && !entry.isReadonlyValue\" class=\"environment-from-editor-button\">\n" +
"<span ng-if=\"!$ctrl.cannotSort && $ctrl.entries.length > 1\" class=\"fa fa-bars sort-row\" role=\"button\" aria-label=\"Move row\" aria-grabbed=\"false\" as-sortable-item-handle></span>\n" +
"<a ng-if=\"!$ctrl.cannotDeleteAny\" href=\"\" class=\"pficon pficon-close delete-row as-sortable-item-delete\" role=\"button\" aria-label=\"Delete row\" ng-click=\"$ctrl.deleteEntry($index, 1)\"></a>\n" +
"<a ng-if=\"entry.selectedEnvFrom\" href=\"\" ng-click=\"$ctrl.viewOverlayPanel(entry.selectedEnvFrom)\" class=\"pficon\">View Details</a>\n" +
"</div>\n" +
"<div class=\"environment-from-view-details\">\n" +
"<a ng-if=\"entry.selectedEnvFrom\" href=\"\" ng-click=\"$ctrl.viewOverlayPanel(entry.selectedEnvFrom)\">View Details</a>\n" +
"</div>\n" +
"</div>\n" +
"<div class=\"environment-from-entry form-group\" ng-if=\"!$ctrl.cannotAdd\">\n" +
Expand Down
21 changes: 11 additions & 10 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 67fdf59

Please sign in to comment.