Removed twitter links, added extra Codeberg links, updated hacks

diff --git a/hacks b/hacks
index be89a91945590cf9ea4ef6001daffbf9dc3ea2a6..df4dff3b145e52b424d76f4ffff3d4b0333b1c14 160000 (submodule)
--- a/hacks
+++ b/hacks
@@ -1 +1 @@
-Subproject commit be89a91945590cf9ea4ef6001daffbf9dc3ea2a6
+Subproject commit df4dff3b145e52b424d76f4ffff3d4b0333b1c14

diff --git a/themes/bookstack/layouts/404.html b/themes/bookstack/layouts/404.html
index 7c668408f084095db4e31e915145e70dedc71851..63e9713c8cb6d6e61eef7c4be8932874abeb61a5 100644 (file)
--- a/themes/bookstack/layouts/404.html
+++ b/themes/bookstack/layouts/404.html
@@ -17,7 +17,7 @@
                 Sorry, we couldn't find a page at the current URL path. <br>
                 If you got here from a link on this site, feel free to 
                 <a href="https://codeberg.org/bookstack/website">raise an issue</a>
                 Sorry, we couldn't find a page at the current URL path. <br>
                 If you got here from a link on this site, feel free to 
                 <a href="https://codeberg.org/bookstack/website">raise an issue</a>

-                on GitHub. <br>
+                on Codeberg. <br>

                 Otherwise you may be able to find what you need at one of these
                 handy links:
             </p>
                 Otherwise you may be able to find what you need at one of these
                 handy links:
             </p>


@@ -93,11 +93,11 @@
                       <p>Chat with the development team and other users</p>
                     </div>
                   </a>
                       <p>Chat with the development team and other users</p>
                     </div>
                   </a>

-                  <a href="https://twitter.com/bookstack_app" target="_blank" class="content-card-item">
-                    <div class="content-card-item-icon" aria-hidden="true">{{partial "icon/twitter.svg"}}</div>
+                  <a href="https://codeberg.org/bookstack/" target="_blank" class="content-card-item">
+                    <div class="content-card-item-icon" aria-hidden="true">{{partial "icon/codeberg.svg"}}</div>

                     <div>
                     <div>

-                      <div class="content-card-item-title">Twitter</div>
-                      <p>See updates and shout us out on Twitter</p>
+                      <div class="content-card-item-title">Codeberg</div>
+                      <p>Watch development and get involved</p>

                     </div>
                   </a>
                   <a href="https://www.reddit.com/r/bookstack" target="_blank" class="content-card-item">
                     </div>
                   </a>
                   <a href="https://www.reddit.com/r/bookstack" target="_blank" class="content-card-item">

diff --git a/themes/bookstack/layouts/partials/footer.html b/themes/bookstack/layouts/partials/footer.html
index 57295510f7f5b11ad342cc2f0d3aed3a1f33f775..f932acd4d5b233eb785ebd54e68cef220a672a70 100644 (file)
--- a/themes/bookstack/layouts/partials/footer.html
+++ b/themes/bookstack/layouts/partials/footer.html
@@ -31,9 +31,9 @@
                 <div class="col-xs-6 col-sm-4 col-lg-2">
                     <h5>Follow us</h5>
                     <ul class="nav-list">
                 <div class="col-xs-6 col-sm-4 col-lg-2">
                     <h5>Follow us</h5>
                     <ul class="nav-list">

+                        <li><a href="https://codeberg.org/bookstack/" target="_blank">Codeberg</a></li>

                         <li><a href="https://github.com/BookStackApp/BookStack" target="_blank">Github</a></li>
                         <li><a href="https://discord.gg/ztkBqR2" target="_blank">Discord</a></li>
                         <li><a href="https://github.com/BookStackApp/BookStack" target="_blank">Github</a></li>
                         <li><a href="https://discord.gg/ztkBqR2" target="_blank">Discord</a></li>

-                        <li><a href="https://twitter.com/bookstack_app" target="_blank">Twitter</a></li>

                         <li><a rel="me" href="https://fosstodon.org/@bookstack" target="_blank">Mastodon</a></li>
                         <li><a href="https://foss.video/c/bookstack/" target="_blank">PeerTube</a></li>
                         <li><a href="https://www.youtube.com/c/BookStackApp" target="_blank">YouTube</a></li>
                         <li><a rel="me" href="https://fosstodon.org/@bookstack" target="_blank">Mastodon</a></li>
                         <li><a href="https://foss.video/c/bookstack/" target="_blank">PeerTube</a></li>
                         <li><a href="https://www.youtube.com/c/BookStackApp" target="_blank">YouTube</a></li>

diff --git a/themes/bookstack/layouts/partials/header.html b/themes/bookstack/layouts/partials/header.html
index 557054a6d657468faf133fc4e28c6766532d174e..eff0e6d213d0685b992abc8f967dce3bbcf0545c 100644 (file)
--- a/themes/bookstack/layouts/partials/header.html
+++ b/themes/bookstack/layouts/partials/header.html
@@ -196,6 +196,13 @@
                   <p>Star the project on GitHub and follow us</p>
                 </div>
               </a>
                   <p>Star the project on GitHub and follow us</p>
                 </div>
               </a>

