fix css for general.html template

okfn · May 24, 2023 · 1d8b541 · 1d8b541
1 parent ddf7296
commit 1d8b541
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 46 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -26,6 +26,7 @@ module.exports = function(grunt) {
       options: {
         map: true,
         processors: [
+          require('tailwindcss')(),
           require('autoprefixer'),
           require('cssnano')
         ]

diff --git a/static/css/homepage/main.css b/static/css/homepage/main.css
diff --git a/templates/cms_article.html b/templates/cms_article.html
@@ -3,7 +3,7 @@
 {% block body-class %}article-template{% endblock %}
 
 {% block body %}
-<div>
+<section>
   <aside>
     <nav id="side-nav" class="side-nav">
       {% include 'includes/sidebar.html' %}
@@ -13,12 +13,12 @@
       {% placeholder "sidebar" inherit %}
     </div>
   </aside>
-  <article>
+  <article class="sect">
     {% block article %}
     {% placeholder "main" %}
     {% endblock %}
   </article>
-</div>
+</section>
 
 {% include 'includes/cta.html' %}
 {% endblock %}

diff --git a/templates/cms_default.html b/templates/cms_default.html
@@ -12,11 +12,9 @@
 {% endblock %}
 
 {% block body %}
-<div class='row'>
-  <div class='main col-md-12'>
+<section class="sect">
     {% placeholder "main" %}
-  </div>
-</div>
+</section>
 {% endblock %}
 
 {% block breadcrumb %}

diff --git a/templates/general.html b/templates/general.html
@@ -9,8 +9,9 @@
 {% endblock %}
 
 {% block head-css %}
-        <link rel="stylesheet" href="/assets/css/style.css">
-        <link rel="stylesheet" href="/assets/assets/general.css">
+{% load static %}
+<link rel="stylesheet" href="{% static 'css/homepage/general.css' %}">
+<link rel="stylesheet" href="{% static 'css/style.css' %}">
 {% endblock %}
 
 {% block body-sheath %}
@@ -35,39 +36,37 @@
                     <img src="/images/lg-okfn-black.svg" class="h-20" alt="Open Knowledge Foundation">
                   </a>
 
-
-<ul class="main-nav__menu">
-  {% show_menu_below_id "home" 0 1 1 100 "menu/menu.html" %}
-
-                    <li class="main-nav__item -search switcher">
-                      <input type="checkbox" id="switch-search" class="switcher__indicator">
-                      <label for="switch-search" class="switcher__trigger icon">
-                        <span>
-                          <!-- <img src="/images/icons/header-search.svg" class="-search__open" alt="Search"> -->
-                          <!-- <img src="/images/icons/close.svg" class="-search__close" alt="Close search"> -->
-                        </span>
-                      </label>
-                      <form action="/search" class="switcher__target form main-header__search">
-                        <div class="input-fake flex">
-                          <input class="form-control flex-grow" name="q" type="text" />
-                          <button class="flex-shrink-0">
-                            <img src="/assets/images/icons/header-search.svg" class="max-w-none" alt="Search">
-                          </button>
-                        </div>
-                      </form>
-                    </li>
-                    <li class="main-nav__item -language" data-current-language="English">
-                      <label class="icon">
-                        <span></span>
-                      </label>
-                      <ul class="submenu -simple">
-                        <li><a href="">English</a></li>
-                        <li><a href="">Español</a></li>
-                        <li><a href="">Português (Brasil)</a></li>
-                        <li><a href="">Français</a></li>
-                      </ul>
-                    </li>
+              <ul class="main-nav__menu">
+                {% show_menu_below_id "home" 0 1 1 100 "menu/menu.html" %}
+                <li class="main-nav__item -search switcher">
+                  <input type="checkbox" id="switch-search" class="switcher__indicator">
+                  <label for="switch-search" class="switcher__trigger icon">
+                    <span>
+                      <!-- <img src="/images/icons/header-search.svg" class="-search__open" alt="Search"> -->
+                      <!-- <img src="/images/icons/close.svg" class="-search__close" alt="Close search"> -->
+                    </span>
+                  </label>
+                  <form action="/search" class="switcher__target form main-header__search">
+                    <div class="input-fake flex">
+                      <input class="form-control flex-grow" name="q" type="text" />
+                      <button class="flex-shrink-0">
+                        <img src="/assets/images/icons/header-search.svg" class="max-w-none" alt="Search">
+                      </button>
+                    </div>
+                  </form>
+                </li>
+                <li class="main-nav__item -language" data-current-language="English">
+                  <label class="icon">
+                    <span></span>
+                  </label>
+                  <ul class="submenu -simple">
+                    <li><a href="">English</a></li>
+                    <li><a href="">Español</a></li>
+                    <li><a href="">Português (Brasil)</a></li>
+                    <li><a href="">Français</a></li>
                   </ul>
+                </li>
+              </ul>
                 </div>
               </nav>
             </div>

diff --git a/templates/includes/nav.html b/templates/includes/nav.html
@@ -1,2 +0,0 @@
-{% load menu_tags %}
-{% show_menu_below_id "home" 0 100 2 100 "menu/menu.html" %}

diff --git a/templates/includes/sidebar.html b/templates/includes/sidebar.html
@@ -1,4 +1,3 @@
-{% load menu_tags %}
 {% load i18n %}
 <ul>
   {% include 'includes/nav.html' %}

diff --git a/vite.config.js b/vite.config.js
@@ -131,7 +131,7 @@ export default {
       input: {
         main: resolve(__dirname, 'templates/general.html'),
         styles: resolve(__dirname, 'templates/styles.html')
-      }
+      },
     }
   },
   publicDir: '../static',