Merge pull request #551 from HenrikJannsen/revert-update-commits-as-it-broke-layout

Revert update commits as it broke layout

Author: HenrikJannsen

.ruby-version

@@ -1 +1 @@
-4.0.5
+3.3.5

Gemfile.lock

@@ -1,40 +1,37 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.9.0)
-      public_suffix (>= 2.0.2, < 8.0)
-    base64 (0.3.0)
-    bigdecimal (4.1.2)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
     colorator (1.1.0)
-    concurrent-ruby (1.3.6)
-    csv (3.3.5)
+    concurrent-ruby (1.3.4)
+    csv (3.3.0)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
     eventmachine (1.2.7-x64-mingw32)
-    ffi (1.17.4)
+    ffi (1.17.0)
     forwardable-extended (2.6.0)
-    google-protobuf (4.35.0)
+    google-protobuf (4.28.2)
       bigdecimal
-      rake (~> 13.3)
-    http_parser.rb (0.8.1)
-    i18n (1.14.8)
+      rake (>= 13)
+    http_parser.rb (0.8.0)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    jekyll (4.4.1)
+    jekyll (4.3.4)
       addressable (~> 2.4)
-      base64 (~> 0.2)
       colorator (~> 1.0)
-      csv (~> 3.0)
       em-websocket (~> 0.5)
       i18n (~> 1.0)
       jekyll-sass-converter (>= 2.0, < 4.0)
       jekyll-watch (~> 2.0)
-      json (~> 2.6)
       kramdown (~> 2.3, >= 2.3.1)
       kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (~> 0.3, >= 0.3.6)
+      mercenary (>= 0.3.6, < 0.5)
       pathutil (~> 0.9)
       rouge (>= 3.0, < 5.0)
       safe_yaml (~> 1.0)
@@ -45,42 +42,42 @@ GEM
     jekyll-paginate (1.1.0)
     jekyll-redirect-from (0.16.0)
       jekyll (>= 3.3, < 5.0)
-    jekyll-sass-converter (3.1.0)
-      sass-embedded (~> 1.75)
+    jekyll-sass-converter (3.0.0)
+      sass-embedded (~> 1.54)
     jekyll-sitemap (1.4.0)
       jekyll (>= 3.7, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    json (2.19.5)
-    kramdown (2.5.2)
-      rexml (>= 3.4.4)
+    kramdown (2.4.0)
+      rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liquid (4.0.4)
-    listen (3.10.0)
-      logger
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.7.0)
+    logger (1.6.1)
     mercenary (0.4.0)
