Replace zen grids with css grid. Move print styles print style file. Remove Drupal specific styles.

layouts/_default/baseof.html

@@ -9,21 +9,19 @@
 {{ if and .Site.Params.piwikTrackerUrl .Site.Params.piwikSiteID }}{{ partialCached "piwik.html" . }}{{ end -}}
 </head>
 
-<body class="{{ if $.Param "sidebar" | default true }}one-sidebar sidebar-second{{ else }}no-sidebars{{ end }}">
-<div class="layout-center">
-<header class="header" role="banner">
+<body>
+<div class="page layout__wrapper{{ if $.Param "sidebar" | default true }} layout__sidebar layout__sidebar-second{{ end }}">
+<header class="header layout__header layout__full" role="banner">
 {{ if $.Param "logo" | default true }}<a href="{{ .Site.BaseURL }}" title="Home" rel="home" class="header__logo"><img src="/images/logo.png" alt="Home" class="header__logo-image" /></a>{{ end -}}
 <h1 class="header__site-name">
 <a href="{{ .Site.BaseURL }}" title="Home" class="header__site-link" rel="home"><span>{{ .Site.Title }}</span></a>
 </h1>
-<div class="header__region region region-header">{{ if $.Param "search" }}{{ partialCached "search.html" . }}{{ end }}</div>
+<div class="header__region region">{{ if $.Param "search" }}{{ partialCached "search.html" . }}{{ end }}</div>
 </header>
 
-<div class="layout-3col layout-swap">
 {{ block "main" . }}{{ end -}}
-</div>
 
-<footer class="footer" role="contentinfo">
+<footer class="footer layout__footer layout__full" role="contentinfo">
 {{ if $.Param "feedlinks" }}{{ partial "feedlinks.html" . }}{{ end -}}
 <p>{{ with $.Param "copyright" }}{{ . | markdownify }}{{ else }}<span>© {{ .Site.Title }}</span>{{ end }}</p>
 {{ with $.Param "footer" }}<p>{{ . | markdownify }}</p>{{ end }}

layouts/_default/list.html

@@ -3,7 +3,7 @@
 {{ end }}
 
 {{ define "main" -}}
-<main class="{{ if $.Param "sidebar" | default true }}layout-3col__left-content{{ else }}layout-3col__full{{ end }}" role="main">
+<main class="layout__content" role="main">
 <h1 class="title">{{ .Title }}</h1>
 {{ $paginator := .Paginate (.Data.Pages) -}}
 {{ range $paginator.Pages -}}

layouts/_default/single.html

@@ -3,7 +3,7 @@
 {{ end }}
 
 {{ define "main" -}}
-<main class="{{ if $.Param "sidebar" | default true }}layout-3col__left-content{{ else }}layout-3col__full{{ end }}" role="main">
+<main class="layout__content" role="main">
 <h1 class="title {{ if $.Param "submitted" | default false }}title-submitted{{ end }}">{{ .Title }}</h1>
 <article class="{{ with .Section }}section-{{ . | urlize }} {{ end }}single-view">
 <header>

layouts/index.html

@@ -6,7 +6,7 @@
 {{ end }}
 
 {{ define "main" -}}
-<main class="{{ if $.Param "sidebar" | default true }}layout-3col__left-content{{ else }}layout-3col__full{{ end }}" role="main">
+<main class="layout__content" role="main">
 <article class="{{ with .Section }}section-{{ . | urlize }} {{ end }}single-view">
 <div class="content">
 {{ .Content }}

layouts/partials/menu.html

@@ -1,7 +1,6 @@
 {{ $currentSection := .Section }}
 {{ $currentID := .UniqueID }}
-<div class="layout-swap__top layout-3col__full">
-<nav class="main-menu" role="navigation">
+<nav class="main-menu layout__navigation layout__full" role="navigation">
 <h2 class="visually-hidden">Main menu</h2>
 <ul class="navbar clearfix">
 <li><a class="{{ if .IsHome }}active{{ end }}" href="/">{{ i18n "menu_home" }}</a></li>
@@ -13,4 +12,3 @@
 {{ end -}}
 </ul>
 </nav>
-</div>

layouts/partials/meta_cache.html

@@ -1 +1,2 @@
 <link rel="stylesheet" href="/css/styles.css{{ if $.Param "cacheBustCSS" }}?{{ readFile "/public/css/styles.css" | sha1 }}{{ end }}">
+<link rel="stylesheet" href="/css/print.css" media="print">

layouts/partials/sidebar.html

@@ -1,5 +1,5 @@
 {{ $currentID := .UniqueID }}
-<aside class="layout-3col__right-sidebar" role="complementary">
+<aside class="sidebar layout__second-sidebar" role="complementary">
 {{ range $.Site.Home.Sections -}}
 <section>
 <h4 class="menu"><a class="{{ if eq $currentID .UniqueID }}active{{ end }}" href="{{ .RelPermalink }}">{{ .Title }}</a></h4>