From 0d97024ec6fec868f120992be28d578ca0712b5b Mon Sep 17 00:00:00 2001 From: KN4CK3R Date: Fri, 23 Sep 2022 14:43:43 +0000 Subject: [PATCH 1/4] Do not add empty lines. --- modules/packages/container/metadata.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/packages/container/metadata.go b/modules/packages/container/metadata.go index 4222cdb30a781..fd38e67859915 100644 --- a/modules/packages/container/metadata.go +++ b/modules/packages/container/metadata.go @@ -95,7 +95,9 @@ func parseOCIImageConfig(r io.Reader) (*Metadata, error) { if i := strings.Index(cmd, "#(nop) "); i != -1 { cmd = strings.TrimSpace(cmd[i+7:]) } - imageLayers = append(imageLayers, cmd) + if cmd != "" { + imageLayers = append(imageLayers, cmd) + } } metadata := &Metadata{ From f70e4c7b8f2ea7729cef1c2135619cab238fd611 Mon Sep 17 00:00:00 2001 From: KN4CK3R Date: Fri, 23 Sep 2022 14:44:10 +0000 Subject: [PATCH 2/4] Remove id from table. --- templates/package/content/container.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/package/content/container.tmpl b/templates/package/content/container.tmpl index 939dfe40208ae..a4332cc6079d8 100644 --- a/templates/package/content/container.tmpl +++ b/templates/package/content/container.tmpl @@ -47,7 +47,7 @@ {{if .PackageDescriptor.Metadata.ImageLayers}}

{{.locale.Tr "packages.container.layers"}}

- +
{{range .PackageDescriptor.Metadata.ImageLayers}} @@ -61,7 +61,7 @@ {{if .PackageDescriptor.Metadata.Labels}}

{{.locale.Tr "packages.container.labels"}}

-
+
From a6d9af40a78289822c79ac6e866d5378195e8650 Mon Sep 17 00:00:00 2001 From: KN4CK3R Date: Mon, 26 Sep 2022 11:38:02 +0000 Subject: [PATCH 3/4] Fix column overflow. --- templates/package/content/container.tmpl | 2 +- web_src/less/_package.less | 3 +++ web_src/less/index.less | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 web_src/less/_package.less diff --git a/templates/package/content/container.tmpl b/templates/package/content/container.tmpl index a4332cc6079d8..a79963e732ba0 100644 --- a/templates/package/content/container.tmpl +++ b/templates/package/content/container.tmpl @@ -61,7 +61,7 @@ {{if .PackageDescriptor.Metadata.Labels}}

{{.locale.Tr "packages.container.labels"}}

-
{{.locale.Tr "packages.container.labels.key"}}
+
diff --git a/web_src/less/_package.less b/web_src/less/_package.less new file mode 100644 index 0000000000000..089d09f492414 --- /dev/null +++ b/web_src/less/_package.less @@ -0,0 +1,3 @@ +.container-labels td:nth-child(2) { + word-break: break-word; +} diff --git a/web_src/less/index.less b/web_src/less/index.less index 4823c56173389..2d670ac2d5d34 100644 --- a/web_src/less/index.less +++ b/web_src/less/index.less @@ -35,5 +35,6 @@ @import "_admin"; @import "_explore"; @import "_review"; +@import "_package"; @import "./helpers.less"; From 4d1f26f7470cd83c10360e808361ad4a92cb6cf0 Mon Sep 17 00:00:00 2001 From: KN4CK3R Date: Mon, 26 Sep 2022 17:18:33 +0000 Subject: [PATCH 4/4] Update styles. --- web_src/less/_package.less | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/web_src/less/_package.less b/web_src/less/_package.less index 089d09f492414..f4a07a1889961 100644 --- a/web_src/less/_package.less +++ b/web_src/less/_package.less @@ -1,3 +1,9 @@ -.container-labels td:nth-child(2) { - word-break: break-word; +.container-labels { + td:nth-child(1) { + vertical-align: top; + } + + td:nth-child(2) { + overflow-wrap: anywhere; + } }
{{.locale.Tr "packages.container.labels.key"}}