page -> base layout, header changes

MAGICGrants · Apr 24, 2024 · 5f92c4e · 5f92c4e
1 parent 1999fd0
commit 5f92c4e
Show file tree

Hide file tree

Showing 30 changed files with 38 additions and 75 deletions.
diff --git a/_includes/header.html b/_includes/header.html
@@ -7,25 +7,11 @@
                        </a>
                    </div>
                    <ul class="main-menu col">
-                       <li class="nav-item link"><a href="https://github.com/serai-dex/serai">GitHub</a></li>
-                       <li class="nav-item link"><a href="{{ site.baseurl }}/blog/index.html">Blog</a></li>
-                       <li class="nav-item nav-btn"><a href="#">Socials</a>
-                            <ul class="dropdown" aria-label="submenu">
-                                <li><a class="sub-nav-item" href="https://discord.gg/mpEUtJR3vz" target="_blank">
-                                    <img src="/img/social-icons/discord-logo-blue.png" alt="Discord icon logo">
-                                    <span>Discord</span></a>
-                                </li>
-                                <li><a class="sub-nav-item" href="https://matrix.to/#/#serai:matrix.org" target="_blank">
-                                    <img src="/img/social-icons/matrix-logo-blue.png" alt="Matrix icon logo">
-                                    <span>Matrix</span></a>
-                                </li>
-                                <li><a class="sub-nav-item" href="https://twitter.com/SeraiDEX" target="_blank">
-                                    <img src="/img/social-icons/twitter-logo-blue.png" alt="X (Twitter) icon logo">
-                                    <span>X (Twitter)</span></a>
-                                </li>
-
-                            </ul>
-                        </li>
+                       <li class="nav-item link"><a href="{{ site.baseurl }}/updates">Updates</a></li>
+                       <li class="nav-item link"><a href="{{ site.baseurl }}/scholarships">Scholarships</a></li>
+                       <li class="nav-item link"><a href="{{ site.baseurl }}/funds">Funds</a></li>
+                       <li class="nav-item link"><a href="{{ site.baseurl }}/contribute">Contribute</a></li>
+                       <li class="nav-item link"><a href="{{ site.baseurl }}/about">About</a></li>
                    </ul>
                </nav>
                <nav role='navigation' class="mobile-menu row">
@@ -37,28 +23,11 @@
                     </span>
                   </label>
                   <ul class="slide-nav">
-                      <li class="mob-item"><a href="https://github.com/serai-dex/serai">GitHub</a></li>
-                      <li class="mob-item"><a href="{{ site.baseurl }}/blog/index.html">Blog</a></li>
-                      <li class="mob-item">
-                        <p>Socials</p>
-                        <ul class="nav-social-mob">
-                            <li>
-                                <a class="sub-nav-item" href="https://discord.gg/mpEUtJR3vz" target="_blank">
-                                    <img src="/img/social-icons/discord-logo-blue.png" alt="Discord icon logo">
-                                </a>
-                            </li>
-                            <li>
-                                <a class="sub-nav-item" href="https://matrix.to/#/#serai:matrix.org" target="_blank">
-                                    <img src="/img/social-icons/matrix-logo-blue.png" alt="Matrix icon logo">
-                                </a>
-                            </li>
-                            <li>
-                                <a class="sub-nav-item" href="https://twitter.com/SeraiDEX" target="_blank">
-                                    <img src="/img/social-icons/twitter-logo-blue.png" alt="X (Twitter) icon logo">
-                                </a>
-                            </li>
-                        </ul>
-                      </li>
+                      <li class="nav-item link"><a href="{{ site.baseurl }}/updates">Updates</a></li>
+                      <li class="nav-item link"><a href="{{ site.baseurl }}/scholarships">Scholarships</a></li>
+                      <li class="nav-item link"><a href="{{ site.baseurl }}/funds">Funds</a></li>
+                      <li class="nav-item link"><a href="{{ site.baseurl }}/contribute">Contribute</a></li>
+                      <li class="nav-item link"><a href="{{ site.baseurl }}/about">About</a></li>
                   </ul>
                </nav>
        </div>

diff --git a/about/documentation/index.md b/about/documentation/index.md
@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: base
 title: "Documentation"
 ---
 

diff --git a/about/index.md b/about/index.md
@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: base
 title: "About"
 ---
 

diff --git a/contribute/index.md b/contribute/index.md
@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: base
 title: "Donate"
 ---
 

diff --git a/contribute/membership.md b/contribute/membership.md
@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: base
 title: "Membership"
 ---
 

diff --git a/funds/committee_compensation_limits.md b/funds/committee_compensation_limits.md
@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: base
 title: "MAGIC Grants Committee Compensation Limits"
 ---
 

