From f16fca0289ab42a687be0b509133fc6b7d79fa60 Mon Sep 17 00:00:00 2001 From: navaneethsnair1 Date: Fri, 15 Nov 2024 15:57:02 +0530 Subject: [PATCH 1/3] resolving font-weights bug --- scripts/build/javadoc_modify.sh | 51 +++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/scripts/build/javadoc_modify.sh b/scripts/build/javadoc_modify.sh index da4ff41ae..5ee98dd8d 100755 --- a/scripts/build/javadoc_modify.sh +++ b/scripts/build/javadoc_modify.sh @@ -8,6 +8,23 @@ modifyStylesheet () { font-family: "Asap"; font-style: normal; font-stretch: 100%; + font-weight:300; + src: url("../../../../fonts/Asap.woff2"); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; + } + @font-face { + font-family: "Asap"; + font-style: normal; + font-stretch: 100%; + font-weight:400; + src: url("../../../../fonts/Asap.woff2"); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; + } + @font-face { + font-family: "Asap"; + font-style: normal; + font-stretch: 100%; + font-weight:500; src: url("../../../../fonts/Asap.woff2"); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; }' | cat - "$1" > newstylesheet.css @@ -24,6 +41,23 @@ modifyStylesheetFrameless () { font-family: "Asap"; font-style: normal; font-stretch: 100%; + font-weight:300; + src: url("../../../../fonts/Asap.woff2"); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; + } + @font-face { + font-family: "Asap"; + font-style: normal; + font-stretch: 100%; + font-weight:400; + src: url("../../../../fonts/Asap.woff2"); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; + } + @font-face { + font-family: "Asap"; + font-style: normal; + font-stretch: 100%; + font-weight:500; src: url("../../../../fonts/Asap.woff2"); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; }' | cat - "$1" > newstylesheet.css @@ -40,6 +74,23 @@ modifyStylesheetFramelessSPIAPI () { font-family: "Asap"; font-style: normal; font-stretch: 100%; + font-weight:300; + src: url("../../../../../fonts/Asap.woff2"); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; + } + @font-face { + font-family: "Asap"; + font-style: normal; + font-stretch: 100%; + font-weight:400; + src: url("../../../../../fonts/Asap.woff2"); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; + } + @font-face { + font-family: "Asap"; + font-style: normal; + font-stretch: 100%; + font-weight:500; src: url("../../../../../fonts/Asap.woff2"); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; }' | cat - "$1" > newstylesheet.css From dfaaaf774c6ad9f8d87da2e37ac9bd9a18dc3c91 Mon Sep 17 00:00:00 2001 From: JavierABarreto Date: Tue, 19 Nov 2024 09:54:39 -0600 Subject: [PATCH 2/3] rebasing prod --- src/main/content/_assets/css/openliberty.scss | 4 ++-- src/main/content/_includes/footer.html | 4 +++- src/main/content/antora_ui/src/partials/footer-content.hbs | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/content/_assets/css/openliberty.scss b/src/main/content/_assets/css/openliberty.scss index dc507e305..d53dbad6e 100644 --- a/src/main/content/_assets/css/openliberty.scss +++ b/src/main/content/_assets/css/openliberty.scss @@ -556,7 +556,7 @@ footer { float: left; } - #footer_support_link, #footer_blog_link { + #footer_support_link, #footer_blog_link, #footer_docs_link, #footer_guides_link { margin-left: 28px; } @@ -584,7 +584,7 @@ footer { } -@media (max-width: 767.98px) { +@media (max-width: 910px) { #footer_gray_background { height: 131px; } diff --git a/src/main/content/_includes/footer.html b/src/main/content/_includes/footer.html index a9f8621e5..8c8e9d0c3 100644 --- a/src/main/content/_includes/footer.html +++ b/src/main/content/_includes/footer.html @@ -31,9 +31,11 @@ {% t footer.logos %} 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 5b4bd20e1..8d74b77f7 100644 --- a/src/main/content/antora_ui/src/partials/footer-content.hbs +++ b/src/main/content/antora_ui/src/partials/footer-content.hbs @@ -25,10 +25,11 @@ Logos From 259cebf4a16b053e00dbba77686557c9a203a8e5 Mon Sep 17 00:00:00 2001 From: JavierABarreto Date: Thu, 21 Nov 2024 11:36:15 -0600 Subject: [PATCH 3/3] add closer div that was accidentally deleted --- src/main/content/antora_ui/src/partials/footer-content.hbs | 1 + 1 file changed, 1 insertion(+) 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 8d74b77f7..70f79fd56 100644 --- a/src/main/content/antora_ui/src/partials/footer-content.hbs +++ b/src/main/content/antora_ui/src/partials/footer-content.hbs @@ -30,6 +30,7 @@ Docs Support Blog +