Skip to content

Commit 45047f3

Browse files
authored
Merge branch 'main' into updateVersion
2 parents d568b50 + c40e018 commit 45047f3

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

html/index.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,13 @@
5151
import '@patternfly/elements/pf-text-input/pf-text-input.js';
5252
import '@rhds/elements/rh-tabs/rh-tabs.js';
5353
import '@rhds/elements/rh-accordion/rh-accordion.js';
54+
import '@rhds/elements/rh-table/rh-table.js';
5455
import 'https://jspm.dev/@rhds/elements/rh-tag/rh-tag.js'
5556
</script>
5657
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" integrity="sha256-2TnSHycBDAm2wpZmgdi0z81kykGPJAkiUY+Wf97RbvY=" crossorigin="anonymous">
5758
<link rel="stylesheet" href="https://getbootstrap.com/docs/5.3/assets/css/docs.css" integrity="sha256-X0cPqbNml7z/f/z7c1HiTdJ2aSO4QmaAMDnESV5n7fE=" crossorigin="anonymous">
58-
59-
<link inline rel="stylesheet" href="style.css">
59+
<link rel="stylesheet"
60+
href="https://ux.redhat.com/assets/packages/@rhds/elements/elements/rh-table/rh-table-lightdom.css"> <link inline rel="stylesheet" href="style.css">
6061
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dayjs.min.js" integrity="sha256-NTsR4SOm3YHfJrmrmvBtEYqfQ6jQ5yvEKMhgQe3DIl0=" crossorigin="anonymous"></script>
6162
<script src="https://cdn.jsdelivr.net/npm/[email protected]/plugin/duration.min.js" integrity="sha256-6rug74IKp6v/8WINJxMw33zXo8NVOdRw/5Ib21ZzwU4=" crossorigin="anonymous"></script>
6263
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.0/jquery.min.js" integrity="sha256-2Pmvv0kuTBOenSvLm6bvfBSSHrUJ+3A7x6P5Ebd07/g=" crossorigin="anonymous"></script>