diff --git a/funds/committee_expectations.md b/funds/committee_expectations.md
@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: base
 title: "Committee Expectations"
 ---
 

diff --git a/funds/firo/index.md b/funds/firo/index.md
@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: base
 title: "MAGIC Firo Fund"
 ---
 

diff --git a/funds/fund_fees.md b/funds/fund_fees.md
@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: base
 title: "MAGIC Fund Fees"
 ---
 

diff --git a/funds/fund_initial_steps.md b/funds/fund_initial_steps.md
@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: base
 title: "MAGIC Fund Initial Steps"
 ---
 

diff --git a/funds/fund_template.md b/funds/fund_template.md
@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: base
 title: "MAGIC <Project> Fund TEMPLATE"
 ---
 

diff --git a/funds/index.md b/funds/index.md
@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: base
 title: "MAGIC Funds"
 ---
 

diff --git a/funds/initial_fund_page_template.md b/funds/initial_fund_page_template.md
@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: base
 title: "Initial Fund Template"
 ---
 

diff --git a/funds/monero/index.md b/funds/monero/index.md
@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: base
 title: "MAGIC Monero Fund"
 ---
 

diff --git a/funds/monero/monero_fund.md b/funds/monero/monero_fund.md
@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: base
 title: "MAGIC Monero Fund"
 ---
 

diff --git a/funds/monero/monero_fund_voters.md b/funds/monero/monero_fund_voters.md
@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: base
 title: "MAGIC Monero Fund Voters"
 ---
 

diff --git a/funds/privacy_guides/privacy_guides_funds.md b/funds/privacy_guides/privacy_guides_funds.md
@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: base
 title: "MAGIC Privacy Guides Fund"
 ---
 

diff --git a/funds/voter_expectations.md b/funds/voter_expectations.md
@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: base
 title: "Voter Expectations"
 ---
 

diff --git a/funds/voting.md b/funds/voting.md
@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: base
 title: "Voting Guide"
 ---
 

diff --git a/scholarships/index.md b/scholarships/index.md
@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: base
 ---
 
 MAGIC distributes scholarships available to assist students accomplish their educational goals. Applications open in the Spring for the following school year.

diff --git a/scholarships/scholarship-application/index.md b/scholarships/scholarship-application/index.md
@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: base
 ---
 
 <!--

diff --git a/scholarships/scholarship-recipients/2019/index.md b/scholarships/scholarship-recipients/2019/index.md
@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: base
 ---
 
 No 2019 scholarship recipients have agreed to make their names public. We will update the page if recipients wish to be listed.
diff --git a/scholarships/scholarship-recipients/2020/index.md b/scholarships/scholarship-recipients/2020/index.md
@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: base
 ---
 
 MAGIC Grants is pleased to announce our 2020 Scholarship recipients! These three individuals wished to be recognized.

diff --git a/scholarships/scholarship-recipients/2021/index.md b/scholarships/scholarship-recipients/2021/index.md
@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: base
 ---
 
 MAGIC Grants is pleased to announce our 2021 Scholarship recipients! These three individuals wished to be recognized.

diff --git a/scholarships/scholarship-recipients/2022/index.md b/scholarships/scholarship-recipients/2022/index.md
@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: base
 ---
 
 MAGIC Grants is pleased to announce our 2022 Scholarship recipients! These three individuals wished to be recognized.

diff --git a/scholarships/scholarship-recipients/2023/index.md b/scholarships/scholarship-recipients/2023/index.md
@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: base
 ---
 
 MAGIC Grants is pleased to announce our 2023 Scholarship recipients! These three individuals wished to be recognized.

diff --git a/scholarships/scholarship-recipients/index.md b/scholarships/scholarship-recipients/index.md
@@ -1,5 +1,5 @@
 ---
-layout: page
+layout: base
 ---
 
 This page indexes the scholarship recipients who wished to be recognized publicly. We are inspired by their commitment and interest!

diff --git a/blog/assets/serai-dex-logo-full-color.svg → updates/assets/serai-dex-logo-full-color.svg b/blog/assets/serai-dex-logo-full-color.svg → updates/assets/serai-dex-logo-full-color.svg
diff --git a/blog/index.html → updates/index.html b/blog/index.html → updates/index.html
@@ -1,13 +1,13 @@
 ---
 layout: base
-title: MAGIC Grants Blog
+title: MAGIC Grants Updates
 ---
 
     <section class="page-intro section blog-intro">
         <div class="container">
           <div class="row">
               <div class="col title">
-                  <h1>MAGIC Grants</h1>
+                  <h1>MAGIC Grants Updates</h1>
               </div>
               <div class="col subtitle">
                 <p>Find our latest news, updates, and announcements here in our blog.</p>

diff --git a/updates/index.md b/updates/index.md