You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by pa...@apache.org on 2022/04/29 20:18:15 UTC

[beam] branch master updated: Revert "Merge pull request #17260 from [BEAM-13229] [Website] bug side nav"

This is an automated email from the ASF dual-hosted git repository.

pabloem pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new ac6909b5055 Revert "Merge pull request #17260 from [BEAM-13229] [Website] bug side nav"
     new e6aae7030ca Merge pull request #17503 from Revert "[BEAM-13229] [Website] bug side nav"
ac6909b5055 is described below

commit ac6909b5055d74eac01dc2150fdbd366dc99bd2d
Author: bullet03 <bu...@akvelon.com>
AuthorDate: Fri Apr 29 13:46:31 2022 +0600

    Revert "Merge pull request #17260 from [BEAM-13229] [Website] bug side nav"
    
    This reverts commit c25c769c840784b576c0d7addac76eb23695d767.
---
 website/www/site/assets/js/language-switch-v2.js          | 3 ---
 website/www/site/layouts/community/baseof.html            | 3 +--
 website/www/site/layouts/contribute/arrow_template.html   | 3 +--
 website/www/site/layouts/contribute/baseof.html           | 3 +--
 website/www/site/layouts/documentation/baseof.html        | 3 +--
 website/www/site/layouts/get-started/baseof.html          | 3 +--
 website/www/site/layouts/languages/baseof.html            | 4 ++--
 website/www/site/layouts/roadmap/baseof.html              | 3 +--
 website/www/site/layouts/runners/arrow_template.html      | 3 +--
 website/www/site/layouts/runners/baseof.html              | 3 +--
 website/www/site/layouts/runners/capability-template.html | 3 +--
 website/www/site/layouts/security/baseof.html             | 3 +--
 12 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/website/www/site/assets/js/language-switch-v2.js b/website/www/site/assets/js/language-switch-v2.js
