From 088c913f67777b8a91274d4bd4e4d22d6bb151a9 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Sat, 9 Mar 2024 15:26:31 +1100 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=90=9B=20Fix=20HTML=20table=20not=20f?= =?UTF-8?q?ull=20width=20on=20desktop?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: #826 --- CHANGELOG.md | 1 + assets/css/compiled/main.css | 35 ++++++++++++++++++++++++++++++----- assets/css/main.css | 5 ++--- 3 files changed, 33 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ffe49309..f257899a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - `x-twitter` option missing when using sharing links ([#809](https://github.com/jpanther/congo/issues/809)) - Chinese default config contains incorrect `author` block name ([#807](https://github.com/jpanther/congo/pull/807)) - Links in articles are prefixed with a blank space ([#813](https://github.com/jpanther/congo/pull/813)) +- HTML tables would not fill the container width on desktop ([#826](https://github.com/jpanther/congo/issues/826)) ## [2.8.0] - 2024-01-22 diff --git a/assets/css/compiled/main.css b/assets/css/compiled/main.css index 2ab2d499..5be8c860 100644 --- a/assets/css/compiled/main.css +++ b/assets/css/compiled/main.css @@ -1254,13 +1254,18 @@ table { overflow: auto; } +@media (min-width: 768px) { + table { + display: table; + } +} + /* Fix long inline code sections breaking out of article on mobile */ code { word-wrap: break-word; /* All browsers since IE 5.5+ */ overflow-wrap: break-word; - /* Renamed property in CSS3 draft spec */ } /* -- Chroma Highlight -- */ @@ -2216,10 +2221,6 @@ code { border-width: 1px; } -.border-s { - border-inline-start-width: 1px; -} - .border-t { border-top-width: 1px; } @@ -3092,6 +3093,10 @@ code { right: 0px; } +.ltr\:-ml-5:where([dir="ltr"], [dir="ltr"] *) { + margin-left: -1.25rem; +} + .ltr\:block:where([dir="ltr"], [dir="ltr"] *) { display: block; } @@ -3104,10 +3109,22 @@ code { display: none; } +.ltr\:border-l:where([dir="ltr"], [dir="ltr"] *) { + border-left-width: 1px; +} + +.ltr\:pl-5:where([dir="ltr"], [dir="ltr"] *) { + padding-left: 1.25rem; +} + .rtl\:left-0:where([dir="rtl"], [dir="rtl"] *) { left: 0px; } +.rtl\:-mr-5:where([dir="rtl"], [dir="rtl"] *) { + margin-right: -1.25rem; +} + .rtl\:block:where([dir="rtl"], [dir="rtl"] *) { display: block; } @@ -3120,6 +3137,14 @@ code { display: none; } +.rtl\:border-r:where([dir="rtl"], [dir="rtl"] *) { + border-right-width: 1px; +} + +.rtl\:pr-5:where([dir="rtl"], [dir="rtl"] *) { + padding-right: 1.25rem; +} + @media print { .print\:hidden { display: none; diff --git a/assets/css/main.css b/assets/css/main.css index ea31a90f..c808b1a5 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -109,14 +109,13 @@ body:has(#menu-controller:checked) { /* Fix long tables breaking out of article on mobile */ table { - display: block; - overflow: auto; + @apply block overflow-auto md:table; } /* Fix long inline code sections breaking out of article on mobile */ code { word-wrap: break-word; /* All browsers since IE 5.5+ */ - overflow-wrap: break-word; /* Renamed property in CSS3 draft spec */ + @apply break-words; } /* -- Chroma Highlight -- */ From 33d34eea0f1fd8944bbcd53ff76451d49ad30102 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Sat, 9 Mar 2024 15:34:56 +1100 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=90=9B=20Fix=20table=20of=20contents?= =?UTF-8?q?=20border=20missing?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: #794 --- CHANGELOG.md | 1 + assets/css/compiled/main.css | 28 ++++------------------------ layouts/partials/toc.html | 4 ++-- 3 files changed, 7 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f257899a..23c95997 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ### Fixed +- Table of Contents missing left border detail ([#794](https://github.com/jpanther/congo/issues/794)) - `x-twitter` option missing when using sharing links ([#809](https://github.com/jpanther/congo/issues/809)) - Chinese default config contains incorrect `author` block name ([#807](https://github.com/jpanther/congo/pull/807)) - Links in articles are prefixed with a blank space ([#813](https://github.com/jpanther/congo/pull/813)) diff --git a/assets/css/compiled/main.css b/assets/css/compiled/main.css index 5be8c860..80aacf3f 100644 --- a/assets/css/compiled/main.css +++ b/assets/css/compiled/main.css @@ -2221,6 +2221,10 @@ code { border-width: 1px; } +.border-s { + border-inline-start-width: 1px; +} + .border-t { border-top-width: 1px; } @@ -3093,10 +3097,6 @@ code { right: 0px; } -.ltr\:-ml-5:where([dir="ltr"], [dir="ltr"] *) { - margin-left: -1.25rem; -} - .ltr\:block:where([dir="ltr"], [dir="ltr"] *) { display: block; } @@ -3109,22 +3109,10 @@ code { display: none; } -.ltr\:border-l:where([dir="ltr"], [dir="ltr"] *) { - border-left-width: 1px; -} - -.ltr\:pl-5:where([dir="ltr"], [dir="ltr"] *) { - padding-left: 1.25rem; -} - .rtl\:left-0:where([dir="rtl"], [dir="rtl"] *) { left: 0px; } -.rtl\:-mr-5:where([dir="rtl"], [dir="rtl"] *) { - margin-right: -1.25rem; -} - .rtl\:block:where([dir="rtl"], [dir="rtl"] *) { display: block; } @@ -3137,14 +3125,6 @@ code { display: none; } -.rtl\:border-r:where([dir="rtl"], [dir="rtl"] *) { - border-right-width: 1px; -} - -.rtl\:pr-5:where([dir="rtl"], [dir="rtl"] *) { - padding-right: 1.25rem; -} - @media print { .print\:hidden { display: none; diff --git a/layouts/partials/toc.html b/layouts/partials/toc.html index 883abdc3..debcb2db 100644 --- a/layouts/partials/toc.html +++ b/layouts/partials/toc.html @@ -1,10 +1,10 @@
{{ i18n "article.table_of_contents" }} -
+
{{ .TableOfContents | emojify }}
From 4acfb7b76a9f7bab65767b3a3eb1add662d774c7 Mon Sep 17 00:00:00 2001 From: James Panther <4462786+jpanther@users.noreply.github.com> Date: Sat, 9 Mar 2024 15:37:15 +1100 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=94=A8=20Preparing=20release=20v2.8.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 5 ++++- assets/css/compiled/main.css | 2 +- assets/css/main.css | 2 +- package.json | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 23c95997..42855f73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## [Unreleased] +## [2.8.1] - 2024-03-09 + ### Changed - Upgrade to ChartJS v4.4.2 ([#817](https://github.com/jpanther/congo/pull/817)) @@ -854,7 +856,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Advanced customisation using simple Tailwind colour definitions and styles - Fully documented -[Unreleased]: https://github.com/jpanther/congo/compare/v2.8.0...HEAD +[Unreleased]: https://github.com/jpanther/congo/compare/v2.8.1...HEAD +[2.8.1]: https://github.com/jpanther/congo/compare/v2.8.0...v2.8.1 [2.8.0]: https://github.com/jpanther/congo/compare/v2.7.6...v2.8.0 [2.7.6]: https://github.com/jpanther/congo/compare/v2.7.5...v2.7.6 [2.7.5]: https://github.com/jpanther/congo/compare/v2.7.4...v2.7.5 diff --git a/assets/css/compiled/main.css b/assets/css/compiled/main.css index 80aacf3f..a286bec1 100644 --- a/assets/css/compiled/main.css +++ b/assets/css/compiled/main.css @@ -1,4 +1,4 @@ -/*! Congo v2.8.0 | MIT License | https://github.com/jpanther/congo */ +/*! Congo v2.8.1 | MIT License | https://github.com/jpanther/congo */ /*! tailwindcss v3.4.1 | MIT License | https://tailwindcss.com */ diff --git a/assets/css/main.css b/assets/css/main.css index c808b1a5..da543079 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -1,4 +1,4 @@ -/*! Congo v2.8.0 | MIT License | https://github.com/jpanther/congo */ +/*! Congo v2.8.1 | MIT License | https://github.com/jpanther/congo */ @tailwind base; @tailwind components; diff --git a/package.json b/package.json index 86968958..e894b6e3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hugo-congo-theme", - "version": "2.8.0", + "version": "2.8.1", "description": "Congo theme for Hugo", "scripts": { "preinstall": "rimraf assets/lib",