Skip to content

Commit 26fea74

Browse files
author
OpenShift Bot
authored
Merge pull request #933 from sg00dwin/table-col-align-issue904
Merged by openshift-bot
2 parents d4a5a52 + 527aaa3 commit 26fea74

File tree

4 files changed

+67
-28
lines changed

4 files changed

+67
-28
lines changed

‎app/styles/_tables.less

+13
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,9 @@
9797
border-top: 2px solid @table-border-color;
9898
// so that .word-break() will work
9999
table-layout: fixed;
100+
colgroup, col {
101+
display: none;
102+
}
100103
thead, tbody, th, td, tr {
101104
display: block;
102105
}
@@ -197,3 +200,13 @@
197200
font-family: @font-family-monospace;
198201
}
199202
}
203+
204+
.table-word-break-all td {
205+
// Break long non-breaking strings by default
206+
.word-break-all;
207+
// Override specific cells
208+
&.word-break-normal {
209+
word-break: normal;
210+
overflow-wrap: normal;
211+
}
212+
}

‎app/views/secrets.html

+18-6
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@ <h1>Secrets</h1>
2121
<div ng-if="loaded" class="row">
2222
<div class="col-md-12">
2323
<h2>Source Secrets</h2>
24-
<table class="table table-bordered table-hover table-mobile secrets-table">
24+
<table class="table table-bordered table-hover table-mobile secrets-table table-word-break-all">
25+
<colgroup>
26+
<col class="col-sm-5">
27+
<col class="col-sm-5">
28+
</colgroup>
2529
<thead>
2630
<tr>
2731
<th>Name</th>
@@ -42,15 +46,19 @@ <h2>Source Secrets</h2>
4246
<td data-title="Type">
4347
{{secret.type}}
4448
</td>
45-
<td data-title="Created">
49+
<td data-title="Created" class="word-break-normal">
4650
<span am-time-ago="secret.metadata.creationTimestamp"></span>
4751
</td>
4852
</tr>
4953
</tbody>
5054
</table>
5155
<div ng-if="secretsByType.images.length !== 0">
5256
<h2>Image Secrets</h2>
53-
<table class="table table-bordered table-hover table-mobile secrets-table">
57+
<table class="table table-bordered table-hover table-mobile secrets-table table-word-break-all">
58+
<colgroup>
59+
<col class="col-sm-5">
60+
<col class="col-sm-5">
61+
</colgroup>
5462
<thead>
5563
<tr>
5664
<th>Name</th>
@@ -66,7 +74,7 @@ <h2>Image Secrets</h2>
6674
<td data-title="Type">
6775
{{secret.type}}
6876
</td>
69-
<td data-title="Created">
77+
<td data-title="Created" class="word-break-normal">
7078
<span am-time-ago="secret.metadata.creationTimestamp"></span>
7179
</td>
7280
</tr>
@@ -75,7 +83,11 @@ <h2>Image Secrets</h2>
7583
</div>
7684
<div ng-if="secretsByType.other.length !== 0">
7785
<h2>Other Secrets</h2>
78-
<table class="table table-bordered table-hover table-mobile secrets-table">
86+
<table class="table table-bordered table-hover table-mobile secrets-table table-word-break-all">
87+
<colgroup>
88+
<col class="col-sm-5">
89+
<col class="col-sm-5">
90+
</colgroup>
7991
<thead>
8092
<tr>
8193
<th>Name</th>
@@ -91,7 +103,7 @@ <h2>Other Secrets</h2>
91103
<td data-title="Type">
92104
{{secret.type}}
93105
</td>
94-
<td data-title="Created">
106+
<td data-title="Created" class="word-break-normal">
95107
<span am-time-ago="secret.metadata.creationTimestamp"></span>
96108
</td>
97109
</tr>

‎dist/scripts/templates.js

+18-6
Original file line numberDiff line numberDiff line change
@@ -11381,7 +11381,11 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1138111381
"<div ng-if=\"loaded\" class=\"row\">\n" +
1138211382
"<div class=\"col-md-12\">\n" +
1138311383
"<h2>Source Secrets</h2>\n" +
11384-
"<table class=\"table table-bordered table-hover table-mobile secrets-table\">\n" +
11384+
"<table class=\"table table-bordered table-hover table-mobile secrets-table table-word-break-all\">\n" +
11385+
"<colgroup>\n" +
11386+
"<col class=\"col-sm-5\">\n" +
11387+
"<col class=\"col-sm-5\">\n" +
11388+
"</colgroup>\n" +
1138511389
"<thead>\n" +
1138611390
"<tr>\n" +
1138711391
"<th>Name</th>\n" +
@@ -11402,15 +11406,19 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1140211406
"<td data-title=\"Type\">\n" +
1140311407
"{{secret.type}}\n" +
1140411408
"</td>\n" +
11405-
"<td data-title=\"Created\">\n" +
11409+
"<td data-title=\"Created\" class=\"word-break-normal\">\n" +
1140611410
"<span am-time-ago=\"secret.metadata.creationTimestamp\"></span>\n" +
1140711411
"</td>\n" +
1140811412
"</tr>\n" +
1140911413
"</tbody>\n" +
1141011414
"</table>\n" +
1141111415
"<div ng-if=\"secretsByType.images.length !== 0\">\n" +
1141211416
"<h2>Image Secrets</h2>\n" +
11413-
"<table class=\"table table-bordered table-hover table-mobile secrets-table\">\n" +
11417+
"<table class=\"table table-bordered table-hover table-mobile secrets-table table-word-break-all\">\n" +
11418+
"<colgroup>\n" +
11419+
"<col class=\"col-sm-5\">\n" +
11420+
"<col class=\"col-sm-5\">\n" +
11421+
"</colgroup>\n" +
1141411422
"<thead>\n" +
1141511423
"<tr>\n" +
1141611424
"<th>Name</th>\n" +
@@ -11426,7 +11434,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1142611434
"<td data-title=\"Type\">\n" +
1142711435
"{{secret.type}}\n" +
1142811436
"</td>\n" +
11429-
"<td data-title=\"Created\">\n" +
11437+
"<td data-title=\"Created\" class=\"word-break-normal\">\n" +
1143011438
"<span am-time-ago=\"secret.metadata.creationTimestamp\"></span>\n" +
1143111439
"</td>\n" +
1143211440
"</tr>\n" +
@@ -11435,7 +11443,11 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1143511443
"</div>\n" +
1143611444
"<div ng-if=\"secretsByType.other.length !== 0\">\n" +
1143711445
"<h2>Other Secrets</h2>\n" +
11438-
"<table class=\"table table-bordered table-hover table-mobile secrets-table\">\n" +
11446+
"<table class=\"table table-bordered table-hover table-mobile secrets-table table-word-break-all\">\n" +
11447+
"<colgroup>\n" +
11448+
"<col class=\"col-sm-5\">\n" +
11449+
"<col class=\"col-sm-5\">\n" +
11450+
"</colgroup>\n" +
1143911451
"<thead>\n" +
1144011452
"<tr>\n" +
1144111453
"<th>Name</th>\n" +
@@ -11451,7 +11463,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1145111463
"<td data-title=\"Type\">\n" +
1145211464
"{{secret.type}}\n" +
1145311465
"</td>\n" +
11454-
"<td data-title=\"Created\">\n" +
11466+
"<td data-title=\"Created\" class=\"word-break-normal\">\n" +
1145511467
"<span am-time-ago=\"secret.metadata.creationTimestamp\"></span>\n" +
1145611468
"</td>\n" +
1145711469
"</tr>\n" +

0 commit comments

Comments
 (0)