index fc1decb9178..a0ec6488c12 100644
--- a/website/www/site/assets/js/language-switch-v2.js
+++ b/website/www/site/assets/js/language-switch-v2.js
@@ -127,9 +127,6 @@ $(document).ready(function() {
                 // make sure that runner and shell snippets are still visible after changing language
                 $("code"+this.selector).show();
                 $("." + pref).show();
-
-                // Fix nav-menu bug with jumping between links when switching tabs
-                $('[data-spy="scroll"]').scrollspy('refresh');
             },
             "render": function(wrapper) {
                 this.addTabs();
diff --git a/website/www/site/layouts/community/baseof.html b/website/www/site/layouts/community/baseof.html
index 26937c834ac..f6b0664dd3d 100644
--- a/website/www/site/layouts/community/baseof.html
+++ b/website/www/site/layouts/community/baseof.html
@@ -15,8 +15,7 @@
  <head>
    {{ partial "head.html" . }}
  </head>
- <!--to activate an element via bootstrap's scrollspy library in the visible area, you need to scroll it by 10px relative to the browser window, so data-offset="10"-->
- <body class="body" data-spy="scroll" data-target=".page-nav" data-offset="10">
+ <body class="body" data-spy="scroll" data-target=".page-nav" data-offset="0">
    {{ partial "header.html" . }}
    <div class="clearfix container-main-content">
      <div class="section-nav closed" data-offset-top="90" data-offset-bottom="500">
diff --git a/website/www/site/layouts/contribute/arrow_template.html b/website/www/site/layouts/contribute/arrow_template.html
index 2652b53884e..45b6431b872 100644
--- a/website/www/site/layouts/contribute/arrow_template.html
+++ b/website/www/site/layouts/contribute/arrow_template.html
@@ -15,8 +15,7 @@
 <head>
   {{ partial "head.html" . }}
 </head>
-<!--to activate an element via bootstrap's scrollspy library in the visible area, you need to scroll it by 10px relative to the browser window, so data-offset="10"-->
-<body class="body" data-spy="scroll" data-target=".page-nav" data-offset="10">
+<body class="body" data-spy="scroll" data-target=".page-nav" data-offset="0">
   {{ partial "header.html" . }}
   <div class="clearfix container-main-content">
     <div class="section-nav closed" data-offset-top="90" data-offset-bottom="500">
diff --git a/website/www/site/layouts/contribute/baseof.html b/website/www/site/layouts/contribute/baseof.html
index 420c5996b80..b07f0ea7331 100644
--- a/website/www/site/layouts/contribute/baseof.html
+++ b/website/www/site/layouts/contribute/baseof.html
@@ -15,8 +15,7 @@
 <head>
   {{ partial "head.html" . }}
 </head>
-<!--to activate an element via bootstrap's scrollspy library in the visible area, you need to scroll it by 10px relative to the browser window, so data-offset="10"-->
-<body class="body" data-spy="scroll" data-target=".page-nav" data-offset="10">
+<body class="body" data-spy="scroll" data-target=".page-nav" data-offset="0">
   {{ partial "header.html" . }}
   <div class="clearfix container-main-content">
     <div class="section-nav closed" data-offset-top="90" data-offset-bottom="500">
diff --git a/website/www/site/layouts/documentation/baseof.html b/website/www/site/layouts/documentation/baseof.html
index 6621914e6f9..9568c5fde3d 100644
--- a/website/www/site/layouts/documentation/baseof.html
+++ b/website/www/site/layouts/documentation/baseof.html
@@ -15,8 +15,7 @@
 <head>
   {{ partial "head.html" . }}
 </head>
-<!--to activate an element via bootstrap's scrollspy library in the visible area, you need to scroll it by 10px relative to the browser window, so data-offset="10"-->
-<body class="body" data-spy="scroll" data-target=".page-nav" data-offset="10">
+<body class="body" data-spy="scroll" data-target=".page-nav" data-offset="0">
   {{ partial "header.html" . }}
   <div class="clearfix container-main-content">
     <div class="section-nav closed" data-offset-top="90" data-offset-bottom="500">
diff --git a/website/www/site/layouts/get-started/baseof.html b/website/www/site/layouts/get-started/baseof.html
index b8464b62684..99025b37928 100644
--- a/website/www/site/layouts/get-started/baseof.html
+++ b/website/www/site/layouts/get-started/baseof.html
@@ -15,8 +15,7 @@
 <head>
   {{ partial "head.html" . }}
 </head>
-<!--to activate an element via bootstrap's scrollspy library in the visible area, you need to scroll it by 10px relative to the browser window, so data-offset="10"-->
-<body class="body" data-spy="scroll" data-target=".page-nav" data-offset="10">
+<body class="body" data-spy="scroll" data-target=".page-nav" data-offset="0">
   {{ partial "header.html" . }}
   <div class="clearfix container-main-content">
     <div class="section-nav closed" data-offset-top="90" data-offset-bottom="500">
diff --git a/website/www/site/layouts/languages/baseof.html b/website/www/site/layouts/languages/baseof.html
index 65326519cb3..a7fe4a04c8f 100644
--- a/website/www/site/layouts/languages/baseof.html
+++ b/website/www/site/layouts/languages/baseof.html
@@ -15,8 +15,7 @@
  <head>
    {{ partial "head.html" . }}
  </head>
- <!--to activate an element via bootstrap's scrollspy library in the visible area, you need to scroll it by 10px relative to the browser window, so data-offset="10"-->
- <body class="body" data-spy="scroll" data-target=".page-nav" data-offset="10">
+ <body class="body" data-spy="scroll" data-target=".page-nav" data-offset="0">
    {{ partial "header.html" . }}
    <div class="clearfix container-main-content">
      <div class="section-nav closed" data-offset-top="90" data-offset-bottom="500">
@@ -39,3 +38,4 @@
  {{ partial "footer.html" . }}
  </body>
  </html>
+ 
\ No newline at end of file
diff --git a/website/www/site/layouts/roadmap/baseof.html b/website/www/site/layouts/roadmap/baseof.html
index 7a4e47ff507..3927bd11880 100644
--- a/website/www/site/layouts/roadmap/baseof.html
+++ b/website/www/site/layouts/roadmap/baseof.html
@@ -15,8 +15,7 @@
 <head>
   {{ partial "head.html" . }}
 </head>
-<!--to activate an element via bootstrap's scrollspy library in the visible area, you need to scroll it by 10px relative to the browser window, so data-offset="10"-->
-<body class="body" data-spy="scroll" data-target=".page-nav" data-offset="10">
+<body class="body" data-spy="scroll" data-target=".page-nav" data-offset="0">
   {{ partial "header.html" . }}
   <div class="clearfix container-main-content">
     <div class="section-nav closed" data-offset-top="90" data-offset-bottom="500">
diff --git a/website/www/site/layouts/runners/arrow_template.html b/website/www/site/layouts/runners/arrow_template.html
index 541589d4762..1396a71863a 100644
--- a/website/www/site/layouts/runners/arrow_template.html
+++ b/website/www/site/layouts/runners/arrow_template.html
@@ -15,8 +15,7 @@
 <head>
   {{ partial "head.html" . }}
 </head>
-<!--to activate an element via bootstrap's scrollspy library in the visible area, you need to scroll it by 10px relative to the browser window, so data-offset="10"-->
-<body class="body" data-spy="scroll" data-target=".page-nav" data-offset="10">
+<body class="body" data-spy="scroll" data-target=".page-nav" data-offset="0">
   {{ partial "header.html" . }}
   <div class="clearfix container-main-content">
     <div class="section-nav closed" data-offset-top="90" data-offset-bottom="500">
diff --git a/website/www/site/layouts/runners/baseof.html b/website/www/site/layouts/runners/baseof.html
index b745cc61e17..9ca7ead7443 100644
--- a/website/www/site/layouts/runners/baseof.html
+++ b/website/www/site/layouts/runners/baseof.html
@@ -15,8 +15,7 @@
 <head>
   {{ partial "head.html" . }}
 </head>
-<!--to activate an element via bootstrap's scrollspy library in the visible area, you need to scroll it by 10px relative to the browser window, so data-offset="10"-->
-<body class="body" data-spy="scroll" data-target=".page-nav" data-offset="10">
+<body class="body" data-spy="scroll" data-target=".page-nav" data-offset="0">
   {{ partial "header.html" . }}
   <div class="clearfix container-main-content">
     <div class="section-nav closed" data-offset-top="90" data-offset-bottom="500">
diff --git a/website/www/site/layouts/runners/capability-template.html b/website/www/site/layouts/runners/capability-template.html
index 3ee2daad4ed..3efcf39129f 100644
--- a/website/www/site/layouts/runners/capability-template.html
+++ b/website/www/site/layouts/runners/capability-template.html
@@ -15,8 +15,7 @@
 <head>
   {{ partial "head.html" . }}
 </head>
-<!--to activate an element via bootstrap's scrollspy library in the visible area, you need to scroll it by 10px relative to the browser window, so data-offset="10"-->
-<body class="body" data-spy="scroll" data-target=".page-nav" data-offset="10">
+<body class="body" data-spy="scroll" data-target=".page-nav" data-offset="0">
   {{ partial "header.html" . }}
   <div class="clearfix container-main-content">
     {{ .Content }}
diff --git a/website/www/site/layouts/security/baseof.html b/website/www/site/layouts/security/baseof.html
index 482a85404e2..b6d2c5253e1 100644
--- a/website/www/site/layouts/security/baseof.html
+++ b/website/www/site/layouts/security/baseof.html
@@ -15,8 +15,7 @@
  <head>
    {{ partial "head.html" . }}
  </head>
- <!--to activate an element via bootstrap's scrollspy library in the visible area, you need to scroll it by 10px relative to the browser window, so data-offset="10"-->
- <body class="body" data-spy="scroll" data-target=".page-nav" data-offset="10">
+ <body class="body" data-spy="scroll" data-target=".page-nav" data-offset="0">
    {{ partial "header.html" . }}
    <div class="clearfix container-main-content">
      <div class="section-nav closed" data-offset-top="90" data-offset-bottom="500">