html/index.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,10 @@ function hideAllResultsTabObjects () {
199199
// fills the "version" tab element with the data from the claim.json passed in input
200200
function fillVersionsElement (input, element) {
201201
$(element).empty()
202-
$('<thead><tr><th scope="col">Component</th><th scope="col">Version</th></tr></thead><tbody>').appendTo($(element))
202+
$('<colgroup><col><col></colgroup><thead><tr><th scope="col" data-label="Component">Component</th>' +
203+
'<th scope="col" data-label="Version">Version</th></tr></thead><tbody>').appendTo($(element))
203204
for (const key in input) {
204-
$('<tr><td><b>' + key + '</b></td><td>' + input[key] + '</td></tr>').appendTo($(element))
205+
$('<tr><td data-label="Component"><b>' + key + '</b></td><td data-label="Version">' + input[key] + '</td></tr>').appendTo($(element))
205206
}
206207
$('</tbody>').appendTo($(element))
207208
}

html/results.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,13 @@
5151
import '@patternfly/elements/pf-text-input/pf-text-input.js';
5252
import '@rhds/elements/rh-tabs/rh-tabs.js';
5353
import '@rhds/elements/rh-accordion/rh-accordion.js';
54+
import '@rhds/elements/rh-table/rh-table.js';
5455
import 'https://jspm.dev/@rhds/elements/rh-tag/rh-tag.js'
5556
</script>
5657
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" integrity="sha256-2TnSHycBDAm2wpZmgdi0z81kykGPJAkiUY+Wf97RbvY=" crossorigin="anonymous">
5758
<link rel="stylesheet" href="https://getbootstrap.com/docs/5.3/assets/css/docs.css" integrity="sha256-X0cPqbNml7z/f/z7c1HiTdJ2aSO4QmaAMDnESV5n7fE=" crossorigin="anonymous">
58-
59-
<style>@keyframes anim-minus{to{transform:rotate(90deg)}}body,html{font-family:var(--rh-font-family-body-text, RedHatText, "Red Hat Text", "Noto Sans Arabic", "Noto Sans Hebrew", Helvetica, Arial, sans-serif);margin:0;padding:0;height:100%}progress{height:20px;width:0%}h1{font-size:var(--rh-font-size-heading-2xl, 3rem);margin:0}datalist,main{display:flex;flex-direction:column}main{grid-area:main;margin:var(--rh-space-xl, 10px);gap:var(--rh-space-lg, 16px);flex-flow:row wrap;margin-block:10px;margin-inline:20px}[data-demo],form{display:contents}fieldset{display:grid;flex:1 1 100%}label{font-weight:var(--rh-font-weight-heading-bold, 700);margin-block-end:var(--rh-space-sm, 6px)}body{color:var(--rh-color-text-primary-on-light, #151515);background-color:var(--rh-color-surface-lightest, #fff);display:grid;grid-template-areas:"header""progress""main""footer"}body.dark{color:var(--rh-color-text-primary-on-dark, #fff);background-color:var(--rh-color-surface-darkest, #151515)}section{padding:16px}form h2,rh-tabs{width:100%}form output{text-transform:capitalize}datalist{justify-content:space-between;writing-mode:vertical-lr}datalist,input{width:200px}option{padding:0}a{color:var(--rh-color-interactive-blue-darker, #06c)}input[type=checkbox],label,ul li a,ul li span{display:inline-block}ul li a{border-radius:50%;color:#000;height:1.5em;left:-1.5em;line-height:1.5em;text-align:center;text-decoration:none;width:1.5em}a:hover{color:var(--rh-color-interactive-blue-darkest, #004080)}a:visited{color:var(--rh-color-interactive-purple-darker, #6753ac)}.dark a{color:var(--rh-color-interactive-blue-lighter, #73bcf7)}ul li a:active{top:1px}.dark a:hover{color:var(--rh-color-interactive-blue-lightest, #bee1f4)}.dark a:visited{color:var(--rh-color-interactive-purple-lighter, #a18fff)}ul li{border-bottom-left-radius:.75em;border-top-left-radius:.75em;margin:2px 0;position:relative}#config-table li,#nodes-table li,ul{list-style:none}rh-accordion-header rh-tag{margin-inline-start:var(--rh-space-md, 8px)}.tag-header,header,progress{display:flex;align-items:center}.tag-header{gap:var(--rh-space-lg, 16px)}tblack{font-size:17px}input.larger-checkbox{width:17px;height:17px}ul{padding-left:1.75em}svg{pointer-events:none}ul li a.minus{animation-name:anim-minus;animation-duration:.1s;animation-fill-mode:forwards}ul li span{margin:.25em .5em}.top-right{font-size:small;position:fixed;right:1em;top:1em}div.mb-3{display:grid;grid-template-areas:"inputs-header filters-header outputs-header""inputs filters outputs";gap:10px;margin-left:auto;margin-right:0;margin-top:10px}#inputs{grid-area:inputs}#filters{grid-area:filters;gap:5px}#outputs{grid-area:outputs;gap:10px}div.inputs-header{grid-area:inputs-header}div.filters-header{grid-area:filters-header;gap:5px}div.outputs-header{grid-area:outputs-header;gap:10px}header{background:var(--rh-color-surface-darkest, #151515);color:var(--rh-color-text-primary-on-dark, #fff);padding-inline:var(--rh-space-xl, 24px);gap:var(--rh-space-xl, 24px)}div.progress{height:20px;width:100%;grid-area:progress}rh-tabs{min-height:1200px}rh-footer-universal{grid-area:footer;margin-block-start:auto}div.float-right{float:right}.flow-column,.flow-row{display:flex;flex-direction:column;justify-content:flex-start}.flow-row{flex-direction:row;gap:var(--rh-space-xl, 24px)}#mandatory-checkbox,#optional-checkbox{width:20px;margin-right:0;margin-left:auto}.read-only{pointer-events:none;opacity:.5}.test-header{font-size:25px;line-height:25px;font-weight:400}.test-section{font-size:20px;line-height:20px;font-weight:700}.test-subsection{font-size:15px;line-height:15px;font-weight:700}</style>
59+
<link rel="stylesheet"
60+
href="https://ux.redhat.com/assets/packages/@rhds/elements/elements/rh-table/rh-table-lightdom.css"> <style>@keyframes anim-minus{to{transform:rotate(90deg)}}body,html{font-family:var(--rh-font-family-body-text, RedHatText, "Red Hat Text", "Noto Sans Arabic", "Noto Sans Hebrew", Helvetica, Arial, sans-serif);margin:0;padding:0;height:100%}progress{height:20px;width:0%}h1{font-size:var(--rh-font-size-heading-2xl, 3rem);margin:0}datalist,main{display:flex;flex-direction:column}main{grid-area:main;margin:var(--rh-space-xl, 10px);gap:var(--rh-space-lg, 16px);flex-flow:row wrap;margin-block:10px;margin-inline:20px}[data-demo],form{display:contents}fieldset{display:grid;flex:1 1 100%}label{font-weight:var(--rh-font-weight-heading-bold, 700);margin-block-end:var(--rh-space-sm, 6px)}body{color:var(--rh-color-text-primary-on-light, #151515);background-color:var(--rh-color-surface-lightest, #fff);display:grid;grid-template-areas:"header""progress""main""footer"}body.dark{color:var(--rh-color-text-primary-on-dark, #fff);background-color:var(--rh-color-surface-darkest, #151515)}section{padding:16px}form h2,rh-tabs{width:100%}form output{text-transform:capitalize}datalist{justify-content:space-between;writing-mode:vertical-lr}datalist,input{width:200px}option{padding:0}a{color:var(--rh-color-interactive-blue-darker, #06c)}input[type=checkbox],label,ul li a,ul li span{display:inline-block}ul li a{border-radius:50%;color:#000;height:1.5em;left:-1.5em;line-height:1.5em;text-align:center;text-decoration:none;width:1.5em}a:hover{color:var(--rh-color-interactive-blue-darkest, #004080)}a:visited{color:var(--rh-color-interactive-purple-darker, #6753ac)}.dark a{color:var(--rh-color-interactive-blue-lighter, #73bcf7)}ul li a:active{top:1px}.dark a:hover{color:var(--rh-color-interactive-blue-lightest, #bee1f4)}.dark a:visited{color:var(--rh-color-interactive-purple-lighter, #a18fff)}ul li{border-bottom-left-radius:.75em;border-top-left-radius:.75em;margin:2px 0;position:relative}#config-table li,#nodes-table li,ul{list-style:none}rh-accordion-header rh-tag{margin-inline-start:var(--rh-space-md, 8px)}.tag-header,header,progress{display:flex;align-items:center}.tag-header{gap:var(--rh-space-lg, 16px)}tblack{font-size:17px}input.larger-checkbox{width:17px;height:17px}ul{padding-left:1.75em}svg{pointer-events:none}ul li a.minus{animation-name:anim-minus;animation-duration:.1s;animation-fill-mode:forwards}ul li span{margin:.25em .5em}.top-right{font-size:small;position:fixed;right:1em;top:1em}div.mb-3{display:grid;grid-template-areas:"inputs-header filters-header outputs-header""inputs filters outputs";gap:10px;margin-left:auto;margin-right:0;margin-top:10px}#inputs{grid-area:inputs}#filters{grid-area:filters;gap:5px}#outputs{grid-area:outputs;gap:10px}div.inputs-header{grid-area:inputs-header}div.filters-header{grid-area:filters-header;gap:5px}div.outputs-header{grid-area:outputs-header;gap:10px}header{background:var(--rh-color-surface-darkest, #151515);color:var(--rh-color-text-primary-on-dark, #fff);padding-inline:var(--rh-space-xl, 24px);gap:var(--rh-space-xl, 24px)}div.progress{height:20px;width:100%;grid-area:progress}rh-tabs{min-height:1200px}rh-footer-universal{grid-area:footer;margin-block-start:auto}div.float-right{float:right}.flow-column,.flow-row{display:flex;flex-direction:column;justify-content:flex-start}.flow-row{flex-direction:row;gap:var(--rh-space-xl, 24px)}#mandatory-checkbox,#optional-checkbox{width:20px;margin-right:0;margin-left:auto}.read-only{pointer-events:none;opacity:.5}.test-header{font-size:25px;line-height:25px;font-weight:400}.test-section{font-size:20px;line-height:20px;font-weight:700}.test-subsection{font-size:15px;line-height:15px;font-weight:700}</style>
6061
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dayjs.min.js" integrity="sha256-NTsR4SOm3YHfJrmrmvBtEYqfQ6jQ5yvEKMhgQe3DIl0=" crossorigin="anonymous"></script>
6162
<script src="https://cdn.jsdelivr.net/npm/[email protected]/plugin/duration.min.js" integrity="sha256-6rug74IKp6v/8WINJxMw33zXo8NVOdRw/5Ib21ZzwU4=" crossorigin="anonymous"></script>
6263
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.0/jquery.min.js" integrity="sha256-2Pmvv0kuTBOenSvLm6bvfBSSHrUJ+3A7x6P5Ebd07/g=" crossorigin="anonymous"></script>

0 commit comments

Comments
 (0)