Load all CSS at once.

code4sac · Oct 6, 2023 · 1a8248f · 1a8248f
1 parent 8b60df5
commit 1a8248f
Show file tree

Hide file tree

Showing 13 changed files with 9 additions and 283 deletions.
diff --git a/_includes/footer.html b/_includes/footer.html
@@ -1,12 +1,6 @@
 <!--
 Default application footer.
 -->
-{%block head%}
-<link rel="stylesheet" type="text/css" href="/public/css/footer.css">
-<link rel="preconnect" href="https://fonts.googleapis.com">
-<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-<link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;600&display=swap" rel="stylesheet">
-{%endblock%}
 <footer>
   <div class="footerContainerTop">
       <div class="footerMessage">

diff --git a/_includes/layouts/base.html b/_includes/layouts/base.html
@@ -12,7 +12,13 @@
   <title>{{ title }}</title>
   <link rel="icon" href="/public/img/favicon.ico">
   <!--  Load application CSS and Javascript -->
-  <link rel="stylesheet" href="/public/css/main.scss">
+  <link rel="stylesheet" href="/public/css/main.css">
+  <link rel="stylesheet" href="/public/css/home.css">
+  <link rel="stylesheet" type="text/css" href="/public/css/footer.css">
+  <link rel="preconnect" href="https://fonts.googleapis.com">
+  <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+  <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;600&display=swap" rel="stylesheet">
+  <link rel="stylesheet" href="/public/css/navigation-bar.css">
   <script src="/public/js/app.js" type="module" async></script>
   <!--  SEO meta data-->
   <script type="application/ld+json">
@@ -28,7 +34,6 @@
     }
   </script>
   <!--  Load page CSS and Javascript -->
-  {% block head %}{% endblock %}
 </head>
 <body>
 <!--Load page layout-->

diff --git a/_includes/layouts/home.html b/_includes/layouts/home.html
@@ -4,9 +4,6 @@
 <!--
 Home layout with navigation bar and footer.
 -->
-{%block head%}
-<link rel="stylesheet" href="/public/css/home.scss">
-{%endblock%}
 <div class="">
   <div class="w-full">
     {% include "navigation-bar.html" %}

diff --git a/_includes/navigation-bar.html b/_includes/navigation-bar.html
@@ -1,15 +1,12 @@
 <!--
 Default application navigation bar.
 -->
-{%block head%}
-<link rel="stylesheet" href="/public/css/navigation-bar.scss">
-{%endblock%}
 <header class="w-full">
   <div class="nav-main-toolbar">
     <div class="container mx-auto flex items-end flex-nowrap">
       <div class="nav-left-container">
         <a class="nav-left-section" href="home">
-          <img src="/public/img/opensac_black_logo_01.png" alt="Open Sacramento logo" height="100" width="200">
+          <img src="/public/img/Open Sac - Black Logo.png" alt="Open Sacramento logo" height="100" width="200">
         </a>
       </div>
 
@@ -39,7 +36,7 @@
     </div>
   </div>
 
-  <div class="nav-toolbar-extended">
+  <div class="hidden nav-toolbar-extended">
     <nav class="nav-extended-container-mobile container mx-auto" role="navigation">
       <ul>
         <li class="nav-extended-mobile-section">

diff --git a/public/css/home.scss → public/css/home.css b/public/css/home.scss → public/css/home.css
diff --git a/_includes/main.scss → public/css/main.css b/_includes/main.scss → public/css/main.css
diff --git a/public/css/main.scss b/public/css/main.scss
diff --git a/public/css/navigation-bar.scss → public/css/navigation-bar.css b/public/css/navigation-bar.scss → public/css/navigation-bar.css
diff --git a/public/img/Open Sac - Black Logo.png b/public/img/Open Sac - Black Logo.png
diff --git a/styles/footer.scss b/styles/footer.scss
diff --git a/styles/home.scss b/styles/home.scss
diff --git a/styles/main.scss b/styles/main.scss
diff --git a/styles/navigation-bar.scss b/styles/navigation-bar.scss