Skip to content

Commit b3d9f3e

Browse files
committed
Toggle link positioning for truncation directive
Fixes openshift#1277
1 parent d5e1aba commit b3d9f3e

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

app/styles/_core.less

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1286,3 +1286,8 @@ copy-to-clipboard .input-group.limit-width {
12861286
width: 100%;
12871287
}
12881288
}
1289+
1290+
.truncated-content-toggle-link {
1291+
margin-left: 5px;
1292+
white-space: nowrap;
1293+
}

app/views/directives/truncate-long-text.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
<span ng-attr-title="{{content}}">
55
<span ng-bind-html="truncatedContent | highlightKeywords : keywords" class="truncated-content"></span>&hellip;
66
</span>
7-
<a ng-if="expandable" href="" ng-click="toggles.expanded = true" style="margin-left: 5px; white-space: nowrap;">See all</a>
7+
<a ng-if="expandable" href="" ng-click="toggles.expanded = true" class="truncated-content-toggle-link">See all</a>
88
</span>
99
<span ng-if="toggles.expanded">
1010
<div ng-if="prettifyJson" class="well">
11-
<span class="pull-right" style="margin-top: -10px;"><a href="" ng-click="toggles.expanded = false">Collapse</a></span>
11+
<span class="pull-right" style="margin-top: -10px;"><a href="" ng-click="toggles.expanded = false" class="truncated-content-toggle-link">Collapse</a></span>
1212
<span ng-bind-html="content | prettifyJSON | highlightKeywords : keywords" class="pretty-json truncated-content"></span>
1313
</div>
1414
<span ng-if="!prettifyJson">
15-
<span class="pull-right"><a href="" ng-click="toggles.expanded = false">Collapse</a></span>
15+
<span class="pull-right"><a href="" ng-click="toggles.expanded = false" class="truncated-content-toggle-link">Collapse</a></span>
1616
<span ng-bind-html="content | highlightKeywords : keywords" class="truncated-content"></span>
1717
</span>
1818
</span>

dist/scripts/templates.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8948,15 +8948,15 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
89488948
"<span ng-attr-title=\"{{content}}\">\n" +
89498949
"<span ng-bind-html=\"truncatedContent | highlightKeywords : keywords\" class=\"truncated-content\"></span>&hellip;\n" +
89508950
"</span>\n" +
8951-
"<a ng-if=\"expandable\" href=\"\" ng-click=\"toggles.expanded = true\" style=\"margin-left: 5px; white-space: nowrap\">See all</a>\n" +
8951+
"<a ng-if=\"expandable\" href=\"\" ng-click=\"toggles.expanded = true\" class=\"truncated-content-toggle-link\">See all</a>\n" +
89528952
"</span>\n" +
89538953
"<span ng-if=\"toggles.expanded\">\n" +
89548954
"<div ng-if=\"prettifyJson\" class=\"well\">\n" +
8955-
"<span class=\"pull-right\" style=\"margin-top: -10px\"><a href=\"\" ng-click=\"toggles.expanded = false\">Collapse</a></span>\n" +
8955+
"<span class=\"pull-right\" style=\"margin-top: -10px\"><a href=\"\" ng-click=\"toggles.expanded = false\" class=\"truncated-content-toggle-link\">Collapse</a></span>\n" +
89568956
"<span ng-bind-html=\"content | prettifyJSON | highlightKeywords : keywords\" class=\"pretty-json truncated-content\"></span>\n" +
89578957
"</div>\n" +
89588958
"<span ng-if=\"!prettifyJson\">\n" +
8959-
"<span class=\"pull-right\"><a href=\"\" ng-click=\"toggles.expanded = false\">Collapse</a></span>\n" +
8959+
"<span class=\"pull-right\"><a href=\"\" ng-click=\"toggles.expanded = false\" class=\"truncated-content-toggle-link\">Collapse</a></span>\n" +
89608960
"<span ng-bind-html=\"content | highlightKeywords : keywords\" class=\"truncated-content\"></span>\n" +
89618961
"</span>\n" +
89628962
"</span>\n" +

dist/styles/main.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4134,6 +4134,7 @@ copy-to-clipboard .input-group.limit-width{max-width:300px}
41344134
.tech-preview-header{justify-content:space-between}
41354135
@media (max-width:479px){.col-xxs-12{width:100%}
41364136
}
4137+
.truncated-content-toggle-link{margin-left:5px;white-space:nowrap}
41374138
.data-toolbar{padding:5px 0}
41384139
.data-toolbar.other-resources-toolbar .data-toolbar-dropdown{min-width:210px}
41394140
.data-toolbar .checkbox{margin-bottom:0;margin-top:10px}

0 commit comments

Comments
 (0)