+              <a href="https://codeberg.org/bookstack/" target="_blank" class="nav-dropdown-item">
+                <div class="nav-dropdown-item-icon" aria-hidden="true">{{partial "icon/codeberg.svg"}}</div>
+                <div>
+                  <div class="nav-dropdown-item-title">Codeberg</div>
+                  <p>Watch development and get involved</p>
+                </div>
+              </a>

               <a href="https://discord.gg/ztkBqR2" target="_blank" class="nav-dropdown-item">
                 <div class="nav-dropdown-item-icon" aria-hidden="true">{{partial "icon/discord.svg"}}</div>
                 <div>
               <a href="https://discord.gg/ztkBqR2" target="_blank" class="nav-dropdown-item">
                 <div class="nav-dropdown-item-icon" aria-hidden="true">{{partial "icon/discord.svg"}}</div>
                 <div>


@@ -203,13 +210,6 @@
                   <p>Chat with the development team and other users</p>
                 </div>
               </a>
                   <p>Chat with the development team and other users</p>
                 </div>
               </a>

-              <a href="https://twitter.com/bookstack_app" target="_blank" class="nav-dropdown-item">
-                <div class="nav-dropdown-item-icon" aria-hidden="true">{{partial "icon/twitter.svg"}}</div>
-                <div>
-                  <div class="nav-dropdown-item-title">Twitter</div>
-                  <p>See updates and shout us out on Twitter</p>
-                </div>
-              </a>

               <a href="https://fosstodon.org/@bookstack" rel="me" target="_blank" class="nav-dropdown-item">
                 <div class="nav-dropdown-item-icon" aria-hidden="true">{{partial "icon/mastodon.svg"}}</div>
                 <div>
               <a href="https://fosstodon.org/@bookstack" rel="me" target="_blank" class="nav-dropdown-item">
                 <div class="nav-dropdown-item-icon" aria-hidden="true">{{partial "icon/mastodon.svg"}}</div>
                 <div>

diff --git a/themes/bookstack/layouts/partials/icon/codeberg.svg b/themes/bookstack/layouts/partials/icon/codeberg.svg
new file mode 100644 (file)
index 0000000..6fab758
--- /dev/null
+++ b/themes/bookstack/layouts/partials/icon/codeberg.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" viewBox="0 0 4.233 4.233"><defs><linearGradient id="a"><stop offset="0" style="stop-color:#2185d0;stop-opacity:0"/><stop offset=".495" style="stop-color:#2185d0;stop-opacity:.48923996"/><stop offset="1" style="stop-color:#2185d0;stop-opacity:.63279623"/></linearGradient><linearGradient xlink:href="#b" id="c" x1="42519.285" x2="42575.336" y1="-7078.789" y2="-6966.931" gradientUnits="userSpaceOnUse"/><linearGradient id="b"><stop offset="0" style="stop-color:#2185d0;stop-opacity:0"/><stop offset=".495" style="stop-color:#2185d0;stop-opacity:.30000001"/><stop offset="1" style="stop-color:#2185d0;stop-opacity:.30000001"/></linearGradient></defs><path d="M42519.285-7078.79a.76.568 0 0 0-.738.675l33.586 125.888a87.182 87.182 0 0 0 39.381-33.763l-71.565-92.52a.76.568 0 0 0-.664-.28z" style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#c);fill-opacity:1;stroke:none;stroke-width:3.67846;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:2;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke markers fill;stop-color:#000;stop-opacity:1" transform="matrix(.02428 0 0 .02428 -1030.156 172.97)"/><path d="M11249.461-1883.696c-12.74 0-23.067 10.327-23.067 23.067 0 4.333 1.22 8.58 3.522 12.251l19.232-24.863c.138-.18.486-.18.624 0l19.233 24.864a23.068 23.068 0 0 0 3.523-12.252c0-12.74-10.327-23.067-23.067-23.067z" style="opacity:1;fill:#2185d0;fill-opacity:1;stroke-width:17.0055;paint-order:markers fill stroke;stop-color:#000" transform="translate(-1030.156 172.97) scale(.09176)"/></svg>
\ No newline at end of file

diff --git a/themes/bookstack/layouts/partials/icon/twitter.svg b/themes/bookstack/layouts/partials/icon/twitter.svg
deleted file mode 100644 (file)
index 829c6fe..0000000
--- a/themes/bookstack/layouts/partials/icon/twitter.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="24" viewBox="0 0 248 24" height="24" xmlns="http://www.w3.org/2000/svg"><path d="M188.134-20.903c.098 1.422.098 2.844.098 4.279 0 43.725-33.287 94.154-94.154 94.154v-.026a93.68 93.68 0 0 1-50.724-14.835c2.614.314 5.242.472 7.876.478a66.448 66.448 0 0 0 41.098-14.193 33.133 33.133 0 0 1-30.915-22.98 32.985 32.985 0 0 0 14.94-.57C60.915 22.285 49.808 8.721 49.808-7.03v-.42a32.881 32.881 0 0 0 15.019 4.142c-14.54-9.718-19.023-29.061-10.242-44.185a93.92 93.92 0 0 0 68.2 34.572 33.112 33.112 0 0 1 9.573-31.616c13.328-12.529 34.29-11.887 46.818 1.435a66.402 66.402 0 0 0 21.014-8.034 33.215 33.215 0 0 1-14.546 18.302 65.81 65.81 0 0 0 19.002-5.21 67.226 67.226 0 0 1-16.512 17.142z"/></svg>
\ No newline at end of file