diff --git a/css/kunai/site/badge-ext.scss b/css/kunai/site/badge-ext.scss index b4165b7..76c2098 100644 --- a/css/kunai/site/badge-ext.scss +++ b/css/kunai/site/badge-ext.scss @@ -17,25 +17,6 @@ main[role="main"] { span.cpp { @include cr-badge; - - &.exposition-only { - border-color: #666; - color: #666; - font-style: italic; - - i { - display: none; - } - - &::before { - @include fa-patch; - content: "\f24a"; // fa-sticky-note-o - } - - &::after { - content: "説明専用"; - } - } } } } diff --git a/css/kunai/site/sidebar-ext.scss b/css/kunai/site/sidebar-ext.scss index fcb8b55..0ac13a6 100644 --- a/css/kunai/site/sidebar-ext.scss +++ b/css/kunai/site/sidebar-ext.scss @@ -140,29 +140,6 @@ > .title > ul.badges { @include cr-badge-auto(".badge"); - - > li.badge[data-original-attr="exposition-only"] { - border-color: #666; - color: #666; - font-style: italic; - - a { - color: #666; - - i { - display: none; - } - - &::before { - @include fa-patch; - content: "\f24a"; // fa-sticky-note-o - } - } - } - - &.simple > li.badge[data-original-attr="exposition-only"] a::after { - display: block; - } } } } diff --git a/css/kunai/site/sidebar.css b/css/kunai/site/sidebar.css index 846f4fe..e6f0b15 100644 --- a/css/kunai/site/sidebar.css +++ b/css/kunai/site/sidebar.css @@ -744,7 +744,8 @@ main[role="main"] .kunai-sidebar.force-legacy { ul.others > li.other { .cr-index { ul.keys { - display: inline-block; + display: inline-flex; + flex-direction: row; padding-left: 2px; > li.key { display: inline-block; diff --git a/js/kunai/ui/badge.js b/js/kunai/ui/badge.js index 0abe2e0..1589dab 100644 --- a/js/kunai/ui/badge.js +++ b/js/kunai/ui/badge.js @@ -22,6 +22,7 @@ const sanitize = (badges) => { let deprecated_or_removed = false let cppv = null let named_version = null + let exposition_only = false for (const c of b_classes) { if (/^(?:future|archive)$/.test(c)) { named_version = c @@ -30,6 +31,11 @@ const sanitize = (badges) => { continue } + if (c === 'exposition-only') { + exposition_only = true + classes.push('exposition-only-spec') + } + const cppm = c.match(/^cpp(\d[\da-zA-Z])(.*)$/) if (!cppm) continue; @@ -55,6 +61,7 @@ const sanitize = (badges) => { const lang_path = cppv ? `/lang/cpp${cppv}` : named_version ? `/lang/${named_version}` : + exposition_only ? '/reference/exposition-only' : `/lang` const a_elem = $('', {href: `${lang_path}.html`}) .append($('')) diff --git a/package-lock.json b/package-lock.json index b90e48a..5b96bf3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "anser": "^1.4.9", "codemirror": "^5.55.0", "commonmark": "^0.29.1", - "crsearch": "cpprefjp/crsearch#cce4f38cf8e8e6710ab8d3a6e8cb308cd6e6ac13", + "crsearch": "cpprefjp/crsearch#61b8f30da8b694275957a23ca6cb8e855c7f4bf9", "font-awesome": "^4.7.0", "jquery": "^3.5.1", "normalize.css": "^8.0.1", @@ -3826,9 +3826,9 @@ } }, "node_modules/crsearch": { - "version": "3.0.26", - "resolved": "git+ssh://git@github.com/cpprefjp/crsearch.git#cce4f38cf8e8e6710ab8d3a6e8cb308cd6e6ac13", - "integrity": "sha512-QlZ3LO2oH1FTKs0u1E/Zyt6vHZGG1+ZJjLpksVqdxnNiRmoWmDBfgPM+FHp/oKzs3AXhl38GvRRh+OtDdyRpPg==", + "version": "3.0.27", + "resolved": "git+ssh://git@github.com/cpprefjp/crsearch.git#61b8f30da8b694275957a23ca6cb8e855c7f4bf9", + "integrity": "sha512-mVwNqjCeeOPYV/WPIIoz+kPm9h88i3LEF7pwCKNE4XkoxUc73LJSY0nwu1KOWQ3RZzOzAa3KD19qWVwUFnYsJw==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.10.3", @@ -14713,9 +14713,9 @@ } }, "crsearch": { - "version": "git+ssh://git@github.com/cpprefjp/crsearch.git#cce4f38cf8e8e6710ab8d3a6e8cb308cd6e6ac13", - "integrity": "sha512-QlZ3LO2oH1FTKs0u1E/Zyt6vHZGG1+ZJjLpksVqdxnNiRmoWmDBfgPM+FHp/oKzs3AXhl38GvRRh+OtDdyRpPg==", - "from": "crsearch@cpprefjp/crsearch#cce4f38cf8e8e6710ab8d3a6e8cb308cd6e6ac13", + "version": "git+ssh://git@github.com/cpprefjp/crsearch.git#61b8f30da8b694275957a23ca6cb8e855c7f4bf9", + "integrity": "sha512-mVwNqjCeeOPYV/WPIIoz+kPm9h88i3LEF7pwCKNE4XkoxUc73LJSY0nwu1KOWQ3RZzOzAa3KD19qWVwUFnYsJw==", + "from": "crsearch@cpprefjp/crsearch#61b8f30da8b694275957a23ca6cb8e855c7f4bf9", "requires": { "@babel/runtime": "^7.10.3", "font-awesome": "^4.7.0", diff --git a/package.json b/package.json index 0b5a544..e0a901e 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "anser": "^1.4.9", "codemirror": "^5.55.0", "commonmark": "^0.29.1", - "crsearch": "cpprefjp/crsearch#cce4f38cf8e8e6710ab8d3a6e8cb308cd6e6ac13", + "crsearch": "cpprefjp/crsearch#61b8f30da8b694275957a23ca6cb8e855c7f4bf9", "font-awesome": "^4.7.0", "jquery": "^3.5.1", "normalize.css": "^8.0.1",