Skip to content

Roles labels refinement #220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Mar 8, 2024
Merged

Roles labels refinement #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b27cb0b
Add padding top when wrapped
recrwplay Mar 7, 2024
a727fa5
Add dynamic
recrwplay Mar 7, 2024
601a268
padding in admonition
recrwplay Mar 7, 2024
ef073c7
Add join text
recrwplay Mar 7, 2024
8a3bb69
test dynamic label
recrwplay Mar 7, 2024
2cfa6d9
Fix logo image
recrwplay Mar 7, 2024
86d725a
Add discrete heading
recrwplay Mar 8, 2024
3564479
0.20.1
adam-cowley Mar 6, 2024
e938c65
0.21.0
adam-cowley Mar 6, 2024
5ce8ce6
0.22.0
adam-cowley Mar 6, 2024
bbab763
0.23.0
adam-cowley Mar 6, 2024
e8f6365
Use full URL for logo
adam-cowley Mar 7, 2024
3685f71
0.23.1
adam-cowley Mar 7, 2024
6bc440f
Merge branch 'master' into roles-labels-refinement
recrwplay Mar 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion preview-src/docs-roles.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -26,7 +32,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.
Expand Down
5 changes: 5 additions & 0 deletions src/css/labels.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -25,6 +29,7 @@

.header-label-container > div.labels.wrapped {
margin-left: 0;
margin-top: 0.5rem;
}

.doc > .sect-header > h1.page:first-child:has(> .labels) {
Expand Down
5 changes: 3 additions & 2 deletions src/js/60-docs-roles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions src/js/data/rolesData.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,11 @@
"labelCategory": "version",
"displayText": "Discontinued"
},
"dynamic":{
"labelCategory": "function",
"displayText": "Dynamic",
"versionText": "since"
},
"alpha":{
"labelCategory": "version",
"displayText": "Alpha"
Expand Down Expand Up @@ -184,6 +189,10 @@
"labelCategory": "environment",
"displayText": "Windows"
},
"cluster":{
"labelCategory": "function",
"displayText": "Cluster"
},
"cluster-member-core":{
"labelCategory": "function",
"displayText": "CORE"
Expand Down
12 changes: 8 additions & 4 deletions src/partials/header-content.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,26 @@
Labs
</a>
{{else if (eq page.attributes.theme "kb")}}
<img class="navbar-logo" src="https://dist.neo4j.com/wp-content/uploads/20230926084108/Logo_FullColor_RGB_TransBG.svg" alt="{{ site.title }}" />
<img class="navbar-logo" src="https://dist.neo4j.com/wp-content/uploads/20231023102534/neo4j-logo.svg" alt="{{ site.title }}" />
{{!-- <img class="navbar-logo" src="https://dist.neo4j.com/wp-content/uploads/20230926084108/Logo_FullColor_RGB_TransBG.svg" alt="{{ site.title }}" /> --}}
<a href="/developer/kb/" class="navbar-item no-left-padding page-name-white" aria-label="Knowledge Base">
Knowledge Base
</a>
{{else if (eq page.attributes.theme "training")}}
<img class="navbar-logo" src="https://dist.neo4j.com/wp-content/uploads/20230926084108/Logo_FullColor_RGB_TransBG.svg" alt="{{ site.title }}" />
<img class="navbar-logo" src="https://dist.neo4j.com/wp-content/uploads/20231023102534/neo4j-logo.svg" alt="{{ site.title }}" />
{{!-- <img class="navbar-logo" src="https://dist.neo4j.com/wp-content/uploads/20230926084108/Logo_FullColor_RGB_TransBG.svg" alt="{{ site.title }}" /> --}}
<a href="/graphacademy/online-training/" class="navbar-item no-left-padding page-name-white" aria-label="GraphAcademy">
GraphAcademy
</a>
{{else if (eq page.attributes.theme "graphgists")}}
<img class="navbar-logo" src="https://dist.neo4j.com/wp-content/uploads/20230926084108/Logo_FullColor_RGB_TransBG.svg" alt="{{ site.title }}" />
<img class="navbar-logo" src="https://dist.neo4j.com/wp-content/uploads/20231023102534/neo4j-logo.svg" alt="{{ site.title }}" />
{{!-- <img class="navbar-logo" src="https://dist.neo4j.com/wp-content/uploads/20230926084108/Logo_FullColor_RGB_TransBG.svg" alt="{{ site.title }}" /> --}}
<a href="/graphgists/" class="navbar-item no-left-padding page-name-white" aria-label="GraphGists">
GraphGists
</a>
{{else}}
<img class="navbar-logo" src="https://dist.neo4j.com/wp-content/uploads/20230926084108/Logo_FullColor_RGB_TransBG.svg" alt="{{ site.title }}" />
<img class="navbar-logo" src="https://dist.neo4j.com/wp-content/uploads/20231023102534/neo4j-logo.svg" alt="{{ site.title }}" />
{{!-- <img class="navbar-logo" src="https://dist.neo4j.com/wp-content/uploads/20230926084108/Logo_FullColor_RGB_TransBG.svg" alt="{{ site.title }}" /> --}}
<a href="/developer/" class="navbar-item no-left-padding page-name-white" aria-label="Developer Guides">
Developer
</a>
Expand Down