diff --git a/docker/Dockerfile.demo b/docker/Dockerfile.demo index d2503225d..db0f2a3e3 100644 --- a/docker/Dockerfile.demo +++ b/docker/Dockerfile.demo @@ -49,7 +49,7 @@ RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded # # # -FROM icr.io/appcafe/open-liberty:24.0.0.11-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:24.0.0.12-kernel-slim-java8-openj9-ubi as runtime ENV SEC_TLS_TRUSTDEFAULTCERTS true COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml diff --git a/docker/Dockerfile.draft b/docker/Dockerfile.draft index c3d95206a..188e6d37e 100644 --- a/docker/Dockerfile.draft +++ b/docker/Dockerfile.draft @@ -50,7 +50,7 @@ RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded # # # -FROM icr.io/appcafe/open-liberty:24.0.0.11-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:24.0.0.12-kernel-slim-java8-openj9-ubi as runtime ENV SEC_TLS_TRUSTDEFAULTCERTS true COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml diff --git a/docker/Dockerfile.prod b/docker/Dockerfile.prod index 271d3ac23..f57084725 100644 --- a/docker/Dockerfile.prod +++ b/docker/Dockerfile.prod @@ -68,7 +68,7 @@ COPY --from=docs --chown=1001:0 /temp-docs/docs /target/openliberty-website-1.0- # # # -FROM icr.io/appcafe/open-liberty:24.0.0.11-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:24.0.0.12-kernel-slim-java8-openj9-ubi as runtime ENV SEC_TLS_TRUSTDEFAULTCERTS true COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml diff --git a/docker/Dockerfile.staging b/docker/Dockerfile.staging index 6f4ec5815..5416f0eb3 100644 --- a/docker/Dockerfile.staging +++ b/docker/Dockerfile.staging @@ -65,7 +65,7 @@ COPY --from=docs --chown=1001:0 /temp-docs/docs /target/openliberty-website-1.0- # # # -FROM icr.io/appcafe/open-liberty:24.0.0.11-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:24.0.0.12-kernel-slim-java8-openj9-ubi as runtime ENV SEC_TLS_TRUSTDEFAULTCERTS true COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml diff --git a/docker/blogs/Dockerfile.blogs.draft b/docker/blogs/Dockerfile.blogs.draft index 94efa9920..61d46614d 100644 --- a/docker/blogs/Dockerfile.blogs.draft +++ b/docker/blogs/Dockerfile.blogs.draft @@ -42,7 +42,7 @@ RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded # # # -FROM icr.io/appcafe/open-liberty:24.0.0.11-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:24.0.0.12-kernel-slim-java8-openj9-ubi as runtime ENV SEC_TLS_TRUSTDEFAULTCERTS true COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml diff --git a/docker/blogs/Dockerfile.blogs.staging b/docker/blogs/Dockerfile.blogs.staging index 16a01f0f3..9bc523b41 100644 --- a/docker/blogs/Dockerfile.blogs.staging +++ b/docker/blogs/Dockerfile.blogs.staging @@ -42,7 +42,7 @@ RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded # # # -FROM icr.io/appcafe/open-liberty:24.0.0.11-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:24.0.0.12-kernel-slim-java8-openj9-ubi as runtime ENV SEC_TLS_TRUSTDEFAULTCERTS true COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml diff --git a/docker/certifications/Dockerfile.certifications.draft b/docker/certifications/Dockerfile.certifications.draft index ff90e0443..b8fef5751 100644 --- a/docker/certifications/Dockerfile.certifications.draft +++ b/docker/certifications/Dockerfile.certifications.draft @@ -42,7 +42,7 @@ RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded # # # -FROM icr.io/appcafe/open-liberty:24.0.0.11-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:24.0.0.12-kernel-slim-java8-openj9-ubi as runtime ENV SEC_TLS_TRUSTDEFAULTCERTS true COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml diff --git a/docker/certifications/Dockerfile.certifications.staging b/docker/certifications/Dockerfile.certifications.staging index 6ca7a734f..d62919259 100644 --- a/docker/certifications/Dockerfile.certifications.staging +++ b/docker/certifications/Dockerfile.certifications.staging @@ -42,7 +42,7 @@ RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded # # # -FROM icr.io/appcafe/open-liberty:24.0.0.11-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:24.0.0.12-kernel-slim-java8-openj9-ubi as runtime ENV SEC_TLS_TRUSTDEFAULTCERTS true COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml diff --git a/docker/docs/Dockerfile.docs.draft b/docker/docs/Dockerfile.docs.draft index f66fde5b0..6262c925a 100644 --- a/docker/docs/Dockerfile.docs.draft +++ b/docker/docs/Dockerfile.docs.draft @@ -54,7 +54,7 @@ RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded # # # -FROM icr.io/appcafe/open-liberty:24.0.0.11-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:24.0.0.12-kernel-slim-java8-openj9-ubi as runtime ENV SEC_TLS_TRUSTDEFAULTCERTS true COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml diff --git a/docker/docs/Dockerfile.docs.staging b/docker/docs/Dockerfile.docs.staging index d1568ca5b..c674523d2 100644 --- a/docker/docs/Dockerfile.docs.staging +++ b/docker/docs/Dockerfile.docs.staging @@ -54,7 +54,7 @@ RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded # # # -FROM icr.io/appcafe/open-liberty:24.0.0.11-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:24.0.0.12-kernel-slim-java8-openj9-ubi as runtime ENV SEC_TLS_TRUSTDEFAULTCERTS true COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml diff --git a/docker/guides/Dockerfile.guides.draft b/docker/guides/Dockerfile.guides.draft index df5c259ee..59bb7252b 100644 --- a/docker/guides/Dockerfile.guides.draft +++ b/docker/guides/Dockerfile.guides.draft @@ -42,7 +42,7 @@ RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded # # # -FROM icr.io/appcafe/open-liberty:24.0.0.11-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:24.0.0.12-kernel-slim-java8-openj9-ubi as runtime ENV SEC_TLS_TRUSTDEFAULTCERTS true COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml diff --git a/docker/guides/Dockerfile.guides.staging b/docker/guides/Dockerfile.guides.staging index e1f9c2ec6..cd0572374 100644 --- a/docker/guides/Dockerfile.guides.staging +++ b/docker/guides/Dockerfile.guides.staging @@ -42,7 +42,7 @@ RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded # # # -FROM icr.io/appcafe/open-liberty:24.0.0.11-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:24.0.0.12-kernel-slim-java8-openj9-ubi as runtime ENV SEC_TLS_TRUSTDEFAULTCERTS true COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml diff --git a/docker/ui-only/Dockerfile.ui-only b/docker/ui-only/Dockerfile.ui-only index 2050ad4a4..bf1d5ccc7 100644 --- a/docker/ui-only/Dockerfile.ui-only +++ b/docker/ui-only/Dockerfile.ui-only @@ -41,7 +41,7 @@ RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded # # # -FROM icr.io/appcafe/open-liberty:24.0.0.11-kernel-slim-java8-openj9-ubi as runtime +FROM icr.io/appcafe/open-liberty:24.0.0.12-kernel-slim-java8-openj9-ubi as runtime ENV SEC_TLS_TRUSTDEFAULTCERTS true COPY --chown=1001:0 src/main/wlp/server.xml /config/server.xml diff --git a/src/main/content/_assets/css/guide-common.scss b/src/main/content/_assets/css/guide-common.scss index d1af84a2d..f5ea267e9 100644 --- a/src/main/content/_assets/css/guide-common.scss +++ b/src/main/content/_assets/css/guide-common.scss @@ -512,6 +512,14 @@ #guide_content .code_command > .code_block_wrapper:before { display: none; } + + .view_code{ + display: block; + } + + .code_command pre{ + cursor:text; + } } @media (min-width: 1170px) { @@ -519,6 +527,14 @@ background-image: inherit; margin-bottom: 0; } + + .view_code{ + display: none; + } + + .code_command pre{ + cursor:pointer; + } } @media (min-width: 1440px) { diff --git a/src/main/content/_assets/css/guide-multipane.scss b/src/main/content/_assets/css/guide-multipane.scss index 75e53bda2..230bfe2e6 100644 --- a/src/main/content/_assets/css/guide-multipane.scss +++ b/src/main/content/_assets/css/guide-multipane.scss @@ -324,6 +324,15 @@ body { } } +@media (max-width: 1169.98px){ + .copyFileButton{ + right: 40px; + &:hover { + right: 39px; + } + } +} + .CodeRay .line-numbers { display: inline-block; visibility: hidden; diff --git a/src/main/content/_assets/css/openliberty.scss b/src/main/content/_assets/css/openliberty.scss index a51064f2d..76117a788 100644 --- a/src/main/content/_assets/css/openliberty.scss +++ b/src/main/content/_assets/css/openliberty.scss @@ -559,8 +559,6 @@ footer { #footer_support_link, #footer_blog_link, #footer_docs_link, #footer_guides_link { margin-left: 28px; } - - } @media (max-width: 991.98px) { @@ -577,11 +575,6 @@ footer { font-size: 14px; float: right; } - - #footer_support_link, #footer_blog_link { - margin-left: 28px; - } - } @media (max-width: 910px) { diff --git a/src/main/content/_assets/js/guide-common.js b/src/main/content/_assets/js/guide-common.js index 594a3f37c..6e2405273 100644 --- a/src/main/content/_assets/js/guide-common.js +++ b/src/main/content/_assets/js/guide-common.js @@ -488,6 +488,7 @@ $(document).ready(function () { }); $(window).on("resize", function () { + (inSingleColumnView()) ? $(".code_command").removeClass("hotspot") : $(".code_command").addClass("hotspot"); if (!inSingleColumnView()){ $("#code_column").css("top", "0px"); } diff --git a/src/main/content/antora_ui/src/partials/footer-content.hbs b/src/main/content/antora_ui/src/partials/footer-content.hbs index c46d348dc..bf381f2a9 100644 --- a/src/main/content/antora_ui/src/partials/footer-content.hbs +++ b/src/main/content/antora_ui/src/partials/footer-content.hbs @@ -28,7 +28,7 @@ Get Started Guides Docs - Support + Support Blog diff --git a/src/main/content/antora_ui/src/sass/openliberty.scss b/src/main/content/antora_ui/src/sass/openliberty.scss index efda4a08d..b8e5d4be5 100644 --- a/src/main/content/antora_ui/src/sass/openliberty.scss +++ b/src/main/content/antora_ui/src/sass/openliberty.scss @@ -521,11 +521,9 @@ footer { float: left; } - #footer_support_link, #footer_blog_link { + #footer_support_link, #footer_blog_link, #footer_docs_link, #footer_guides_link { margin-left: 28px; } - - } @media (max-width: 991.98px) { @@ -542,11 +540,6 @@ footer { font-size: 14px; float: right; } - - #footer_support_link, #footer_blog_link { - margin-left: 28px; - } - } @media (max-width: 767.98px) {