From 5723ab68b7d68f5230dc6662b79beee2d78a4e8c Mon Sep 17 00:00:00 2001
From: Norman Walsh <ndw@nwalsh.com>
Date: Sat, 21 Sep 2024 16:38:04 +0100
Subject: [PATCH 1/3] Upgrade to Gradle 8.10.1

---
 build.gradle                             | 10 ++++++----
 buildSrc/build.gradle                    |  6 ++++--
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6b559a1948..7e500433b1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,8 +37,10 @@ plugins {
   id "de.undercouch.download" version "4.0.4"
 }
 
-sourceCompatibility=1.8
-targetCompatibility=1.8
+java {
+  sourceCompatibility = JavaVersion.VERSION_1_8
+  targetCompatibility = JavaVersion.VERSION_1_8
+}
 
 sourceSets {
   main {
@@ -1429,12 +1431,12 @@ jar {
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
-  classifier = 'javadoc'
+  archiveClassifier = 'javadoc'
   from javadoc.destinationDir
 }
 
 task sourcesJar(type: Jar) {
-  classifier = 'sources'
+  archiveClassifier = 'sources'
   from sourceSets.main.allSource
 }
 
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 6e99482195..ad85c40478 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -2,8 +2,10 @@ plugins {
   id "java"
 }
 
-sourceCompatibility=1.8
-targetCompatibility=1.8
+java {
+  sourceCompatibility = JavaVersion.VERSION_1_8
+  targetCompatibility = JavaVersion.VERSION_1_8
+}
 
 repositories {
   mavenLocal()
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ae04661ee7..d642e7f8f7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 1d28feebef8a1cb9f0b845290855c9879d164bef Mon Sep 17 00:00:00 2001
From: Norman Walsh <ndw@nwalsh.com>
Date: Sat, 21 Sep 2024 16:38:30 +0100
Subject: [PATCH 2/3] Add comment for panelset

---
 src/guide/xml/changelog.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/guide/xml/changelog.xml b/src/guide/xml/changelog.xml
index 3049558e84..4b6e29a69a 100644
--- a/src/guide/xml/changelog.xml
+++ b/src/guide/xml/changelog.xml
@@ -10,6 +10,10 @@ be of interest to users of the stylesheets. See the commits and pull requests on
 <link xlink:href="https://github.com/docbook/xslTNG/">the repository</link> for
 finer detail.</para>
 
+<!--
+Added panelset
+-->
+
 <section xml:id="r220">
 <info>
   <title>Changes in version 2.2.0</title>

From 24f38fca1d957e6fb2648c861e259730f34c47ad Mon Sep 17 00:00:00 2001
From: Norman Walsh <ndw@nwalsh.com>
Date: Sat, 21 Sep 2024 16:38:40 +0100
Subject: [PATCH 3/3] Tweak CSS

---
 src/main/scss/media-all.scss    | 2 +-
 src/main/scss/media-screen.scss | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/scss/media-all.scss b/src/main/scss/media-all.scss
index bd67bf7341..9913df39e1 100644
--- a/src/main/scss/media-all.scss
+++ b/src/main/scss/media-all.scss
@@ -17,7 +17,7 @@
     --hovered-color: rgb(235,235,235);
     --focused-color: rgb(221,221,221);
     --modal-overlay-color: rgba(255,255,255,0.85);
-    --panelset-color: #fafaf0;
+    --panelset-color: #f7f7f0;
 
     --border-color: var(--primary-color);
 
diff --git a/src/main/scss/media-screen.scss b/src/main/scss/media-screen.scss
index 03ade7952e..b280b3e2e7 100644
--- a/src/main/scss/media-screen.scss
+++ b/src/main/scss/media-screen.scss
@@ -416,7 +416,7 @@ nav.top div {
     width: 100%;
     display: none;
     padding: 1rem;
-    border-top: 1px solid var(--focused-color);
+    border: 2px solid var(--focused-color);
     background-color: var(--panelset-color);
 }
 
@@ -426,15 +426,16 @@ nav.top div {
 
 .panelset input[type="radio"]:checked + label {
     border-bottom: 2px solid var(--focused-color);
+    border-left: 1px solid var(--focused-color);
     background-color: var(--panelset-color);
     color: var(--on-background-color);
 }
 
 .panelset label:hover {
-    border-top: 2px solid var(--focused-color);
-    border-bottom: 2px solid var(--focused-color);
+    border: 2px solid var(--focused-color);
     color: var(--on-background-color);
-    border-radius: 0;
+    border-top-left-radius: 0.5em;
+    border-top-right-radius: 0.5em;
 }
 
 .panelset input[type="radio"]:checked + label + .paneltab {