-    ostruct (0.6.3)
+    ostruct (0.6.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (7.0.5)
-    rake (13.4.2)
-    rb-fsevent (0.11.2)
-    rb-inotify (0.11.1)
-      ffi (~> 1.0)
-    rexml (3.4.4)
-    rouge (4.7.0)
+    public_suffix (6.0.1)
+    rake (13.2.1)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    rexml (3.4.2)
+    rouge (4.4.0)
     safe_yaml (1.0.5)
-    sass-embedded (1.100.0)
-      google-protobuf (~> 4.31)
+    sass-embedded (1.79.4)
+      google-protobuf (~> 4.27)
       rake (>= 13)
+    sass-embedded (1.79.4-x64-mingw32)
+      google-protobuf (~> 4.27)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     unicode-display_width (2.6.0)
-    webrick (1.9.2)
+    webrick (1.8.2)
 
 PLATFORMS
   ruby
@@ -103,4 +100,4 @@ DEPENDENCIES
   rexml
 
 BUNDLED WITH
-  4.0.11
+   2.5.20

README.md

@@ -50,8 +50,8 @@ You'll want to run the site locally to test your changes.
 
 First make sure you have Ruby and Bundler:
 
-1. Check that Ruby is installed (check with `ruby -v`). Use the version in `.ruby-version` or another Ruby version supported by the Bundler version recorded in `Gemfile.lock`.
-2. If you don't already have Bundler (check with `which bundle`), install the version recorded in `Gemfile.lock` by following the instructions at https://bundler.io.
+1. Check that Ruby is installed (check with `ruby -v`). Must be 2.2.5 or higher.
+2. If you don't already have Bundler (check with `which bundle`), you can install by following the instructions at https://bundler.io.
 
 Then clone the source code, build, and serve:
 

_includes/footer.html

@@ -1,13 +1,13 @@
 <footer class="page-footer font-small blue pt-2 pt-md-5 dark-grey">
   {% assign item = site.data[page.lang].footer %}
 
-  <div class="container-fluid text-md-start px-0">
+  <div class="container-fluid text-md-left px-0">
 
     <div class="row mx-0 pb-md-5 pb-sm-5">
 
-      <div class="col-12 col-lg-6 mt-md-0 mt-3 ps-md-5 ps-sm-3 small px-sm-4 px-4">
+      <div class="col-12 col-lg-6 mt-md-0 mt-3 pl-md-5 pl-sm-3 small px-sm-4 px-4">
         <div class="footer-apps d-flex flex-column flex-sm-row">
-          <div class="footer-app-col footer-app-col--easy pe-sm-4">
+          <div class="footer-app-col footer-app-col--easy pr-sm-4">
             <h5 class="text-uppercase small grey">{{ item.bisqEasyMobile }}</h5>
             <div class="store-badges">
               <a target="_blank" rel="noopener"
@@ -30,14 +30,14 @@ <h5 class="text-uppercase small grey">{{ item.bisqConnect }}</h5>
             </div>
           </div>
         </div>
-        <div class="text-start small grey pt-4">
+        <div class="text-left small grey pt-4">
           {{ item.siteYear }}
         </div>
       </div>
 
       <hr class="clearfix w-100 d-lg-none pb-3">
 
-      <div class="col-12 col-lg-4 mb-md-0 mb-3 pe-md-5 pe-sm-2 small px-4 px-md-5">
+      <div class="col-12 col-lg-4 mb-md-0 mb-3 pr-md-5 pr-sm-2 small px-4 px-md-5">
         <h5 class="text-uppercase small grey">{{ item.ulResources }}</h5>
         <ul class="list-unstyled">
           <!--<li>

_includes/main_nav.html

@@ -1,19 +1,19 @@
-<nav class="navbar navbar-expand-lg navbar-light bg-light fixed-top ps-md-5 pe-md-5 ps-sm-3 pe-0">
+<nav class="navbar navbar-expand-lg navbar-light bg-light fixed-top pl-md-5 pr-md-5 pl-sm-3 pr-0">
 
   <a class="navbar-brand" href="{% lingual_link home %}"><img src="/images/bisq-logo.svg" height="30" loading="lazy"/></a>
 
   <!-- Language selector for mobile -->
 
   {% if page.en-only == false %}
   <div class="dropdown mobile-language-selector more-info-desktop">
-    <button class="btn btn-sm dropdown-toggle" type="button" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+    <button class="btn btn-sm dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
       {{ page.lang_display }}
     </button>
     <div class="dropdown-menu shadow-lg" aria-labelledby="dropdownMenuButton">
       {% assign pages = site.pages | where:"ref", page.ref | sort: 'lang_display' %}
       {% for page in pages %}
         <div class="dropdown-item btn-icon">
-          <div class="float-end">
+          <div class="float-right">
             <a href="{{ page.url }}">{{ page.lang_display }}</a>
           </div>
         </div>
@@ -22,12 +22,12 @@
   </div>
   {% endif %}
 
-  <button class="navbar-toggler pe-3 pe-md-0 collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+  <button class="navbar-toggler pr-3 pr-md-0 collapsed" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
     <span class="navbar-toggler-icon"></span>
   </button>
 
   <div class="collapse navbar-collapse" id="navbarSupportedContent">
-    <ul class="navbar-nav ms-auto">
+    <ul class="navbar-nav ml-auto">
 
       {% assign mainNavLabels = site.data[page.lang].main_nav %}
 
@@ -47,10 +47,10 @@
       </li>
 
       <li class="downloads-desktop nav-item dropdown">
-        <a class="nav-link dropdown-toggle" href="#" id="downloadDropdown" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        <a class="nav-link dropdown-toggle" href="#" id="downloadDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
           {{ mainNavLabels.downloads }}
         </a>
-        <div class="dropdown-menu dropdown-menu-end shadow-lg" aria-labelledby="downloadDropdown">
+        <div class="dropdown-menu dropdown-menu-right shadow-lg" aria-labelledby="downloadDropdown">
           {% include os_selector_options.html %}
         </div>
       </li>
@@ -59,14 +59,14 @@
 
       {% if page.en-only == false %}
       <li class="downloads-desktop nav-item dropdown more-info-desktop language-selector">
-        <a class="nav-link dropdown-toggle visible-language" href='#' id="languageSelectorDropdown" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        <a class="nav-link dropdown-toggle visible-language" href='#' id="languageSelectorDropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
           {{ page.lang_display }}
         </a>
         <div class="dropdown-menu shadow-lg" aria-labelledby="languageSelectorDropdown">
           {% assign pages = site.pages | where:"ref", page.ref | sort: 'lang_display' %}
           {% for page in pages %}
           <div class="dropdown-item btn-icon">
-            <div class="float-end">
+            <div class="float-right">
               <a href="{{ page.url }}">{{ page.lang_display }}</a>
             </div>
           </div>
@@ -78,9 +78,9 @@
       <!-- search bar  -->
 
       <li class="nav-item search">
-        <form class="d-flex" action="https://bisq.wiki/index.php" method="POST" target="_blank" rel="noopener noreferrer">
+        <form class="form-inline" action="https://bisq.wiki/index.php" method="POST" target="_blank" rel="noopener noreferrer">
           <div class="input-group">
-            <input class="form-control me-sm-2" type="search" placeholder="Search Wiki..." name="search">
+            <input class="form-control mr-sm-2" type="search" placeholder="Search Wiki..." name="search">
             <button type="submit" class="btn btn-sm btn-outline-success nav-item"><img src="/images/search.svg"></button>
           </div>
         </form>

_includes/os_selector_options.html

@@ -6,7 +6,7 @@
   <img src="/images/icon-download-g.svg" class="os-icon os-icon-g" alt="Download Bisq" loading="lazy">
   <img src="/images/icon-download-w.svg" class="os-icon os-icon-w" alt="Download Bisq" loading="lazy">
   {{ item.liAllDownloads }}
-  <div class="float-end">
+  <div class="float-right">
     <a href="{% lingual_link downloads %}">{{ item.liAllDownloadsText }}</a>
   </div>
 </div>
@@ -15,7 +15,7 @@
   <img src="/images/icon-windows-g.svg" class="os-icon os-icon-g" alt="Download Bisq for Windows" loading="lazy" />
   <img src="/images/icon-windows-w.svg" class="os-icon os-icon-w" alt="Download Bisq for Windows" loading="lazy" />
   {{ item.liWindows }}
-  <div class="float-end">
+  <div class="float-right">
     <a class="dl-win64" href="https://bisq.network/downloads/v{{ site.client_version }}/Bisq-64bit-{{ site.client_version }}.exe">.exe</a>
   </div>
 </div>
@@ -25,7 +25,7 @@
   <img src="/images/icon-apple-g.svg" class="os-icon os-icon-g" alt="Download Bisq for macOS" loading="lazy" />
   <img src="/images/icon-apple-w.svg" class="os-icon os-icon-w" alt="Download Bisq for macOS" loading="lazy" />
   {{ item.liMac }}
-  <div class="float-end">
+  <div class="float-right">
     <a class="dl-mac dl-mac-x86_64" href="{{ bisq1_downloads }}/{{ bisq1_macos_x86_64 }}">Intel</a> |
     <a class="dl-mac dl-mac-aarch64" href="{{ bisq1_downloads }}/{{ bisq1_macos_aarch64 }}">Apple Silicon</a>
   </div>
@@ -36,7 +36,7 @@
   <img src="/images/icon-ubuntu-g.svg" class="os-icon os-icon-g" alt="Download Bisq for Debian/Ubuntu" loading="lazy" />
   <img src="/images/icon-ubuntu-w.svg" class="os-icon os-icon-w" alt="Download Bisq for Debian/Ubuntu" loading="lazy" />
   {{ item.liDebian }}
-  <div class="float-end">
+  <div class="float-right">
     <a class="dl-deb64" href="https://bisq.network/downloads/v{{ site.client_version }}/Bisq-64bit-{{ site.client_version }}.deb">.deb</a>
   </div>
 </div>
@@ -46,7 +46,7 @@
   <img src="/images/icon-fedora-g.svg" class="os-icon os-icon-g" alt="Download Bisq for Red Hat/Fedora" loading="lazy" />
   <img src="/images/icon-fedora-w.svg" class="os-icon os-icon-w" alt="Download Bisq for Red Hat/Fedora" loading="lazy" />
   {{ item.liRedHat }}
-  <div class="float-end">
+  <div class="float-right">
     <a class="dl-rpm64" href="https://github.com/bisq-network/bisq/releases/download/v{{ site.client_version }}/Bisq-64bit-{{ site.client_version }}.rpm">.rpm</a>
   </div>
 </div>
@@ -56,15 +56,15 @@
   <img src="/images/icon-arch-linux-g.svg" class="os-icon os-icon-g" alt="Download Bisq for Arch Linux" loading="lazy" />
   <img src="/images/icon-arch-linux-w.svg" class="os-icon os-icon-w" alt="Download Bisq for Arch Linux" loading="lazy" />
   {{ item.liArch }}
-  <div class="float-end">
+  <div class="float-right">
     <a href="https://aur.archlinux.org/packages/bisq/">{{ item.liArchText }}</a></div>
 </div>
 
 <div class="dropdown-item btn-icon">
   <img src="/images/icon-opensource-g.svg" class="os-icon os-icon-g" alt="Source Code" loading="lazy" />
   <img src="/images/icon-opensource-w.svg" class="os-icon os-icon-w" alt="Source Code" loading="lazy" />
   {{ item.liSourceCode }}
-  <div class="float-end">
+  <div class="float-right">
     <a href="https://bisq.network/downloads/archive/v{{ site.client_version }}.zip">zip</a> |
     <a href="https://bisq.network/downloads/archive/v{{ site.client_version }}.tar.gz">tar.gz</a></div>
 </div>
@@ -73,7 +73,7 @@
   <img src="/images/icon-notes-g.svg" class="os-icon os-icon-g" alt="Release Notes" loading="lazy" />
   <img src="/images/icon-notes-w.svg" class="os-icon os-icon-w" alt="Release Notes" loading="lazy" />
   {{ item.liReleaseNotes }}
-  <div class="float-end">
+  <div class="float-right">
     <a href="https://bisq.network/downloads/v{{ site.client_version }}">v{{ site.client_version }}</a>
   </div>
 </div>
@@ -82,7 +82,7 @@
   <img src="/images/icon-verification-g.svg" class="os-icon os-icon-g" alt="Verification" loading="lazy" />
   <img src="/images/icon-verification-w.svg" class="os-icon os-icon-w" alt="Verification" loading="lazy" />
   {{ item.liVerification }}
-  <div class="float-end">
+  <div class="float-right">
     <a href="https://bisq.network/downloads/v{{ site.client_version }}">{{ item.liVerificationText1 }}</a> |
     <a href="https://bisq.network/downloads/v{{ site.client_version }}/E222AA02.asc">{{ item.liVerificationText2 }}</a></div>
 </div>

_layouts/default.html

@@ -63,7 +63,7 @@
         <title>{{ page.title }}</title>
 
         <script src="/js/js.cookie.min.js"></script>
-        <script defer src="/js/jquery-4.0.0.min.js"></script>
+        <script defer src="/js/jquery-3.7.1.min.js"></script>
         <script defer src="/js/popper.min.js"></script>
         <script defer src="/js/bootstrap.min.js"></script>
         <script defer src="/js/site.js"></script>

_layouts/page.html

@@ -5,14 +5,14 @@
 <div class="container pb-5 mb-5">
     <div class="row align-items-center">
       <!-- Outdated translation alert tool tag-->
-      <div class="col-md-12 order-md-1 text-md-start">
+      <div class="col-md-12 order-md-1 text-md-left">
         {% if page.outdated_translation %}
           <p class="text-muted">⚠ This page contains some outdated translations. <a href="https://www.transifex.com/bisq/bisq-website/">Help us improve!</a></p>
         {% endif %}
       </div>
 
-      <!-- <div class="{% if page.url == '/community/' %}col-md-12{% else %}col-md-8{% endif %} order-md-1 text-md-start pe-md-5"> -->
-      <div class="col-md-12 order-md-1 text-md-start" id="{{ page.ref }}">
+      <!-- <div class="{% if page.url == '/community/' %}col-md-12{% else %}col-md-8{% endif %} order-md-1 text-md-left pr-md-5"> -->
+      <div class="col-md-12 order-md-1 text-md-left" id="{{ page.ref }}">
          {{ content }}
       </div>
     </div>

_layouts/page_dao.html

@@ -337,29 +337,29 @@ <h2 style="margin: 2em 0;">{{ item.hLearnMore }}</h2>
 
     <div class="row pb-5">
 
-        <div class="col-12 col-md-6 pb-5 pe-5">
+        <div class="col-12 col-md-6 pb-5 pr-5">
           <div class="text-uppercase grey">
             {{ item.conceptualOverview }}
           </div>
           {{ item.pConceptualOverview }}
         </div>
 
 
-        <div class="col-12 col-md-6 pb-5 pe-5">
+        <div class="col-12 col-md-6 pb-5 pr-5">
           <div class="text-uppercase grey">
             {{ item.bisqDaoBrief }}
           </div>
           {{ item.pBisqDaoBrief }}
         </div>
 
-        <div class="col-12 col-md-6 pb-5 pe-5">
+        <div class="col-12 col-md-6 pb-5 pr-5">
           <div class="text-uppercase grey">
             {{ item.technicalOverview }}
           </div>
           {{ item.pTechnicalOverview }}
         </div>
 
-        <div class="col-12 col-md-6 pb-5 pe-5">
+        <div class="col-12 col-md-6 pb-5 pr-5">
           <div class="text-uppercase grey">
             {{ item.notConvinced }}
           </div>