Merge branch 'main' into deploy

.gitignore

@@ -3,4 +3,6 @@ public/
 public-deployed/
 resources/
 themes/solus/static/css/fonts/*.html
-themes/solus/static/css/solhub.css
+themes/solus/static/css/solhub.css
+
+.zed/

Makefile

@@ -3,23 +3,9 @@ SHELL = /bin/bash
 local:
 	hugo server --watch --disableFastRender --ignoreCache
 
-deploy:
-	hugo --quiet --cleanDestinationDir --destination public-deployed/
-	mv public-deployed/podcasts/sundays-with-solus-mp3/index.html public-deployed/podcasts/sundays-with-solus-mp3.xml
-	mv public-deployed/podcasts/sundays-with-solus-ogg/index.html public-deployed/podcasts/sundays-with-solus-ogg.xml
-	rmdir public-deployed/podcasts/sundays-with-solus-{mp3,ogg}
-	rm -r public-deployed/podcasts/{page,index}*
-
 setup:
-	git submodule init
 	sudo eopkg install hugo sassc
 
-sync:
-	git submodule sync
-	git submodule update --force --recursive --remote --rebase
-
 help:
-	@echo "deploy    - Create the deployed form of site. Not particularly useful for those not able to deploy the site."
 	@echo "local     - Run the Solus Site locally."
 	@echo "setup     - Install necessary tooling for minification."
-	@echo "sync      - Update git submodules and update assets."

config.toml

@@ -13,7 +13,7 @@ defaultContentLanguage = "en"
 defaultContentLanguageInSubdir = false
 googleanalytics = "UA-Not-Yet"
 metaDataFormat = "toml"
-paginate = 5
+pagination.pagerSize = 5
 theme = ["blog", "solus"]
 enableInlineShortcodes = true
 

themes/solus/assets/sass/elements/menu.sass

@@ -1,6 +1,22 @@
 // Menu
 
 .menu
+	@include row()
+	@include fullWidth()
+
+	b
+		@include box($menu-label-box)
+
+	nav
+		@include row()
+		gap: $menu-link-gap
+		flex-wrap: wrap
+		@include fullWidth()
+
+		a
+			display: flex
+			align-items: center
+
 	&.column
 		@include column()
 		@include box($menu-column-box)

themes/solus/assets/sass/meta/colors.sass

@@ -3,20 +3,58 @@
 // ------------
 
 // Main Colors
+$solus-blue: #5294E2
+$blue: #1a559c
+$gray: #333
+$marble: #f5f5f5
+$white: #fff
+
 $black: #26292b
 $border: #eee
 $egyptian-blue: #5754c7
 $lime: #37D79A
 $mauve: #c489bd
 $yellow: #ffcc00
 
-// Solbit Overrides
+// Pastels
+$green: #87d838
 $red: #ef2929
+$orange: #ff9900
+$purple: #c489bd
+
+// Derived Colors
+$light-gray: darken($marble, 10%)
+
+// Defaults
+$link: $blue
+$text: $gray
 
 // --------
 // Swatches
 // --------
 
+// Get background color
+@function bg($swatch)
+    @return map-get($swatch, bg)
+
+// Get foreground color
+@function fg($swatch)
+    @return map-get($swatch, fg)
+
+// Simple mixin for applying a swatch to an element
+@mixin colors($swatch)
+    background: bg($swatch)
+    color: fg($swatch)
+
+// Normal Swatches
+$swatch-default: (bg: $white, fg: $solus-blue)
+$swatch-gray: (bg: $gray, fg: $white)
+$swatch-light-gray: (bg: $light-gray, fg: $gray)
+$swatch-marble: (bg: $marble, fg: $gray)
+$swatch-solus: (bg: $solus-blue, fg: $white)
+$swatch-white: (bg: $white, fg: $gray)
+
+
 // Desktop Swatches
 $swatch-budgie: (bg: $solus-blue, fg: $white)
 $swatch-gnome: (bg: $egyptian-blue, fg: $white)
@@ -27,6 +65,27 @@ $swatch-xfce: (bg: $lime, fg: $black)
 // Elements
 // --------
 
+// --- Buttons ---
+$button-swatch: $swatch-solus
+$button-inverse-swatch: $swatch-default
+$button-white-swatch: $swatch-white
+$button-menu-inactive-color: $gray
+// --- Code ----
+$code-swatch: $swatch-marble
+// --- Keyboard ---
+$kbd-swatch: $swatch-light-gray
+// --- Navigation ---
+$navigation-swatch: $swatch-marble
+// --- Quotes ---
+$quote-swatch: $swatch-light-gray
+$quote-border-color: $gray
+// --- Search ---
+$search-swatch: $swatch-white
+// --- Tables ---
+$table-header-swatch: $swatch-gray
+$table-cell-odd: $white
+$table-cell-even: $light-gray
+
 // Menus
 $menu-column-border: $solus-blue
 
@@ -54,6 +113,23 @@ $panel-podcast-swatch: $swatch-marble
 $tag-swatch: $swatch-solus
 
 
+// ------
+// Structure
+// ------
+
+// --- HTML ---
+$body-swatch: $swatch-default
+// --- Banner ---
+$banner-top-swatch: $swatch-solus
+// --- Footer ---
+$footer-swatch: $navigation-swatch
+// --- Header ---
+$header-swatch: $navigation-swatch
+$header-menu-swatch: $swatch-light-gray
+// --- Table of Contents ---
+$toc-swatch: (bg: $marble, fg: $link)
+
+
 // --------
 // Pages
 // --------

themes/solus/assets/sass/meta/sizes.sass

@@ -1,13 +1,100 @@
 // Sizes
 
+
+// --------
+// Defaults
+// --------
+
+// Media Sizes
+$desktop: (min-width: 1024px)
+$mobile: (max-width: 1023px)
+$mac: (max-width: 1439px)
+
+// Text Sizes
+$size-h1: 2.5em
+$size-h2: 2em
+$size-h3: 1.75em
+$size-h4: 1.5em
+$size-h5: 1.25em
+$size-text: 1em
+
+// Gap Sizes
+$gap-max: 2.5em
+$gap-big: 2em
+$gap-large: 1.5em
+$gap-medium: 1.25em
+$gap-normal: 1em
+$gap-small: 0.625em
+$gap-min: 0.5em
+
+// Common Sizes
+$content-margin: 1rem
+$page-margin: 10%
+$page-margin-mobile: 5%
+$paragraph-box: (margin-bottom: $gap-medium)
+$reset-box: (box-sizing: border-box, line-height: 1.25em, margin: 0, padding: 0)
+
+// ------
+// Mixins
+// ------
+
+@mixin box($box)
+	@each $attr, $value in $box
+		#{$attr}: $value
+
+
 // --------
 // Elements
 // --------
 
+// Banner
+$banner-box: (padding: $gap-medium $page-margin)
+$banner-box-mobile: (padding: $gap-medium $page-margin-mobile)
+$banner-heading-box: (margin: 0 0 $gap-normal)
+$banner-top-h1-size: $size-h4
+$banner-top-h2-size: $size-text
+
+// Buttons
+$button-box: (height: 2.5em, line-height: 2.5em, padding: 0 $gap-big)
+$button-small-box: (height: 2em, line-height: 2em)
+
+// Code
+$code-border-radius: 0.25em
+$code-box: (padding: 0.1em)
+$pre-box: (padding: $gap-normal, margin: 0 0 $content-margin)
+
+// Content
+$content-img-box: (max-width: 100%, margin: 0 0 $content-margin)
+$content-img-featured-box: (margin: 0 0 $gap-big)
+$paragraph-box: (min-height: 1.5em, line-height: 1.5em, margin: 0 0 $content-margin)
+$heading-box: (margin: $content-margin 0)
+$heading-top-box: (margin: $content-margin)
+
+// Footer
+$footer-legal-box: (margin: $gap-normal 0)
+$footer-gap: $gap-min
+$footer-box: (padding: $gap-max $page-margin)
+$footer-box-mobile: (padding: $gap-max $page-margin-mobile)
+
+// Keyboard
+$kbd-border-radius: 0.125em
+$kbd-box: (line-height: 2em, margin: 0 0.25em, padding: 0 $gap-min)
+
+// Lists
+$list-box: (line-height: 2em, padding: 0 $gap-big)
+$list-item-box: (margin: $gap-min 0 0)
+$list-box-all: (margin: 0 0 $gap-normal)
+
 // Menus
 $menu-column-box: (margin-bottom: $gap-big, padding: 0 $gap-normal $gap-normal)
 $menu-column-title-box: (margin-bottom: 0.5em)
 $menu-column-title-font-size: $size-h4
+$menu-label-box: (width: 9.375em)
+$menu-link-gap: $gap-normal $gap-big
+
+// Pagination
+$pages-box: (padding: $gap-normal)
+$pages-button-box: (padding: 0 $gap-big)
 
 // Panels
 $panel-gap: $gap-big
@@ -40,15 +127,60 @@ $showcase-img-box: (height: fit-content, width: 4em)
 $showcase-section-box: (width: 24em)
 $showcase-section-gap: $gap-normal
 
+// Quotes
+$quote-box: (margin: 0 $gap-big $content-margin, padding: $gap-normal $gap-big)
+$quote-border-width: 0.125em
+
+// Search
+$search-box: (width: 30em, line-height: 3em, padding: $gap-min)
+$search-before-box: (padding: 0 $gap-min)
+
 // Tags
 $tag-box: (height: 1.25em, line-height: 1.25em, padding: 0 $gap-min)
 $tag-font-size: $size-text
 $tag-radius: 0.625em
 
-// Video Player
+// Tables
+$table-box: (width: initial, margin: 0 0 $content-margin)
+$table-cell-box: (padding: 0 $gap-normal)
+$table-head-box: (height: 3em)
+$table-row-box: (height: 2em)
+$table-border-width: 0.125em
+
+// Video
+$video-box: (margin: 0 0 $content-margin)
 $video-player-box: (height: 33em)
 
 
+// ---------
+// Structure
+// ---------
+
+
+// Header
+$header-bar-box: (height: 5em, padding: $gap-small $page-margin)
+$header-bar-box-mobile: (height: 3.75em, padding: $gap-small $page-margin-mobile)
+$header-bar-logo-box: (min-width: 0)
+$header-button-box: (padding: 0 $gap-min)
+$header-button-font-size: $size-h4
+$header-link-box: (line-height: 2em)
+$header-overlay-box: (padding: $gap-small $page-margin-mobile)
+$header-overlay-font-size: $size-h2
+$header-overlay-gap: $gap-min
+
+// Main
+$main-box: (min-height: 100%, padding: $gap-medium $page-margin)
+$main-box-mobile: (padding: $gap-medium $page-margin-mobile)
+$main-gap: $gap-big
+
+// Table of Contents
+$toc-box: (margin: 4em 0 0)
+$toc-nav-box: (width: initial, margin: $gap-min 0 0, padding: $gap-normal)
+$toc-heading-font-size: $size-h5
+$toc-nav-font-size: $size-text
+$toc-nav-indent: $gap-normal
+
+
 // -----
 // Pages
 // -----