Skip to content

Commit 19fa849

Browse files
committed
Toggle link positioning for truncation directive
Fixes #1277
1 parent fb5ff0b commit 19fa849

File tree

4 files changed

+20
-8
lines changed

4 files changed

+20
-8
lines changed

Diff for: app/styles/_core.less

+10
Original file line numberDiff line numberDiff line change
@@ -1286,3 +1286,13 @@ copy-to-clipboard .input-group.limit-width {
12861286
width: 100%;
12871287
}
12881288
}
1289+
1290+
// Within truncation directive controls spacing between content and toggle link
1291+
.truncation-block {
1292+
margin-right: 10px;
1293+
}
1294+
1295+
.truncation-collapse-link {
1296+
margin-left: 10px;
1297+
white-space: nowrap;
1298+
}

Diff for: app/views/directives/truncate-long-text.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<span ng-if="!truncated" ng-bind-html="content | highlightKeywords : keywords" class="truncated-content"></span>
22
<span ng-if="truncated">
33
<span ng-if="!toggles.expanded">
4-
<span ng-attr-title="{{content}}">
4+
<span ng-attr-title="{{content}}" class="truncation-block">
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="nowrap">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="truncation-collapse-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="truncation-collapse-link">Collapse</a></span>
1616
<span ng-bind-html="content | highlightKeywords : keywords" class="truncated-content"></span>
1717
</span>
1818
</span>

Diff for: dist/scripts/templates.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -8945,18 +8945,18 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
89458945
"<span ng-if=\"!truncated\" ng-bind-html=\"content | highlightKeywords : keywords\" class=\"truncated-content\"></span>\n" +
89468946
"<span ng-if=\"truncated\">\n" +
89478947
"<span ng-if=\"!toggles.expanded\">\n" +
8948-
"<span ng-attr-title=\"{{content}}\">\n" +
8948+
"<span ng-attr-title=\"{{content}}\" class=\"truncation-block\">\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=\"nowrap\">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=\"truncation-collapse-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=\"truncation-collapse-link\">Collapse</a></span>\n" +
89608960
"<span ng-bind-html=\"content | highlightKeywords : keywords\" class=\"truncated-content\"></span>\n" +
89618961
"</span>\n" +
89628962
"</span>\n" +

Diff for: dist/styles/main.css

+2
Original file line numberDiff line numberDiff line change
@@ -4134,6 +4134,8 @@ 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+
.truncation-block{margin-right:10px}
4138+
.truncation-collapse-link{margin-left:10px;white-space:nowrap}
41374139
.data-toolbar{padding:5px 0}
41384140
.data-toolbar.other-resources-toolbar .data-toolbar-dropdown{min-width:210px}
41394141
.data-toolbar .checkbox{margin-bottom:0;margin-top:10px}

0 commit comments

Comments
 (0)