Skip to content

Commit

Permalink
Merge pull request #508 from ndw/panelset
Browse files Browse the repository at this point in the history
Support "panelset" presentation of variable lists
  • Loading branch information
ndw authored Sep 21, 2024
2 parents 9de44bb + 24f38fc commit 61aef37
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 12 deletions.
10 changes: 6 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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
}

Expand Down
6 changes: 4 additions & 2 deletions buildSrc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
4 changes: 4 additions & 0 deletions src/guide/xml/changelog.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/main/scss/media-all.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
9 changes: 5 additions & 4 deletions src/main/scss/media-screen.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand All @@ -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 {
Expand Down

0 comments on commit 61aef37

Please sign in to comment.