From 0190b161c849f3e0889137d2d531dc6b8b2a71d8 Mon Sep 17 00:00:00 2001 From: navaneethsnair1 Date: Wed, 18 Sep 2024 17:12:05 +0530 Subject: [PATCH 1/3] address issues associated with guides in singlepane --- src/main/content/_assets/css/guide-common.scss | 16 ++++++++++++++++ .../content/_assets/css/guide-multipane.scss | 9 +++++++++ src/main/content/_assets/js/guide-common.js | 1 + 3 files changed, 26 insertions(+) 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 92a0b1979..d8590ff50 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/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"); } From 4bc8707f0ed6836cb74ac8655edc6c4c99599f51 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/guide-common.scss | 16 ---------------- .../content/_assets/css/guide-multipane.scss | 9 --------- src/main/content/_assets/js/guide-common.js | 1 - 3 files changed, 26 deletions(-) diff --git a/src/main/content/_assets/css/guide-common.scss b/src/main/content/_assets/css/guide-common.scss index f5ea267e9..d1af84a2d 100644 --- a/src/main/content/_assets/css/guide-common.scss +++ b/src/main/content/_assets/css/guide-common.scss @@ -512,14 +512,6 @@ #guide_content .code_command > .code_block_wrapper:before { display: none; } - - .view_code{ - display: block; - } - - .code_command pre{ - cursor:text; - } } @media (min-width: 1170px) { @@ -527,14 +519,6 @@ 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 d8590ff50..92a0b1979 100644 --- a/src/main/content/_assets/css/guide-multipane.scss +++ b/src/main/content/_assets/css/guide-multipane.scss @@ -324,15 +324,6 @@ 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/js/guide-common.js b/src/main/content/_assets/js/guide-common.js index 6e2405273..594a3f37c 100644 --- a/src/main/content/_assets/js/guide-common.js +++ b/src/main/content/_assets/js/guide-common.js @@ -488,7 +488,6 @@ $(document).ready(function () { }); $(window).on("resize", function () { - (inSingleColumnView()) ? $(".code_command").removeClass("hotspot") : $(".code_command").addClass("hotspot"); if (!inSingleColumnView()){ $("#code_column").css("top", "0px"); } From efa101877b18ffe78232c6a256f8dd138f8c694b Mon Sep 17 00:00:00 2001 From: navaneethsnair1 Date: Fri, 25 Apr 2025 13:45:25 +0530 Subject: [PATCH 3/3] removing old analytics references --- scripts/build/antora_build_docs.sh | 3 --- scripts/build/jekyll.sh | 2 +- src/main/content/_google_analytics.yml | 1 - src/main/content/_includes/google_tag_manager_head.html | 7 ------- src/main/content/_includes/head.html | 4 ---- .../antora_ui/src/partials/google_tag_manager_head.hbs | 7 ------- src/main/content/antora_ui/src/partials/head-scripts.hbs | 3 --- 7 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 src/main/content/_google_analytics.yml delete mode 100644 src/main/content/_includes/google_tag_manager_head.html delete mode 100644 src/main/content/antora_ui/src/partials/google_tag_manager_head.hbs diff --git a/scripts/build/antora_build_docs.sh b/scripts/build/antora_build_docs.sh index b5a12d813..54a1102da 100755 --- a/scripts/build/antora_build_docs.sh +++ b/scripts/build/antora_build_docs.sh @@ -4,8 +4,5 @@ echo "npm analysis antora_build" npm ls -g --depth=0 if [ "$PROD_SITE" = true ] then - # Enable google analytics in docs - antora --fetch --stacktrace --key google-analytics=G-PXYTWCYE18 src/main/content/docs/antora-playbook.yml - else antora --fetch --stacktrace src/main/content/docs/antora-playbook.yml fi diff --git a/scripts/build/jekyll.sh b/scripts/build/jekyll.sh index e388831ac..6aaed7dee 100755 --- a/scripts/build/jekyll.sh +++ b/scripts/build/jekyll.sh @@ -80,7 +80,7 @@ mkdir -p target/jekyll-webapp # Enable google analytics if ga is true if [ "$PROD_SITE" = true ] then - jekyll build --source src/main/content --config src/main/content/_config.yml,src/main/content/_google_analytics.yml --destination target/jekyll-webapp + jekyll build --source src/main/content --config src/main/content/_config.yml --destination target/jekyll-webapp else # Set the --future flag to show blogs with date timestamps in the future jekyll build --future --source src/main/content --config src/main/content/_config.yml --destination target/jekyll-webapp diff --git a/src/main/content/_google_analytics.yml b/src/main/content/_google_analytics.yml deleted file mode 100644 index fe71b0ee9..000000000 --- a/src/main/content/_google_analytics.yml +++ /dev/null @@ -1 +0,0 @@ -google_tag_manager: G-PXYTWCYE18 \ No newline at end of file diff --git a/src/main/content/_includes/google_tag_manager_head.html b/src/main/content/_includes/google_tag_manager_head.html deleted file mode 100644 index abefdaa6c..000000000 --- a/src/main/content/_includes/google_tag_manager_head.html +++ /dev/null @@ -1,7 +0,0 @@ - - diff --git a/src/main/content/_includes/head.html b/src/main/content/_includes/head.html index 957c382c7..8016304dc 100644 --- a/src/main/content/_includes/head.html +++ b/src/main/content/_includes/head.html @@ -56,10 +56,6 @@ {% css {{css_name}} %} {% endfor %} - {% if jekyll.environment == 'production' and site.google_tag_manager %} - {% include google_tag_manager_head.html %} - {% endif %} - diff --git a/src/main/content/antora_ui/src/partials/google_tag_manager_head.hbs b/src/main/content/antora_ui/src/partials/google_tag_manager_head.hbs deleted file mode 100644 index 594a2810e..000000000 --- a/src/main/content/antora_ui/src/partials/google_tag_manager_head.hbs +++ /dev/null @@ -1,7 +0,0 @@ - - \ No newline at end of file diff --git a/src/main/content/antora_ui/src/partials/head-scripts.hbs b/src/main/content/antora_ui/src/partials/head-scripts.hbs index 97a634fe9..af1d8c1e5 100644 --- a/src/main/content/antora_ui/src/partials/head-scripts.hbs +++ b/src/main/content/antora_ui/src/partials/head-scripts.hbs @@ -1,6 +1,3 @@ - {{#if site.keys.googleAnalytics }} - {{> google_tag_manager_head }} - {{/if}}