From b27cb0b85f3fc80f9a1ea93b6fbc257d32741424 Mon Sep 17 00:00:00 2001 From: Neil Dewhurst Date: Thu, 7 Mar 2024 09:42:05 +0000 Subject: [PATCH 01/13] Add padding top when wrapped --- src/css/labels.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/css/labels.css b/src/css/labels.css index 014aa938..10bebc4f 100644 --- a/src/css/labels.css +++ b/src/css/labels.css @@ -25,6 +25,7 @@ .header-label-container > div.labels.wrapped { margin-left: 0; + margin-top: 0.5rem; } .doc > .sect-header > h1.page:first-child:has(> .labels) { From a727fa5be2afc19e7eaa15798e2d6fc5aaa185c5 Mon Sep 17 00:00:00 2001 From: Neil Dewhurst Date: Thu, 7 Mar 2024 09:43:07 +0000 Subject: [PATCH 02/13] Add dynamic --- src/js/data/rolesData.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/js/data/rolesData.json b/src/js/data/rolesData.json index 176257f3..58887fdf 100644 --- a/src/js/data/rolesData.json +++ b/src/js/data/rolesData.json @@ -86,6 +86,10 @@ "labelCategory": "version", "displayText": "Discontinued" }, + "dynamic":{ + "labelCategory": "function", + "displayText": "Dynamic" + }, "alpha":{ "labelCategory": "version", "displayText": "Alpha" From 601a2686d70393f2b30af358f8c91c42843b33f6 Mon Sep 17 00:00:00 2001 From: Neil Dewhurst Date: Thu, 7 Mar 2024 16:47:56 +0000 Subject: [PATCH 03/13] padding in admonition --- src/css/labels.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/css/labels.css b/src/css/labels.css index 10bebc4f..87d2ad6f 100644 --- a/src/css/labels.css +++ b/src/css/labels.css @@ -10,6 +10,10 @@ flex-wrap: wrap; } +.admonitionblock > div.labels { + padding: 1rem 1rem 0.75rem; +} + .header-label-container > div.labels { display: flex; align-self: center; From ef073c76a9ecd9b6147cfbec047d6071cdd04e25 Mon Sep 17 00:00:00 2001 From: Neil Dewhurst Date: Thu, 7 Mar 2024 16:48:25 +0000 Subject: [PATCH 04/13] Add join text --- src/js/60-docs-roles.js | 5 +++-- src/js/data/rolesData.json | 7 ++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/js/60-docs-roles.js b/src/js/60-docs-roles.js index 8189e7c7..4b6c867f 100644 --- a/src/js/60-docs-roles.js +++ b/src/js/60-docs-roles.js @@ -44,9 +44,10 @@ document.addEventListener('DOMContentLoaded', function () { } // get version number for version labels - if (rolesData[label].labelCategory === 'version' && labelParts[1]) { + if ((rolesData[label].labelCategory === 'version' || rolesData[label].versionText) && labelParts[1]) { labelDetails.data.version = labelParts[1] - labelDetails.text += ' in ' + labelDetails.data.version + const joinText = rolesData[label].versionText ? rolesData[label].versionText : 'in' + labelDetails.text = [labelDetails.text, joinText, labelDetails.data.version].join(' ') } return labelDetails diff --git a/src/js/data/rolesData.json b/src/js/data/rolesData.json index 58887fdf..f71f2486 100644 --- a/src/js/data/rolesData.json +++ b/src/js/data/rolesData.json @@ -88,7 +88,8 @@ }, "dynamic":{ "labelCategory": "function", - "displayText": "Dynamic" + "displayText": "Dynamic", + "versionText": "since" }, "alpha":{ "labelCategory": "version", @@ -188,6 +189,10 @@ "labelCategory": "environment", "displayText": "Windows" }, + "cluster":{ + "labelCategory": "function", + "displayText": "Cluster" + }, "cluster-member-core":{ "labelCategory": "function", "displayText": "CORE" From 8a3bb69475f67090a61b293b3b53785262a235c8 Mon Sep 17 00:00:00 2001 From: Neil Dewhurst Date: Thu, 7 Mar 2024 16:48:35 +0000 Subject: [PATCH 05/13] test dynamic label --- preview-src/docs-roles.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/preview-src/docs-roles.adoc b/preview-src/docs-roles.adoc index 1fb6d250..818f0cb7 100644 --- a/preview-src/docs-roles.adoc +++ b/preview-src/docs-roles.adoc @@ -26,7 +26,7 @@ Lorem ipsum dolor sit Open blocks can be used to mark multiple paragraphs within a section. -[role=label--new-5.17] +[role=label--dynamic-5.17] -- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris eget leo nunc, nec tempus mi? Curabitur id nisl mi, ut vulputate urna. From 2cfa6d9785d6de80b7bf90a9f3705e264ef344d3 Mon Sep 17 00:00:00 2001 From: Neil Dewhurst Date: Thu, 7 Mar 2024 17:24:58 +0000 Subject: [PATCH 06/13] Fix logo image --- src/partials/header-content.hbs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/partials/header-content.hbs b/src/partials/header-content.hbs index 1787ace3..11ed95ec 100644 --- a/src/partials/header-content.hbs +++ b/src/partials/header-content.hbs @@ -22,22 +22,22 @@ Labs {{else if (eq page.attributes.theme "kb")}} - + Knowledge Base {{else if (eq page.attributes.theme "training")}} - + GraphAcademy {{else if (eq page.attributes.theme "graphgists")}} - + GraphGists {{else}} - + Developer From 86d725ac1cfcdc18f0ed306a660f3177d32ab8fb Mon Sep 17 00:00:00 2001 From: Neil Dewhurst Date: Fri, 8 Mar 2024 12:08:23 +0000 Subject: [PATCH 07/13] Add discrete heading --- preview-src/docs-roles.adoc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/preview-src/docs-roles.adoc b/preview-src/docs-roles.adoc index 818f0cb7..3dd9d883 100644 --- a/preview-src/docs-roles.adoc +++ b/preview-src/docs-roles.adoc @@ -18,6 +18,12 @@ Flags sections as Not Available on Aura, Aura DB Enterprise, Enterprise Edition, Blocks with the appropriate roles have labels added. +[discrete] +[role="label--new-5.17 label--enterprise-edition"] +=== (Discrete) H3 AuraDB Enterprise AND Not on Aura + +Lorem ipsum dolor sit + [role=label--aura-db-enterprise label--not-on-aura] === H3 AuraDB Enterprise AND Not on Aura From 3564479a404c09508e13af594854462dcb44c39f Mon Sep 17 00:00:00 2001 From: Adam Cowley Date: Wed, 6 Mar 2024 15:03:57 +0000 Subject: [PATCH 08/13] 0.20.1 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index bf97235d..6bcdf98f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@neo4j/docs-ui", - "version": "0.20.0", + "version": "0.20.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@neo4j/docs-ui", - "version": "0.20.0", + "version": "0.20.1", "license": "MPL-2.0", "dependencies": { "@antora/cli": "^2.3.3", diff --git a/package.json b/package.json index e147d466..bbb22f70 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@neo4j/docs-ui", - "version": "0.20.0", + "version": "0.20.1", "description": "Produces the UI bundle for the Neo4j documentation site", "homepage": "https://github.com/neo4j-documentation/docs-ui", "license": "MPL-2.0", From e938c652875cb2784c4da7b84e42a0ad06008ff7 Mon Sep 17 00:00:00 2001 From: Adam Cowley Date: Wed, 6 Mar 2024 15:05:45 +0000 Subject: [PATCH 09/13] 0.21.0 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6bcdf98f..102b32ee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@neo4j/docs-ui", - "version": "0.20.1", + "version": "0.21.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@neo4j/docs-ui", - "version": "0.20.1", + "version": "0.21.0", "license": "MPL-2.0", "dependencies": { "@antora/cli": "^2.3.3", diff --git a/package.json b/package.json index bbb22f70..a36f4e89 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@neo4j/docs-ui", - "version": "0.20.1", + "version": "0.21.0", "description": "Produces the UI bundle for the Neo4j documentation site", "homepage": "https://github.com/neo4j-documentation/docs-ui", "license": "MPL-2.0", From 5ce8ce61d8fb4747c6823ce5254c137516a8d09a Mon Sep 17 00:00:00 2001 From: Adam Cowley Date: Wed, 6 Mar 2024 15:06:57 +0000 Subject: [PATCH 10/13] 0.22.0 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 102b32ee..2fc8927d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@neo4j/docs-ui", - "version": "0.21.0", + "version": "0.22.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@neo4j/docs-ui", - "version": "0.21.0", + "version": "0.22.0", "license": "MPL-2.0", "dependencies": { "@antora/cli": "^2.3.3", diff --git a/package.json b/package.json index a36f4e89..5397c5e6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@neo4j/docs-ui", - "version": "0.21.0", + "version": "0.22.0", "description": "Produces the UI bundle for the Neo4j documentation site", "homepage": "https://github.com/neo4j-documentation/docs-ui", "license": "MPL-2.0", From bbab7630b53de18726969476a1d93811d8efad07 Mon Sep 17 00:00:00 2001 From: Adam Cowley Date: Wed, 6 Mar 2024 15:07:02 +0000 Subject: [PATCH 11/13] 0.23.0 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2fc8927d..e51f4414 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@neo4j/docs-ui", - "version": "0.22.0", + "version": "0.23.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@neo4j/docs-ui", - "version": "0.22.0", + "version": "0.23.0", "license": "MPL-2.0", "dependencies": { "@antora/cli": "^2.3.3", diff --git a/package.json b/package.json index 5397c5e6..484f05de 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@neo4j/docs-ui", - "version": "0.22.0", + "version": "0.23.0", "description": "Produces the UI bundle for the Neo4j documentation site", "homepage": "https://github.com/neo4j-documentation/docs-ui", "license": "MPL-2.0", From e8f63650a5fc2cc621e7d895f6a6bed0434072a7 Mon Sep 17 00:00:00 2001 From: Adam Cowley Date: Thu, 7 Mar 2024 15:22:14 +0000 Subject: [PATCH 12/13] Use full URL for logo --- src/partials/header-content.hbs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/partials/header-content.hbs b/src/partials/header-content.hbs index 11ed95ec..e5571a0d 100644 --- a/src/partials/header-content.hbs +++ b/src/partials/header-content.hbs @@ -15,7 +15,7 @@ Cypher Cheat Sheet - + {{else if (eq page.attributes.theme "labs")}} @@ -23,21 +23,25 @@ {{else if (eq page.attributes.theme "kb")}} + {{!-- --}} Knowledge Base {{else if (eq page.attributes.theme "training")}} + {{!-- --}} GraphAcademy {{else if (eq page.attributes.theme "graphgists")}} + {{!-- --}} GraphGists {{else}} + {{!-- --}} Developer From 3685f7161542e417e176f7ebea8fa7a0f6de5749 Mon Sep 17 00:00:00 2001 From: Adam Cowley Date: Thu, 7 Mar 2024 15:22:23 +0000 Subject: [PATCH 13/13] 0.23.1 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index e51f4414..d626fff0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@neo4j/docs-ui", - "version": "0.23.0", + "version": "0.23.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@neo4j/docs-ui", - "version": "0.23.0", + "version": "0.23.1", "license": "MPL-2.0", "dependencies": { "@antora/cli": "^2.3.3", diff --git a/package.json b/package.json index 484f05de..51bc943f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@neo4j/docs-ui", - "version": "0.23.0", + "version": "0.23.1", "description": "Produces the UI bundle for the Neo4j documentation site", "homepage": "https://github.com/neo4j-documentation/docs-ui", "license": "MPL-2.0",