diff --git a/accessibility-checker-engine/help-v4/common/help.css b/accessibility-checker-engine/help-v4/common/help.css index d93818bf0..1f263f4a7 100644 --- a/accessibility-checker-engine/help-v4/common/help.css +++ b/accessibility-checker-engine/help-v4/common/help.css @@ -10,13 +10,15 @@ See the License for the specific language governing permissions and limitations under the License. *****************************************************************************/ +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css"); @import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/themes.css"); bx-list-item>code, p>code, td>code { - background-color: #e0e0e0; + background-color: var(--cds-layer); border-radius: 4px; bottom: 0.0625em; - color: #161616; + color: var(--cds-text-primary); display: inline; font-size: .75rem; font-size: .875em; @@ -27,39 +29,55 @@ bx-list-item>code, p>code, td>code { position: relative; } +.toolhelp a { + color: var(--cds-link-primary) +} + .toolHelp .toolMain p ~ p { margin-top: .5rem; } .toolHelp .toolHead h3 { - font-size: 20px; - line-height: 28px; + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 600; + font-size: 16px; + line-height: 24px; } .toolHelp .toolHead .issueLevel { - font-weight: 600; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolHead p { +.toolHelp .toolHead #ruleMessage { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; + margin-top: .5rem; + margin-bottom: .5rem; } -/* productive-heading-03 */ -.toolHelp .toolMain h3 { - font-size: 20px; - line-height: 28px; +.toolHelp .toolHead #groupLabel { + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolMain p { +/* productive-heading-03 */ +.toolHelp .toolMain h3 { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; } .toolHelp .toolSide .bx--list__item { @@ -70,29 +88,44 @@ bx-list-item>code, p>code, td>code { /* productive-heading-03 */ .toolHelp .toolSide h3 { - font-size: 20px; - line-height: 28px; - font-weight: 400; -} -.toolHelp .toolSide p { - font-size: 20px; - line-height: 28px; - font-weight: 400; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; + font-size: 16px; + line-height: 24px; } -html, body, .toolHelp .bx--row:nth-child(2) { - height: 100%; +@media (min-width: 42rem) { + html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; + } } - body { font-family: 'IBM Plex Sans', sans-serif; + color: var(--cds-text-primary); + background-color: var(--cds-ui-background); } .toolHelp { padding: 0px; margin: 0px; max-width: 100%; - background-color: #be95ff; + background-color: #e8daff; +} + +.toolHelp p { + font-family: 'IBM Plex Sans'; +font-style: normal; +font-weight: 400; +font-size: 14px; +line-height: 20px; +/* or 143% */ + +letter-spacing: 0.16px; +} + +.dds-theme-zone-g90 .toolHelp { + background-color: #31135E; } .toolHelp .bx--row { @@ -104,9 +137,10 @@ body { padding-top: 1rem; } .toolHelp .toolMain { - background-color: #f4f4f4; + background-color: var(--cds-ui-background); padding-top: 1rem; padding-bottom: 1rem; + border-top: solid var(--cds-text-primary) 1px; } .toolHelp .toolMain h2 { margin-top: 32px; @@ -122,9 +156,16 @@ body { .toolHelp .toolSide { padding: 16px 16px 16px 32px; - background-color: #e8daff; - color: black; + background-color: var(--cds-ui-background);; + color: var(--cds-text-primary); + border-top: solid var(--cds-text-primary) 1px; +} +@media (min-width: 42rem) { + .toolHelp .toolSide { + border-left: solid var(--cds-text-primary) 1px; + } } + .toolHelp .toolSide h2 { margin-top: 32px; margin-bottom: 0.5rem; diff --git a/accessibility-checker-engine/help-v4/common/help.js b/accessibility-checker-engine/help-v4/common/help.js index 17c597f08..793ee267d 100644 --- a/accessibility-checker-engine/help-v4/common/help.js +++ b/accessibility-checker-engine/help-v4/common/help.js @@ -49,6 +49,10 @@ class HTMLBaseElement extends HTMLElement { } } +function isDarkMode() { + return (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches); +} + customElements.define( "mark-down", class extends HTMLBaseElement { @@ -86,7 +90,6 @@ customElements.define( const shadowRoot = this; let snip = document.createElement("bx-code-snippet"); snip.setAttribute("type", "multi"); - snip.setAttribute("color-scheme", "light"); snip.innerHTML = oldCode.replace(/ - + - + `; if (val === "Needs review") icon = ``; if (val === "Recommendation") icon = ``; - document.querySelector("#locLevel").innerHTML = `
${icon} ${val}
`; + let level = document.querySelector("#locLevel"); + let parent = level.parentElement; + level = parent.removeChild(level); + parent.insertBefore(level, parent.firstElementChild); + document.querySelector("#locLevel").innerHTML = `
${val}
`; } if (RULE_ID) { document.querySelector("#ruleInfo").innerHTML = `

Rule ID: ${RULE_ID}${ruleInfo.reasonId ? `
Reason ID: ${ruleInfo.reasonId}

` : ""}`; @@ -198,5 +212,12 @@ window.addEventListener("DOMContentLoaded", (evt) => { ruleInfo = JSON.parse(decodeURIComponent(window.location.hash.substring(1))); } updateWithRuleInfo(ruleInfo); + + if (isDarkMode()) { + document.body.setAttribute("class", "dds-theme-zone-g90"); + } else { + document.body.setAttribute("class", "dds-theme-zone-g10"); + } + }) diff --git a/rule-server/src/static/archives/2020.04.02/doc/common/help.css b/rule-server/src/static/archives/2020.04.02/doc/common/help.css index eea3893a2..1f263f4a7 100644 --- a/rule-server/src/static/archives/2020.04.02/doc/common/help.css +++ b/rule-server/src/static/archives/2020.04.02/doc/common/help.css @@ -10,37 +10,74 @@ See the License for the specific language governing permissions and limitations under the License. *****************************************************************************/ +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css"); @import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/themes.css"); + +bx-list-item>code, p>code, td>code { + background-color: var(--cds-layer); + border-radius: 4px; + bottom: 0.0625em; + color: var(--cds-text-primary); + display: inline; + font-size: .75rem; + font-size: .875em; + font-weight: 400; + letter-spacing: .32px; + line-height: 1.33333; + padding: 0 0.5em; + position: relative; +} + +.toolhelp a { + color: var(--cds-link-primary) +} + +.toolHelp .toolMain p ~ p { + margin-top: .5rem; +} .toolHelp .toolHead h3 { - font-size: 20px; - line-height: 28px; + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 600; + font-size: 16px; + line-height: 24px; } .toolHelp .toolHead .issueLevel { - font-weight: 600; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolHead p { +.toolHelp .toolHead #ruleMessage { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; + margin-top: .5rem; + margin-bottom: .5rem; } -/* productive-heading-03 */ -.toolHelp .toolMain h3 { - font-size: 20px; - line-height: 28px; +.toolHelp .toolHead #groupLabel { + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolMain p { +/* productive-heading-03 */ +.toolHelp .toolMain h3 { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; } .toolHelp .toolSide .bx--list__item { @@ -51,29 +88,44 @@ /* productive-heading-03 */ .toolHelp .toolSide h3 { - font-size: 20px; - line-height: 28px; - font-weight: 400; -} -.toolHelp .toolSide p { - font-size: 20px; - line-height: 28px; - font-weight: 400; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; + font-size: 16px; + line-height: 24px; } -html, body, .toolHelp .bx--row:nth-child(2) { - height: 100%; +@media (min-width: 42rem) { + html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; + } } - body { font-family: 'IBM Plex Sans', sans-serif; + color: var(--cds-text-primary); + background-color: var(--cds-ui-background); } .toolHelp { padding: 0px; margin: 0px; max-width: 100%; - background-color: #be95ff; + background-color: #e8daff; +} + +.toolHelp p { + font-family: 'IBM Plex Sans'; +font-style: normal; +font-weight: 400; +font-size: 14px; +line-height: 20px; +/* or 143% */ + +letter-spacing: 0.16px; +} + +.dds-theme-zone-g90 .toolHelp { + background-color: #31135E; } .toolHelp .bx--row { @@ -85,9 +137,10 @@ body { padding-top: 1rem; } .toolHelp .toolMain { - background-color: #f4f4f4; + background-color: var(--cds-ui-background); padding-top: 1rem; padding-bottom: 1rem; + border-top: solid var(--cds-text-primary) 1px; } .toolHelp .toolMain h2 { margin-top: 32px; @@ -103,9 +156,16 @@ body { .toolHelp .toolSide { padding: 16px 16px 16px 32px; - background-color: #e8daff; - color: black; + background-color: var(--cds-ui-background);; + color: var(--cds-text-primary); + border-top: solid var(--cds-text-primary) 1px; } +@media (min-width: 42rem) { + .toolHelp .toolSide { + border-left: solid var(--cds-text-primary) 1px; + } +} + .toolHelp .toolSide h2 { margin-top: 32px; margin-bottom: 0.5rem; diff --git a/rule-server/src/static/archives/2020.04.02/doc/common/help.js b/rule-server/src/static/archives/2020.04.02/doc/common/help.js index 6bf4ebc24..793ee267d 100644 --- a/rule-server/src/static/archives/2020.04.02/doc/common/help.js +++ b/rule-server/src/static/archives/2020.04.02/doc/common/help.js @@ -49,6 +49,10 @@ class HTMLBaseElement extends HTMLElement { } } +function isDarkMode() { + return (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches); +} + customElements.define( "mark-down", class extends HTMLBaseElement { @@ -86,7 +90,6 @@ customElements.define( const shadowRoot = this; let snip = document.createElement("bx-code-snippet"); snip.setAttribute("type", "multi"); - snip.setAttribute("color-scheme", "light"); snip.innerHTML = oldCode.replace(/ msgArgs[matchedNum]); + let ruleMessage = ruleInfo.message.replace(/\{(\d+)\}/g, (matchedStr, matchedNum, matchedIndex) => ruleInfo.msgArgs[matchedNum]); document.querySelector("#ruleMessage").innerHTML = ruleMessage.replace(/&/g, "&").replace(//g, ">") } setTimeout(() => { @@ -134,29 +137,36 @@ function updateWithRuleInfo(ruleInfo) { if (val === "Violation") icon = ``; if (val === "Needs review") icon = ``; if (val === "Recommendation") icon = ``; - document.querySelector("#locLevel").innerHTML = `
${icon} ${val}
`; + let level = document.querySelector("#locLevel"); + let parent = level.parentElement; + level = parent.removeChild(level); + parent.insertBefore(level, parent.firstElementChild); + document.querySelector("#locLevel").innerHTML = `
${val}
`; } if (RULE_ID) { document.querySelector("#ruleInfo").innerHTML = `

Rule ID: ${RULE_ID}${ruleInfo.reasonId ? `
Reason ID: ${ruleInfo.reasonId}

` : ""}`; @@ -198,5 +212,12 @@ window.addEventListener("DOMContentLoaded", (evt) => { ruleInfo = JSON.parse(decodeURIComponent(window.location.hash.substring(1))); } updateWithRuleInfo(ruleInfo); + + if (isDarkMode()) { + document.body.setAttribute("class", "dds-theme-zone-g90"); + } else { + document.body.setAttribute("class", "dds-theme-zone-g10"); + } + }) diff --git a/rule-server/src/static/archives/2020.04.02/doc/common/rules.css b/rule-server/src/static/archives/2020.04.02/doc/common/rules.css new file mode 100644 index 000000000..515c8a230 --- /dev/null +++ b/rule-server/src/static/archives/2020.04.02/doc/common/rules.css @@ -0,0 +1,29 @@ +/****************************************************************************** + Copyright:: 2022- IBM, Inc + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + *****************************************************************************/ +@import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); + +html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; +} + +body { + font-family: 'IBM Plex Sans', sans-serif; + padding: 1rem; +} + +h2 { + margin-top: 1rem; + font-size: 16px; + line-height: 24px; + font-weight: 600; +} diff --git a/rule-server/src/static/archives/2020.05.12/doc/common/help.css b/rule-server/src/static/archives/2020.05.12/doc/common/help.css index eea3893a2..1f263f4a7 100644 --- a/rule-server/src/static/archives/2020.05.12/doc/common/help.css +++ b/rule-server/src/static/archives/2020.05.12/doc/common/help.css @@ -10,37 +10,74 @@ See the License for the specific language governing permissions and limitations under the License. *****************************************************************************/ +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css"); @import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/themes.css"); + +bx-list-item>code, p>code, td>code { + background-color: var(--cds-layer); + border-radius: 4px; + bottom: 0.0625em; + color: var(--cds-text-primary); + display: inline; + font-size: .75rem; + font-size: .875em; + font-weight: 400; + letter-spacing: .32px; + line-height: 1.33333; + padding: 0 0.5em; + position: relative; +} + +.toolhelp a { + color: var(--cds-link-primary) +} + +.toolHelp .toolMain p ~ p { + margin-top: .5rem; +} .toolHelp .toolHead h3 { - font-size: 20px; - line-height: 28px; + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 600; + font-size: 16px; + line-height: 24px; } .toolHelp .toolHead .issueLevel { - font-weight: 600; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolHead p { +.toolHelp .toolHead #ruleMessage { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; + margin-top: .5rem; + margin-bottom: .5rem; } -/* productive-heading-03 */ -.toolHelp .toolMain h3 { - font-size: 20px; - line-height: 28px; +.toolHelp .toolHead #groupLabel { + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolMain p { +/* productive-heading-03 */ +.toolHelp .toolMain h3 { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; } .toolHelp .toolSide .bx--list__item { @@ -51,29 +88,44 @@ /* productive-heading-03 */ .toolHelp .toolSide h3 { - font-size: 20px; - line-height: 28px; - font-weight: 400; -} -.toolHelp .toolSide p { - font-size: 20px; - line-height: 28px; - font-weight: 400; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; + font-size: 16px; + line-height: 24px; } -html, body, .toolHelp .bx--row:nth-child(2) { - height: 100%; +@media (min-width: 42rem) { + html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; + } } - body { font-family: 'IBM Plex Sans', sans-serif; + color: var(--cds-text-primary); + background-color: var(--cds-ui-background); } .toolHelp { padding: 0px; margin: 0px; max-width: 100%; - background-color: #be95ff; + background-color: #e8daff; +} + +.toolHelp p { + font-family: 'IBM Plex Sans'; +font-style: normal; +font-weight: 400; +font-size: 14px; +line-height: 20px; +/* or 143% */ + +letter-spacing: 0.16px; +} + +.dds-theme-zone-g90 .toolHelp { + background-color: #31135E; } .toolHelp .bx--row { @@ -85,9 +137,10 @@ body { padding-top: 1rem; } .toolHelp .toolMain { - background-color: #f4f4f4; + background-color: var(--cds-ui-background); padding-top: 1rem; padding-bottom: 1rem; + border-top: solid var(--cds-text-primary) 1px; } .toolHelp .toolMain h2 { margin-top: 32px; @@ -103,9 +156,16 @@ body { .toolHelp .toolSide { padding: 16px 16px 16px 32px; - background-color: #e8daff; - color: black; + background-color: var(--cds-ui-background);; + color: var(--cds-text-primary); + border-top: solid var(--cds-text-primary) 1px; } +@media (min-width: 42rem) { + .toolHelp .toolSide { + border-left: solid var(--cds-text-primary) 1px; + } +} + .toolHelp .toolSide h2 { margin-top: 32px; margin-bottom: 0.5rem; diff --git a/rule-server/src/static/archives/2020.05.12/doc/common/help.js b/rule-server/src/static/archives/2020.05.12/doc/common/help.js index 6bf4ebc24..793ee267d 100644 --- a/rule-server/src/static/archives/2020.05.12/doc/common/help.js +++ b/rule-server/src/static/archives/2020.05.12/doc/common/help.js @@ -49,6 +49,10 @@ class HTMLBaseElement extends HTMLElement { } } +function isDarkMode() { + return (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches); +} + customElements.define( "mark-down", class extends HTMLBaseElement { @@ -86,7 +90,6 @@ customElements.define( const shadowRoot = this; let snip = document.createElement("bx-code-snippet"); snip.setAttribute("type", "multi"); - snip.setAttribute("color-scheme", "light"); snip.innerHTML = oldCode.replace(/ msgArgs[matchedNum]); + let ruleMessage = ruleInfo.message.replace(/\{(\d+)\}/g, (matchedStr, matchedNum, matchedIndex) => ruleInfo.msgArgs[matchedNum]); document.querySelector("#ruleMessage").innerHTML = ruleMessage.replace(/&/g, "&").replace(//g, ">") } setTimeout(() => { @@ -134,29 +137,36 @@ function updateWithRuleInfo(ruleInfo) { if (val === "Violation") icon = ``; if (val === "Needs review") icon = ``; if (val === "Recommendation") icon = ``; - document.querySelector("#locLevel").innerHTML = `
${icon} ${val}
`; + let level = document.querySelector("#locLevel"); + let parent = level.parentElement; + level = parent.removeChild(level); + parent.insertBefore(level, parent.firstElementChild); + document.querySelector("#locLevel").innerHTML = `
${val}
`; } if (RULE_ID) { document.querySelector("#ruleInfo").innerHTML = `

Rule ID: ${RULE_ID}${ruleInfo.reasonId ? `
Reason ID: ${ruleInfo.reasonId}

` : ""}`; @@ -198,5 +212,12 @@ window.addEventListener("DOMContentLoaded", (evt) => { ruleInfo = JSON.parse(decodeURIComponent(window.location.hash.substring(1))); } updateWithRuleInfo(ruleInfo); + + if (isDarkMode()) { + document.body.setAttribute("class", "dds-theme-zone-g90"); + } else { + document.body.setAttribute("class", "dds-theme-zone-g10"); + } + }) diff --git a/rule-server/src/static/archives/2020.05.12/doc/common/rules.css b/rule-server/src/static/archives/2020.05.12/doc/common/rules.css new file mode 100644 index 000000000..515c8a230 --- /dev/null +++ b/rule-server/src/static/archives/2020.05.12/doc/common/rules.css @@ -0,0 +1,29 @@ +/****************************************************************************** + Copyright:: 2022- IBM, Inc + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + *****************************************************************************/ +@import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); + +html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; +} + +body { + font-family: 'IBM Plex Sans', sans-serif; + padding: 1rem; +} + +h2 { + margin-top: 1rem; + font-size: 16px; + line-height: 24px; + font-weight: 600; +} diff --git a/rule-server/src/static/archives/2020.06.03/doc/common/help.css b/rule-server/src/static/archives/2020.06.03/doc/common/help.css index eea3893a2..1f263f4a7 100644 --- a/rule-server/src/static/archives/2020.06.03/doc/common/help.css +++ b/rule-server/src/static/archives/2020.06.03/doc/common/help.css @@ -10,37 +10,74 @@ See the License for the specific language governing permissions and limitations under the License. *****************************************************************************/ +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css"); @import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/themes.css"); + +bx-list-item>code, p>code, td>code { + background-color: var(--cds-layer); + border-radius: 4px; + bottom: 0.0625em; + color: var(--cds-text-primary); + display: inline; + font-size: .75rem; + font-size: .875em; + font-weight: 400; + letter-spacing: .32px; + line-height: 1.33333; + padding: 0 0.5em; + position: relative; +} + +.toolhelp a { + color: var(--cds-link-primary) +} + +.toolHelp .toolMain p ~ p { + margin-top: .5rem; +} .toolHelp .toolHead h3 { - font-size: 20px; - line-height: 28px; + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 600; + font-size: 16px; + line-height: 24px; } .toolHelp .toolHead .issueLevel { - font-weight: 600; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolHead p { +.toolHelp .toolHead #ruleMessage { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; + margin-top: .5rem; + margin-bottom: .5rem; } -/* productive-heading-03 */ -.toolHelp .toolMain h3 { - font-size: 20px; - line-height: 28px; +.toolHelp .toolHead #groupLabel { + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolMain p { +/* productive-heading-03 */ +.toolHelp .toolMain h3 { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; } .toolHelp .toolSide .bx--list__item { @@ -51,29 +88,44 @@ /* productive-heading-03 */ .toolHelp .toolSide h3 { - font-size: 20px; - line-height: 28px; - font-weight: 400; -} -.toolHelp .toolSide p { - font-size: 20px; - line-height: 28px; - font-weight: 400; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; + font-size: 16px; + line-height: 24px; } -html, body, .toolHelp .bx--row:nth-child(2) { - height: 100%; +@media (min-width: 42rem) { + html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; + } } - body { font-family: 'IBM Plex Sans', sans-serif; + color: var(--cds-text-primary); + background-color: var(--cds-ui-background); } .toolHelp { padding: 0px; margin: 0px; max-width: 100%; - background-color: #be95ff; + background-color: #e8daff; +} + +.toolHelp p { + font-family: 'IBM Plex Sans'; +font-style: normal; +font-weight: 400; +font-size: 14px; +line-height: 20px; +/* or 143% */ + +letter-spacing: 0.16px; +} + +.dds-theme-zone-g90 .toolHelp { + background-color: #31135E; } .toolHelp .bx--row { @@ -85,9 +137,10 @@ body { padding-top: 1rem; } .toolHelp .toolMain { - background-color: #f4f4f4; + background-color: var(--cds-ui-background); padding-top: 1rem; padding-bottom: 1rem; + border-top: solid var(--cds-text-primary) 1px; } .toolHelp .toolMain h2 { margin-top: 32px; @@ -103,9 +156,16 @@ body { .toolHelp .toolSide { padding: 16px 16px 16px 32px; - background-color: #e8daff; - color: black; + background-color: var(--cds-ui-background);; + color: var(--cds-text-primary); + border-top: solid var(--cds-text-primary) 1px; } +@media (min-width: 42rem) { + .toolHelp .toolSide { + border-left: solid var(--cds-text-primary) 1px; + } +} + .toolHelp .toolSide h2 { margin-top: 32px; margin-bottom: 0.5rem; diff --git a/rule-server/src/static/archives/2020.06.03/doc/common/help.js b/rule-server/src/static/archives/2020.06.03/doc/common/help.js index 6bf4ebc24..793ee267d 100644 --- a/rule-server/src/static/archives/2020.06.03/doc/common/help.js +++ b/rule-server/src/static/archives/2020.06.03/doc/common/help.js @@ -49,6 +49,10 @@ class HTMLBaseElement extends HTMLElement { } } +function isDarkMode() { + return (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches); +} + customElements.define( "mark-down", class extends HTMLBaseElement { @@ -86,7 +90,6 @@ customElements.define( const shadowRoot = this; let snip = document.createElement("bx-code-snippet"); snip.setAttribute("type", "multi"); - snip.setAttribute("color-scheme", "light"); snip.innerHTML = oldCode.replace(/ msgArgs[matchedNum]); + let ruleMessage = ruleInfo.message.replace(/\{(\d+)\}/g, (matchedStr, matchedNum, matchedIndex) => ruleInfo.msgArgs[matchedNum]); document.querySelector("#ruleMessage").innerHTML = ruleMessage.replace(/&/g, "&").replace(//g, ">") } setTimeout(() => { @@ -134,29 +137,36 @@ function updateWithRuleInfo(ruleInfo) { if (val === "Violation") icon = ``; if (val === "Needs review") icon = ``; if (val === "Recommendation") icon = ``; - document.querySelector("#locLevel").innerHTML = `
${icon} ${val}
`; + let level = document.querySelector("#locLevel"); + let parent = level.parentElement; + level = parent.removeChild(level); + parent.insertBefore(level, parent.firstElementChild); + document.querySelector("#locLevel").innerHTML = `
${val}
`; } if (RULE_ID) { document.querySelector("#ruleInfo").innerHTML = `

Rule ID: ${RULE_ID}${ruleInfo.reasonId ? `
Reason ID: ${ruleInfo.reasonId}

` : ""}`; @@ -198,5 +212,12 @@ window.addEventListener("DOMContentLoaded", (evt) => { ruleInfo = JSON.parse(decodeURIComponent(window.location.hash.substring(1))); } updateWithRuleInfo(ruleInfo); + + if (isDarkMode()) { + document.body.setAttribute("class", "dds-theme-zone-g90"); + } else { + document.body.setAttribute("class", "dds-theme-zone-g10"); + } + }) diff --git a/rule-server/src/static/archives/2020.06.03/doc/common/rules.css b/rule-server/src/static/archives/2020.06.03/doc/common/rules.css new file mode 100644 index 000000000..515c8a230 --- /dev/null +++ b/rule-server/src/static/archives/2020.06.03/doc/common/rules.css @@ -0,0 +1,29 @@ +/****************************************************************************** + Copyright:: 2022- IBM, Inc + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + *****************************************************************************/ +@import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); + +html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; +} + +body { + font-family: 'IBM Plex Sans', sans-serif; + padding: 1rem; +} + +h2 { + margin-top: 1rem; + font-size: 16px; + line-height: 24px; + font-weight: 600; +} diff --git a/rule-server/src/static/archives/2020.06.18/doc/common/help.css b/rule-server/src/static/archives/2020.06.18/doc/common/help.css index eea3893a2..1f263f4a7 100644 --- a/rule-server/src/static/archives/2020.06.18/doc/common/help.css +++ b/rule-server/src/static/archives/2020.06.18/doc/common/help.css @@ -10,37 +10,74 @@ See the License for the specific language governing permissions and limitations under the License. *****************************************************************************/ +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css"); @import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/themes.css"); + +bx-list-item>code, p>code, td>code { + background-color: var(--cds-layer); + border-radius: 4px; + bottom: 0.0625em; + color: var(--cds-text-primary); + display: inline; + font-size: .75rem; + font-size: .875em; + font-weight: 400; + letter-spacing: .32px; + line-height: 1.33333; + padding: 0 0.5em; + position: relative; +} + +.toolhelp a { + color: var(--cds-link-primary) +} + +.toolHelp .toolMain p ~ p { + margin-top: .5rem; +} .toolHelp .toolHead h3 { - font-size: 20px; - line-height: 28px; + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 600; + font-size: 16px; + line-height: 24px; } .toolHelp .toolHead .issueLevel { - font-weight: 600; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolHead p { +.toolHelp .toolHead #ruleMessage { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; + margin-top: .5rem; + margin-bottom: .5rem; } -/* productive-heading-03 */ -.toolHelp .toolMain h3 { - font-size: 20px; - line-height: 28px; +.toolHelp .toolHead #groupLabel { + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolMain p { +/* productive-heading-03 */ +.toolHelp .toolMain h3 { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; } .toolHelp .toolSide .bx--list__item { @@ -51,29 +88,44 @@ /* productive-heading-03 */ .toolHelp .toolSide h3 { - font-size: 20px; - line-height: 28px; - font-weight: 400; -} -.toolHelp .toolSide p { - font-size: 20px; - line-height: 28px; - font-weight: 400; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; + font-size: 16px; + line-height: 24px; } -html, body, .toolHelp .bx--row:nth-child(2) { - height: 100%; +@media (min-width: 42rem) { + html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; + } } - body { font-family: 'IBM Plex Sans', sans-serif; + color: var(--cds-text-primary); + background-color: var(--cds-ui-background); } .toolHelp { padding: 0px; margin: 0px; max-width: 100%; - background-color: #be95ff; + background-color: #e8daff; +} + +.toolHelp p { + font-family: 'IBM Plex Sans'; +font-style: normal; +font-weight: 400; +font-size: 14px; +line-height: 20px; +/* or 143% */ + +letter-spacing: 0.16px; +} + +.dds-theme-zone-g90 .toolHelp { + background-color: #31135E; } .toolHelp .bx--row { @@ -85,9 +137,10 @@ body { padding-top: 1rem; } .toolHelp .toolMain { - background-color: #f4f4f4; + background-color: var(--cds-ui-background); padding-top: 1rem; padding-bottom: 1rem; + border-top: solid var(--cds-text-primary) 1px; } .toolHelp .toolMain h2 { margin-top: 32px; @@ -103,9 +156,16 @@ body { .toolHelp .toolSide { padding: 16px 16px 16px 32px; - background-color: #e8daff; - color: black; + background-color: var(--cds-ui-background);; + color: var(--cds-text-primary); + border-top: solid var(--cds-text-primary) 1px; } +@media (min-width: 42rem) { + .toolHelp .toolSide { + border-left: solid var(--cds-text-primary) 1px; + } +} + .toolHelp .toolSide h2 { margin-top: 32px; margin-bottom: 0.5rem; diff --git a/rule-server/src/static/archives/2020.06.18/doc/common/help.js b/rule-server/src/static/archives/2020.06.18/doc/common/help.js index 6bf4ebc24..793ee267d 100644 --- a/rule-server/src/static/archives/2020.06.18/doc/common/help.js +++ b/rule-server/src/static/archives/2020.06.18/doc/common/help.js @@ -49,6 +49,10 @@ class HTMLBaseElement extends HTMLElement { } } +function isDarkMode() { + return (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches); +} + customElements.define( "mark-down", class extends HTMLBaseElement { @@ -86,7 +90,6 @@ customElements.define( const shadowRoot = this; let snip = document.createElement("bx-code-snippet"); snip.setAttribute("type", "multi"); - snip.setAttribute("color-scheme", "light"); snip.innerHTML = oldCode.replace(/ msgArgs[matchedNum]); + let ruleMessage = ruleInfo.message.replace(/\{(\d+)\}/g, (matchedStr, matchedNum, matchedIndex) => ruleInfo.msgArgs[matchedNum]); document.querySelector("#ruleMessage").innerHTML = ruleMessage.replace(/&/g, "&").replace(//g, ">") } setTimeout(() => { @@ -134,29 +137,36 @@ function updateWithRuleInfo(ruleInfo) { if (val === "Violation") icon = ``; if (val === "Needs review") icon = ``; if (val === "Recommendation") icon = ``; - document.querySelector("#locLevel").innerHTML = `
${icon} ${val}
`; + let level = document.querySelector("#locLevel"); + let parent = level.parentElement; + level = parent.removeChild(level); + parent.insertBefore(level, parent.firstElementChild); + document.querySelector("#locLevel").innerHTML = `
${val}
`; } if (RULE_ID) { document.querySelector("#ruleInfo").innerHTML = `

Rule ID: ${RULE_ID}${ruleInfo.reasonId ? `
Reason ID: ${ruleInfo.reasonId}

` : ""}`; @@ -198,5 +212,12 @@ window.addEventListener("DOMContentLoaded", (evt) => { ruleInfo = JSON.parse(decodeURIComponent(window.location.hash.substring(1))); } updateWithRuleInfo(ruleInfo); + + if (isDarkMode()) { + document.body.setAttribute("class", "dds-theme-zone-g90"); + } else { + document.body.setAttribute("class", "dds-theme-zone-g10"); + } + }) diff --git a/rule-server/src/static/archives/2020.06.18/doc/common/rules.css b/rule-server/src/static/archives/2020.06.18/doc/common/rules.css new file mode 100644 index 000000000..515c8a230 --- /dev/null +++ b/rule-server/src/static/archives/2020.06.18/doc/common/rules.css @@ -0,0 +1,29 @@ +/****************************************************************************** + Copyright:: 2022- IBM, Inc + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + *****************************************************************************/ +@import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); + +html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; +} + +body { + font-family: 'IBM Plex Sans', sans-serif; + padding: 1rem; +} + +h2 { + margin-top: 1rem; + font-size: 16px; + line-height: 24px; + font-weight: 600; +} diff --git a/rule-server/src/static/archives/2020.08.12/doc/common/help.css b/rule-server/src/static/archives/2020.08.12/doc/common/help.css index eea3893a2..1f263f4a7 100644 --- a/rule-server/src/static/archives/2020.08.12/doc/common/help.css +++ b/rule-server/src/static/archives/2020.08.12/doc/common/help.css @@ -10,37 +10,74 @@ See the License for the specific language governing permissions and limitations under the License. *****************************************************************************/ +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css"); @import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/themes.css"); + +bx-list-item>code, p>code, td>code { + background-color: var(--cds-layer); + border-radius: 4px; + bottom: 0.0625em; + color: var(--cds-text-primary); + display: inline; + font-size: .75rem; + font-size: .875em; + font-weight: 400; + letter-spacing: .32px; + line-height: 1.33333; + padding: 0 0.5em; + position: relative; +} + +.toolhelp a { + color: var(--cds-link-primary) +} + +.toolHelp .toolMain p ~ p { + margin-top: .5rem; +} .toolHelp .toolHead h3 { - font-size: 20px; - line-height: 28px; + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 600; + font-size: 16px; + line-height: 24px; } .toolHelp .toolHead .issueLevel { - font-weight: 600; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolHead p { +.toolHelp .toolHead #ruleMessage { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; + margin-top: .5rem; + margin-bottom: .5rem; } -/* productive-heading-03 */ -.toolHelp .toolMain h3 { - font-size: 20px; - line-height: 28px; +.toolHelp .toolHead #groupLabel { + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolMain p { +/* productive-heading-03 */ +.toolHelp .toolMain h3 { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; } .toolHelp .toolSide .bx--list__item { @@ -51,29 +88,44 @@ /* productive-heading-03 */ .toolHelp .toolSide h3 { - font-size: 20px; - line-height: 28px; - font-weight: 400; -} -.toolHelp .toolSide p { - font-size: 20px; - line-height: 28px; - font-weight: 400; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; + font-size: 16px; + line-height: 24px; } -html, body, .toolHelp .bx--row:nth-child(2) { - height: 100%; +@media (min-width: 42rem) { + html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; + } } - body { font-family: 'IBM Plex Sans', sans-serif; + color: var(--cds-text-primary); + background-color: var(--cds-ui-background); } .toolHelp { padding: 0px; margin: 0px; max-width: 100%; - background-color: #be95ff; + background-color: #e8daff; +} + +.toolHelp p { + font-family: 'IBM Plex Sans'; +font-style: normal; +font-weight: 400; +font-size: 14px; +line-height: 20px; +/* or 143% */ + +letter-spacing: 0.16px; +} + +.dds-theme-zone-g90 .toolHelp { + background-color: #31135E; } .toolHelp .bx--row { @@ -85,9 +137,10 @@ body { padding-top: 1rem; } .toolHelp .toolMain { - background-color: #f4f4f4; + background-color: var(--cds-ui-background); padding-top: 1rem; padding-bottom: 1rem; + border-top: solid var(--cds-text-primary) 1px; } .toolHelp .toolMain h2 { margin-top: 32px; @@ -103,9 +156,16 @@ body { .toolHelp .toolSide { padding: 16px 16px 16px 32px; - background-color: #e8daff; - color: black; + background-color: var(--cds-ui-background);; + color: var(--cds-text-primary); + border-top: solid var(--cds-text-primary) 1px; } +@media (min-width: 42rem) { + .toolHelp .toolSide { + border-left: solid var(--cds-text-primary) 1px; + } +} + .toolHelp .toolSide h2 { margin-top: 32px; margin-bottom: 0.5rem; diff --git a/rule-server/src/static/archives/2020.08.12/doc/common/help.js b/rule-server/src/static/archives/2020.08.12/doc/common/help.js index 6bf4ebc24..793ee267d 100644 --- a/rule-server/src/static/archives/2020.08.12/doc/common/help.js +++ b/rule-server/src/static/archives/2020.08.12/doc/common/help.js @@ -49,6 +49,10 @@ class HTMLBaseElement extends HTMLElement { } } +function isDarkMode() { + return (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches); +} + customElements.define( "mark-down", class extends HTMLBaseElement { @@ -86,7 +90,6 @@ customElements.define( const shadowRoot = this; let snip = document.createElement("bx-code-snippet"); snip.setAttribute("type", "multi"); - snip.setAttribute("color-scheme", "light"); snip.innerHTML = oldCode.replace(/ msgArgs[matchedNum]); + let ruleMessage = ruleInfo.message.replace(/\{(\d+)\}/g, (matchedStr, matchedNum, matchedIndex) => ruleInfo.msgArgs[matchedNum]); document.querySelector("#ruleMessage").innerHTML = ruleMessage.replace(/&/g, "&").replace(//g, ">") } setTimeout(() => { @@ -134,29 +137,36 @@ function updateWithRuleInfo(ruleInfo) { if (val === "Violation") icon = ``; if (val === "Needs review") icon = ``; if (val === "Recommendation") icon = ``; - document.querySelector("#locLevel").innerHTML = `
${icon} ${val}
`; + let level = document.querySelector("#locLevel"); + let parent = level.parentElement; + level = parent.removeChild(level); + parent.insertBefore(level, parent.firstElementChild); + document.querySelector("#locLevel").innerHTML = `
${val}
`; } if (RULE_ID) { document.querySelector("#ruleInfo").innerHTML = `

Rule ID: ${RULE_ID}${ruleInfo.reasonId ? `
Reason ID: ${ruleInfo.reasonId}

` : ""}`; @@ -198,5 +212,12 @@ window.addEventListener("DOMContentLoaded", (evt) => { ruleInfo = JSON.parse(decodeURIComponent(window.location.hash.substring(1))); } updateWithRuleInfo(ruleInfo); + + if (isDarkMode()) { + document.body.setAttribute("class", "dds-theme-zone-g90"); + } else { + document.body.setAttribute("class", "dds-theme-zone-g10"); + } + }) diff --git a/rule-server/src/static/archives/2020.08.12/doc/common/rules.css b/rule-server/src/static/archives/2020.08.12/doc/common/rules.css new file mode 100644 index 000000000..515c8a230 --- /dev/null +++ b/rule-server/src/static/archives/2020.08.12/doc/common/rules.css @@ -0,0 +1,29 @@ +/****************************************************************************** + Copyright:: 2022- IBM, Inc + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + *****************************************************************************/ +@import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); + +html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; +} + +body { + font-family: 'IBM Plex Sans', sans-serif; + padding: 1rem; +} + +h2 { + margin-top: 1rem; + font-size: 16px; + line-height: 24px; + font-weight: 600; +} diff --git a/rule-server/src/static/archives/2020.10.07/doc/common/help.css b/rule-server/src/static/archives/2020.10.07/doc/common/help.css index eea3893a2..1f263f4a7 100644 --- a/rule-server/src/static/archives/2020.10.07/doc/common/help.css +++ b/rule-server/src/static/archives/2020.10.07/doc/common/help.css @@ -10,37 +10,74 @@ See the License for the specific language governing permissions and limitations under the License. *****************************************************************************/ +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css"); @import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/themes.css"); + +bx-list-item>code, p>code, td>code { + background-color: var(--cds-layer); + border-radius: 4px; + bottom: 0.0625em; + color: var(--cds-text-primary); + display: inline; + font-size: .75rem; + font-size: .875em; + font-weight: 400; + letter-spacing: .32px; + line-height: 1.33333; + padding: 0 0.5em; + position: relative; +} + +.toolhelp a { + color: var(--cds-link-primary) +} + +.toolHelp .toolMain p ~ p { + margin-top: .5rem; +} .toolHelp .toolHead h3 { - font-size: 20px; - line-height: 28px; + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 600; + font-size: 16px; + line-height: 24px; } .toolHelp .toolHead .issueLevel { - font-weight: 600; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolHead p { +.toolHelp .toolHead #ruleMessage { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; + margin-top: .5rem; + margin-bottom: .5rem; } -/* productive-heading-03 */ -.toolHelp .toolMain h3 { - font-size: 20px; - line-height: 28px; +.toolHelp .toolHead #groupLabel { + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolMain p { +/* productive-heading-03 */ +.toolHelp .toolMain h3 { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; } .toolHelp .toolSide .bx--list__item { @@ -51,29 +88,44 @@ /* productive-heading-03 */ .toolHelp .toolSide h3 { - font-size: 20px; - line-height: 28px; - font-weight: 400; -} -.toolHelp .toolSide p { - font-size: 20px; - line-height: 28px; - font-weight: 400; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; + font-size: 16px; + line-height: 24px; } -html, body, .toolHelp .bx--row:nth-child(2) { - height: 100%; +@media (min-width: 42rem) { + html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; + } } - body { font-family: 'IBM Plex Sans', sans-serif; + color: var(--cds-text-primary); + background-color: var(--cds-ui-background); } .toolHelp { padding: 0px; margin: 0px; max-width: 100%; - background-color: #be95ff; + background-color: #e8daff; +} + +.toolHelp p { + font-family: 'IBM Plex Sans'; +font-style: normal; +font-weight: 400; +font-size: 14px; +line-height: 20px; +/* or 143% */ + +letter-spacing: 0.16px; +} + +.dds-theme-zone-g90 .toolHelp { + background-color: #31135E; } .toolHelp .bx--row { @@ -85,9 +137,10 @@ body { padding-top: 1rem; } .toolHelp .toolMain { - background-color: #f4f4f4; + background-color: var(--cds-ui-background); padding-top: 1rem; padding-bottom: 1rem; + border-top: solid var(--cds-text-primary) 1px; } .toolHelp .toolMain h2 { margin-top: 32px; @@ -103,9 +156,16 @@ body { .toolHelp .toolSide { padding: 16px 16px 16px 32px; - background-color: #e8daff; - color: black; + background-color: var(--cds-ui-background);; + color: var(--cds-text-primary); + border-top: solid var(--cds-text-primary) 1px; } +@media (min-width: 42rem) { + .toolHelp .toolSide { + border-left: solid var(--cds-text-primary) 1px; + } +} + .toolHelp .toolSide h2 { margin-top: 32px; margin-bottom: 0.5rem; diff --git a/rule-server/src/static/archives/2020.10.07/doc/common/help.js b/rule-server/src/static/archives/2020.10.07/doc/common/help.js index 6bf4ebc24..793ee267d 100644 --- a/rule-server/src/static/archives/2020.10.07/doc/common/help.js +++ b/rule-server/src/static/archives/2020.10.07/doc/common/help.js @@ -49,6 +49,10 @@ class HTMLBaseElement extends HTMLElement { } } +function isDarkMode() { + return (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches); +} + customElements.define( "mark-down", class extends HTMLBaseElement { @@ -86,7 +90,6 @@ customElements.define( const shadowRoot = this; let snip = document.createElement("bx-code-snippet"); snip.setAttribute("type", "multi"); - snip.setAttribute("color-scheme", "light"); snip.innerHTML = oldCode.replace(/ msgArgs[matchedNum]); + let ruleMessage = ruleInfo.message.replace(/\{(\d+)\}/g, (matchedStr, matchedNum, matchedIndex) => ruleInfo.msgArgs[matchedNum]); document.querySelector("#ruleMessage").innerHTML = ruleMessage.replace(/&/g, "&").replace(//g, ">") } setTimeout(() => { @@ -134,29 +137,36 @@ function updateWithRuleInfo(ruleInfo) { if (val === "Violation") icon = ``; if (val === "Needs review") icon = ``; if (val === "Recommendation") icon = ``; - document.querySelector("#locLevel").innerHTML = `
${icon} ${val}
`; + let level = document.querySelector("#locLevel"); + let parent = level.parentElement; + level = parent.removeChild(level); + parent.insertBefore(level, parent.firstElementChild); + document.querySelector("#locLevel").innerHTML = `
${val}
`; } if (RULE_ID) { document.querySelector("#ruleInfo").innerHTML = `

Rule ID: ${RULE_ID}${ruleInfo.reasonId ? `
Reason ID: ${ruleInfo.reasonId}

` : ""}`; @@ -198,5 +212,12 @@ window.addEventListener("DOMContentLoaded", (evt) => { ruleInfo = JSON.parse(decodeURIComponent(window.location.hash.substring(1))); } updateWithRuleInfo(ruleInfo); + + if (isDarkMode()) { + document.body.setAttribute("class", "dds-theme-zone-g90"); + } else { + document.body.setAttribute("class", "dds-theme-zone-g10"); + } + }) diff --git a/rule-server/src/static/archives/2020.10.07/doc/common/rules.css b/rule-server/src/static/archives/2020.10.07/doc/common/rules.css new file mode 100644 index 000000000..515c8a230 --- /dev/null +++ b/rule-server/src/static/archives/2020.10.07/doc/common/rules.css @@ -0,0 +1,29 @@ +/****************************************************************************** + Copyright:: 2022- IBM, Inc + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + *****************************************************************************/ +@import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); + +html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; +} + +body { + font-family: 'IBM Plex Sans', sans-serif; + padding: 1rem; +} + +h2 { + margin-top: 1rem; + font-size: 16px; + line-height: 24px; + font-weight: 600; +} diff --git a/rule-server/src/static/archives/2021.02.10/doc/common/help.css b/rule-server/src/static/archives/2021.02.10/doc/common/help.css index eea3893a2..1f263f4a7 100644 --- a/rule-server/src/static/archives/2021.02.10/doc/common/help.css +++ b/rule-server/src/static/archives/2021.02.10/doc/common/help.css @@ -10,37 +10,74 @@ See the License for the specific language governing permissions and limitations under the License. *****************************************************************************/ +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css"); @import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/themes.css"); + +bx-list-item>code, p>code, td>code { + background-color: var(--cds-layer); + border-radius: 4px; + bottom: 0.0625em; + color: var(--cds-text-primary); + display: inline; + font-size: .75rem; + font-size: .875em; + font-weight: 400; + letter-spacing: .32px; + line-height: 1.33333; + padding: 0 0.5em; + position: relative; +} + +.toolhelp a { + color: var(--cds-link-primary) +} + +.toolHelp .toolMain p ~ p { + margin-top: .5rem; +} .toolHelp .toolHead h3 { - font-size: 20px; - line-height: 28px; + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 600; + font-size: 16px; + line-height: 24px; } .toolHelp .toolHead .issueLevel { - font-weight: 600; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolHead p { +.toolHelp .toolHead #ruleMessage { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; + margin-top: .5rem; + margin-bottom: .5rem; } -/* productive-heading-03 */ -.toolHelp .toolMain h3 { - font-size: 20px; - line-height: 28px; +.toolHelp .toolHead #groupLabel { + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolMain p { +/* productive-heading-03 */ +.toolHelp .toolMain h3 { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; } .toolHelp .toolSide .bx--list__item { @@ -51,29 +88,44 @@ /* productive-heading-03 */ .toolHelp .toolSide h3 { - font-size: 20px; - line-height: 28px; - font-weight: 400; -} -.toolHelp .toolSide p { - font-size: 20px; - line-height: 28px; - font-weight: 400; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; + font-size: 16px; + line-height: 24px; } -html, body, .toolHelp .bx--row:nth-child(2) { - height: 100%; +@media (min-width: 42rem) { + html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; + } } - body { font-family: 'IBM Plex Sans', sans-serif; + color: var(--cds-text-primary); + background-color: var(--cds-ui-background); } .toolHelp { padding: 0px; margin: 0px; max-width: 100%; - background-color: #be95ff; + background-color: #e8daff; +} + +.toolHelp p { + font-family: 'IBM Plex Sans'; +font-style: normal; +font-weight: 400; +font-size: 14px; +line-height: 20px; +/* or 143% */ + +letter-spacing: 0.16px; +} + +.dds-theme-zone-g90 .toolHelp { + background-color: #31135E; } .toolHelp .bx--row { @@ -85,9 +137,10 @@ body { padding-top: 1rem; } .toolHelp .toolMain { - background-color: #f4f4f4; + background-color: var(--cds-ui-background); padding-top: 1rem; padding-bottom: 1rem; + border-top: solid var(--cds-text-primary) 1px; } .toolHelp .toolMain h2 { margin-top: 32px; @@ -103,9 +156,16 @@ body { .toolHelp .toolSide { padding: 16px 16px 16px 32px; - background-color: #e8daff; - color: black; + background-color: var(--cds-ui-background);; + color: var(--cds-text-primary); + border-top: solid var(--cds-text-primary) 1px; } +@media (min-width: 42rem) { + .toolHelp .toolSide { + border-left: solid var(--cds-text-primary) 1px; + } +} + .toolHelp .toolSide h2 { margin-top: 32px; margin-bottom: 0.5rem; diff --git a/rule-server/src/static/archives/2021.02.10/doc/common/help.js b/rule-server/src/static/archives/2021.02.10/doc/common/help.js index 6bf4ebc24..793ee267d 100644 --- a/rule-server/src/static/archives/2021.02.10/doc/common/help.js +++ b/rule-server/src/static/archives/2021.02.10/doc/common/help.js @@ -49,6 +49,10 @@ class HTMLBaseElement extends HTMLElement { } } +function isDarkMode() { + return (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches); +} + customElements.define( "mark-down", class extends HTMLBaseElement { @@ -86,7 +90,6 @@ customElements.define( const shadowRoot = this; let snip = document.createElement("bx-code-snippet"); snip.setAttribute("type", "multi"); - snip.setAttribute("color-scheme", "light"); snip.innerHTML = oldCode.replace(/ msgArgs[matchedNum]); + let ruleMessage = ruleInfo.message.replace(/\{(\d+)\}/g, (matchedStr, matchedNum, matchedIndex) => ruleInfo.msgArgs[matchedNum]); document.querySelector("#ruleMessage").innerHTML = ruleMessage.replace(/&/g, "&").replace(//g, ">") } setTimeout(() => { @@ -134,29 +137,36 @@ function updateWithRuleInfo(ruleInfo) { if (val === "Violation") icon = ``; if (val === "Needs review") icon = ``; if (val === "Recommendation") icon = ``; - document.querySelector("#locLevel").innerHTML = `
${icon} ${val}
`; + let level = document.querySelector("#locLevel"); + let parent = level.parentElement; + level = parent.removeChild(level); + parent.insertBefore(level, parent.firstElementChild); + document.querySelector("#locLevel").innerHTML = `
${val}
`; } if (RULE_ID) { document.querySelector("#ruleInfo").innerHTML = `

Rule ID: ${RULE_ID}${ruleInfo.reasonId ? `
Reason ID: ${ruleInfo.reasonId}

` : ""}`; @@ -198,5 +212,12 @@ window.addEventListener("DOMContentLoaded", (evt) => { ruleInfo = JSON.parse(decodeURIComponent(window.location.hash.substring(1))); } updateWithRuleInfo(ruleInfo); + + if (isDarkMode()) { + document.body.setAttribute("class", "dds-theme-zone-g90"); + } else { + document.body.setAttribute("class", "dds-theme-zone-g10"); + } + }) diff --git a/rule-server/src/static/archives/2021.02.10/doc/common/rules.css b/rule-server/src/static/archives/2021.02.10/doc/common/rules.css new file mode 100644 index 000000000..515c8a230 --- /dev/null +++ b/rule-server/src/static/archives/2021.02.10/doc/common/rules.css @@ -0,0 +1,29 @@ +/****************************************************************************** + Copyright:: 2022- IBM, Inc + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + *****************************************************************************/ +@import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); + +html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; +} + +body { + font-family: 'IBM Plex Sans', sans-serif; + padding: 1rem; +} + +h2 { + margin-top: 1rem; + font-size: 16px; + line-height: 24px; + font-weight: 600; +} diff --git a/rule-server/src/static/archives/2021.04.27/doc/common/help.css b/rule-server/src/static/archives/2021.04.27/doc/common/help.css index eea3893a2..1f263f4a7 100644 --- a/rule-server/src/static/archives/2021.04.27/doc/common/help.css +++ b/rule-server/src/static/archives/2021.04.27/doc/common/help.css @@ -10,37 +10,74 @@ See the License for the specific language governing permissions and limitations under the License. *****************************************************************************/ +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css"); @import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/themes.css"); + +bx-list-item>code, p>code, td>code { + background-color: var(--cds-layer); + border-radius: 4px; + bottom: 0.0625em; + color: var(--cds-text-primary); + display: inline; + font-size: .75rem; + font-size: .875em; + font-weight: 400; + letter-spacing: .32px; + line-height: 1.33333; + padding: 0 0.5em; + position: relative; +} + +.toolhelp a { + color: var(--cds-link-primary) +} + +.toolHelp .toolMain p ~ p { + margin-top: .5rem; +} .toolHelp .toolHead h3 { - font-size: 20px; - line-height: 28px; + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 600; + font-size: 16px; + line-height: 24px; } .toolHelp .toolHead .issueLevel { - font-weight: 600; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolHead p { +.toolHelp .toolHead #ruleMessage { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; + margin-top: .5rem; + margin-bottom: .5rem; } -/* productive-heading-03 */ -.toolHelp .toolMain h3 { - font-size: 20px; - line-height: 28px; +.toolHelp .toolHead #groupLabel { + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolMain p { +/* productive-heading-03 */ +.toolHelp .toolMain h3 { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; } .toolHelp .toolSide .bx--list__item { @@ -51,29 +88,44 @@ /* productive-heading-03 */ .toolHelp .toolSide h3 { - font-size: 20px; - line-height: 28px; - font-weight: 400; -} -.toolHelp .toolSide p { - font-size: 20px; - line-height: 28px; - font-weight: 400; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; + font-size: 16px; + line-height: 24px; } -html, body, .toolHelp .bx--row:nth-child(2) { - height: 100%; +@media (min-width: 42rem) { + html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; + } } - body { font-family: 'IBM Plex Sans', sans-serif; + color: var(--cds-text-primary); + background-color: var(--cds-ui-background); } .toolHelp { padding: 0px; margin: 0px; max-width: 100%; - background-color: #be95ff; + background-color: #e8daff; +} + +.toolHelp p { + font-family: 'IBM Plex Sans'; +font-style: normal; +font-weight: 400; +font-size: 14px; +line-height: 20px; +/* or 143% */ + +letter-spacing: 0.16px; +} + +.dds-theme-zone-g90 .toolHelp { + background-color: #31135E; } .toolHelp .bx--row { @@ -85,9 +137,10 @@ body { padding-top: 1rem; } .toolHelp .toolMain { - background-color: #f4f4f4; + background-color: var(--cds-ui-background); padding-top: 1rem; padding-bottom: 1rem; + border-top: solid var(--cds-text-primary) 1px; } .toolHelp .toolMain h2 { margin-top: 32px; @@ -103,9 +156,16 @@ body { .toolHelp .toolSide { padding: 16px 16px 16px 32px; - background-color: #e8daff; - color: black; + background-color: var(--cds-ui-background);; + color: var(--cds-text-primary); + border-top: solid var(--cds-text-primary) 1px; } +@media (min-width: 42rem) { + .toolHelp .toolSide { + border-left: solid var(--cds-text-primary) 1px; + } +} + .toolHelp .toolSide h2 { margin-top: 32px; margin-bottom: 0.5rem; diff --git a/rule-server/src/static/archives/2021.04.27/doc/common/help.js b/rule-server/src/static/archives/2021.04.27/doc/common/help.js index 6bf4ebc24..793ee267d 100644 --- a/rule-server/src/static/archives/2021.04.27/doc/common/help.js +++ b/rule-server/src/static/archives/2021.04.27/doc/common/help.js @@ -49,6 +49,10 @@ class HTMLBaseElement extends HTMLElement { } } +function isDarkMode() { + return (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches); +} + customElements.define( "mark-down", class extends HTMLBaseElement { @@ -86,7 +90,6 @@ customElements.define( const shadowRoot = this; let snip = document.createElement("bx-code-snippet"); snip.setAttribute("type", "multi"); - snip.setAttribute("color-scheme", "light"); snip.innerHTML = oldCode.replace(/ msgArgs[matchedNum]); + let ruleMessage = ruleInfo.message.replace(/\{(\d+)\}/g, (matchedStr, matchedNum, matchedIndex) => ruleInfo.msgArgs[matchedNum]); document.querySelector("#ruleMessage").innerHTML = ruleMessage.replace(/&/g, "&").replace(//g, ">") } setTimeout(() => { @@ -134,29 +137,36 @@ function updateWithRuleInfo(ruleInfo) { if (val === "Violation") icon = ``; if (val === "Needs review") icon = ``; if (val === "Recommendation") icon = ``; - document.querySelector("#locLevel").innerHTML = `
${icon} ${val}
`; + let level = document.querySelector("#locLevel"); + let parent = level.parentElement; + level = parent.removeChild(level); + parent.insertBefore(level, parent.firstElementChild); + document.querySelector("#locLevel").innerHTML = `
${val}
`; } if (RULE_ID) { document.querySelector("#ruleInfo").innerHTML = `

Rule ID: ${RULE_ID}${ruleInfo.reasonId ? `
Reason ID: ${ruleInfo.reasonId}

` : ""}`; @@ -198,5 +212,12 @@ window.addEventListener("DOMContentLoaded", (evt) => { ruleInfo = JSON.parse(decodeURIComponent(window.location.hash.substring(1))); } updateWithRuleInfo(ruleInfo); + + if (isDarkMode()) { + document.body.setAttribute("class", "dds-theme-zone-g90"); + } else { + document.body.setAttribute("class", "dds-theme-zone-g10"); + } + }) diff --git a/rule-server/src/static/archives/2021.04.27/doc/common/rules.css b/rule-server/src/static/archives/2021.04.27/doc/common/rules.css new file mode 100644 index 000000000..515c8a230 --- /dev/null +++ b/rule-server/src/static/archives/2021.04.27/doc/common/rules.css @@ -0,0 +1,29 @@ +/****************************************************************************** + Copyright:: 2022- IBM, Inc + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + *****************************************************************************/ +@import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); + +html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; +} + +body { + font-family: 'IBM Plex Sans', sans-serif; + padding: 1rem; +} + +h2 { + margin-top: 1rem; + font-size: 16px; + line-height: 24px; + font-weight: 600; +} diff --git a/rule-server/src/static/archives/2021.06.16/doc/common/help.css b/rule-server/src/static/archives/2021.06.16/doc/common/help.css index eea3893a2..1f263f4a7 100644 --- a/rule-server/src/static/archives/2021.06.16/doc/common/help.css +++ b/rule-server/src/static/archives/2021.06.16/doc/common/help.css @@ -10,37 +10,74 @@ See the License for the specific language governing permissions and limitations under the License. *****************************************************************************/ +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css"); @import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/themes.css"); + +bx-list-item>code, p>code, td>code { + background-color: var(--cds-layer); + border-radius: 4px; + bottom: 0.0625em; + color: var(--cds-text-primary); + display: inline; + font-size: .75rem; + font-size: .875em; + font-weight: 400; + letter-spacing: .32px; + line-height: 1.33333; + padding: 0 0.5em; + position: relative; +} + +.toolhelp a { + color: var(--cds-link-primary) +} + +.toolHelp .toolMain p ~ p { + margin-top: .5rem; +} .toolHelp .toolHead h3 { - font-size: 20px; - line-height: 28px; + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 600; + font-size: 16px; + line-height: 24px; } .toolHelp .toolHead .issueLevel { - font-weight: 600; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolHead p { +.toolHelp .toolHead #ruleMessage { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; + margin-top: .5rem; + margin-bottom: .5rem; } -/* productive-heading-03 */ -.toolHelp .toolMain h3 { - font-size: 20px; - line-height: 28px; +.toolHelp .toolHead #groupLabel { + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolMain p { +/* productive-heading-03 */ +.toolHelp .toolMain h3 { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; } .toolHelp .toolSide .bx--list__item { @@ -51,29 +88,44 @@ /* productive-heading-03 */ .toolHelp .toolSide h3 { - font-size: 20px; - line-height: 28px; - font-weight: 400; -} -.toolHelp .toolSide p { - font-size: 20px; - line-height: 28px; - font-weight: 400; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; + font-size: 16px; + line-height: 24px; } -html, body, .toolHelp .bx--row:nth-child(2) { - height: 100%; +@media (min-width: 42rem) { + html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; + } } - body { font-family: 'IBM Plex Sans', sans-serif; + color: var(--cds-text-primary); + background-color: var(--cds-ui-background); } .toolHelp { padding: 0px; margin: 0px; max-width: 100%; - background-color: #be95ff; + background-color: #e8daff; +} + +.toolHelp p { + font-family: 'IBM Plex Sans'; +font-style: normal; +font-weight: 400; +font-size: 14px; +line-height: 20px; +/* or 143% */ + +letter-spacing: 0.16px; +} + +.dds-theme-zone-g90 .toolHelp { + background-color: #31135E; } .toolHelp .bx--row { @@ -85,9 +137,10 @@ body { padding-top: 1rem; } .toolHelp .toolMain { - background-color: #f4f4f4; + background-color: var(--cds-ui-background); padding-top: 1rem; padding-bottom: 1rem; + border-top: solid var(--cds-text-primary) 1px; } .toolHelp .toolMain h2 { margin-top: 32px; @@ -103,9 +156,16 @@ body { .toolHelp .toolSide { padding: 16px 16px 16px 32px; - background-color: #e8daff; - color: black; + background-color: var(--cds-ui-background);; + color: var(--cds-text-primary); + border-top: solid var(--cds-text-primary) 1px; } +@media (min-width: 42rem) { + .toolHelp .toolSide { + border-left: solid var(--cds-text-primary) 1px; + } +} + .toolHelp .toolSide h2 { margin-top: 32px; margin-bottom: 0.5rem; diff --git a/rule-server/src/static/archives/2021.06.16/doc/common/help.js b/rule-server/src/static/archives/2021.06.16/doc/common/help.js index 6bf4ebc24..793ee267d 100644 --- a/rule-server/src/static/archives/2021.06.16/doc/common/help.js +++ b/rule-server/src/static/archives/2021.06.16/doc/common/help.js @@ -49,6 +49,10 @@ class HTMLBaseElement extends HTMLElement { } } +function isDarkMode() { + return (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches); +} + customElements.define( "mark-down", class extends HTMLBaseElement { @@ -86,7 +90,6 @@ customElements.define( const shadowRoot = this; let snip = document.createElement("bx-code-snippet"); snip.setAttribute("type", "multi"); - snip.setAttribute("color-scheme", "light"); snip.innerHTML = oldCode.replace(/ msgArgs[matchedNum]); + let ruleMessage = ruleInfo.message.replace(/\{(\d+)\}/g, (matchedStr, matchedNum, matchedIndex) => ruleInfo.msgArgs[matchedNum]); document.querySelector("#ruleMessage").innerHTML = ruleMessage.replace(/&/g, "&").replace(//g, ">") } setTimeout(() => { @@ -134,29 +137,36 @@ function updateWithRuleInfo(ruleInfo) { if (val === "Violation") icon = ``; if (val === "Needs review") icon = ``; if (val === "Recommendation") icon = ``; - document.querySelector("#locLevel").innerHTML = `
${icon} ${val}
`; + let level = document.querySelector("#locLevel"); + let parent = level.parentElement; + level = parent.removeChild(level); + parent.insertBefore(level, parent.firstElementChild); + document.querySelector("#locLevel").innerHTML = `
${val}
`; } if (RULE_ID) { document.querySelector("#ruleInfo").innerHTML = `

Rule ID: ${RULE_ID}${ruleInfo.reasonId ? `
Reason ID: ${ruleInfo.reasonId}

` : ""}`; @@ -198,5 +212,12 @@ window.addEventListener("DOMContentLoaded", (evt) => { ruleInfo = JSON.parse(decodeURIComponent(window.location.hash.substring(1))); } updateWithRuleInfo(ruleInfo); + + if (isDarkMode()) { + document.body.setAttribute("class", "dds-theme-zone-g90"); + } else { + document.body.setAttribute("class", "dds-theme-zone-g10"); + } + }) diff --git a/rule-server/src/static/archives/2021.06.16/doc/common/rules.css b/rule-server/src/static/archives/2021.06.16/doc/common/rules.css new file mode 100644 index 000000000..515c8a230 --- /dev/null +++ b/rule-server/src/static/archives/2021.06.16/doc/common/rules.css @@ -0,0 +1,29 @@ +/****************************************************************************** + Copyright:: 2022- IBM, Inc + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + *****************************************************************************/ +@import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); + +html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; +} + +body { + font-family: 'IBM Plex Sans', sans-serif; + padding: 1rem; +} + +h2 { + margin-top: 1rem; + font-size: 16px; + line-height: 24px; + font-weight: 600; +} diff --git a/rule-server/src/static/archives/2021.07.21/doc/common/help.css b/rule-server/src/static/archives/2021.07.21/doc/common/help.css index eea3893a2..1f263f4a7 100644 --- a/rule-server/src/static/archives/2021.07.21/doc/common/help.css +++ b/rule-server/src/static/archives/2021.07.21/doc/common/help.css @@ -10,37 +10,74 @@ See the License for the specific language governing permissions and limitations under the License. *****************************************************************************/ +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css"); @import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/themes.css"); + +bx-list-item>code, p>code, td>code { + background-color: var(--cds-layer); + border-radius: 4px; + bottom: 0.0625em; + color: var(--cds-text-primary); + display: inline; + font-size: .75rem; + font-size: .875em; + font-weight: 400; + letter-spacing: .32px; + line-height: 1.33333; + padding: 0 0.5em; + position: relative; +} + +.toolhelp a { + color: var(--cds-link-primary) +} + +.toolHelp .toolMain p ~ p { + margin-top: .5rem; +} .toolHelp .toolHead h3 { - font-size: 20px; - line-height: 28px; + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 600; + font-size: 16px; + line-height: 24px; } .toolHelp .toolHead .issueLevel { - font-weight: 600; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolHead p { +.toolHelp .toolHead #ruleMessage { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; + margin-top: .5rem; + margin-bottom: .5rem; } -/* productive-heading-03 */ -.toolHelp .toolMain h3 { - font-size: 20px; - line-height: 28px; +.toolHelp .toolHead #groupLabel { + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolMain p { +/* productive-heading-03 */ +.toolHelp .toolMain h3 { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; } .toolHelp .toolSide .bx--list__item { @@ -51,29 +88,44 @@ /* productive-heading-03 */ .toolHelp .toolSide h3 { - font-size: 20px; - line-height: 28px; - font-weight: 400; -} -.toolHelp .toolSide p { - font-size: 20px; - line-height: 28px; - font-weight: 400; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; + font-size: 16px; + line-height: 24px; } -html, body, .toolHelp .bx--row:nth-child(2) { - height: 100%; +@media (min-width: 42rem) { + html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; + } } - body { font-family: 'IBM Plex Sans', sans-serif; + color: var(--cds-text-primary); + background-color: var(--cds-ui-background); } .toolHelp { padding: 0px; margin: 0px; max-width: 100%; - background-color: #be95ff; + background-color: #e8daff; +} + +.toolHelp p { + font-family: 'IBM Plex Sans'; +font-style: normal; +font-weight: 400; +font-size: 14px; +line-height: 20px; +/* or 143% */ + +letter-spacing: 0.16px; +} + +.dds-theme-zone-g90 .toolHelp { + background-color: #31135E; } .toolHelp .bx--row { @@ -85,9 +137,10 @@ body { padding-top: 1rem; } .toolHelp .toolMain { - background-color: #f4f4f4; + background-color: var(--cds-ui-background); padding-top: 1rem; padding-bottom: 1rem; + border-top: solid var(--cds-text-primary) 1px; } .toolHelp .toolMain h2 { margin-top: 32px; @@ -103,9 +156,16 @@ body { .toolHelp .toolSide { padding: 16px 16px 16px 32px; - background-color: #e8daff; - color: black; + background-color: var(--cds-ui-background);; + color: var(--cds-text-primary); + border-top: solid var(--cds-text-primary) 1px; } +@media (min-width: 42rem) { + .toolHelp .toolSide { + border-left: solid var(--cds-text-primary) 1px; + } +} + .toolHelp .toolSide h2 { margin-top: 32px; margin-bottom: 0.5rem; diff --git a/rule-server/src/static/archives/2021.07.21/doc/common/help.js b/rule-server/src/static/archives/2021.07.21/doc/common/help.js index 6bf4ebc24..793ee267d 100644 --- a/rule-server/src/static/archives/2021.07.21/doc/common/help.js +++ b/rule-server/src/static/archives/2021.07.21/doc/common/help.js @@ -49,6 +49,10 @@ class HTMLBaseElement extends HTMLElement { } } +function isDarkMode() { + return (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches); +} + customElements.define( "mark-down", class extends HTMLBaseElement { @@ -86,7 +90,6 @@ customElements.define( const shadowRoot = this; let snip = document.createElement("bx-code-snippet"); snip.setAttribute("type", "multi"); - snip.setAttribute("color-scheme", "light"); snip.innerHTML = oldCode.replace(/ msgArgs[matchedNum]); + let ruleMessage = ruleInfo.message.replace(/\{(\d+)\}/g, (matchedStr, matchedNum, matchedIndex) => ruleInfo.msgArgs[matchedNum]); document.querySelector("#ruleMessage").innerHTML = ruleMessage.replace(/&/g, "&").replace(//g, ">") } setTimeout(() => { @@ -134,29 +137,36 @@ function updateWithRuleInfo(ruleInfo) { if (val === "Violation") icon = ``; if (val === "Needs review") icon = ``; if (val === "Recommendation") icon = ``; - document.querySelector("#locLevel").innerHTML = `
${icon} ${val}
`; + let level = document.querySelector("#locLevel"); + let parent = level.parentElement; + level = parent.removeChild(level); + parent.insertBefore(level, parent.firstElementChild); + document.querySelector("#locLevel").innerHTML = `
${val}
`; } if (RULE_ID) { document.querySelector("#ruleInfo").innerHTML = `

Rule ID: ${RULE_ID}${ruleInfo.reasonId ? `
Reason ID: ${ruleInfo.reasonId}

` : ""}`; @@ -198,5 +212,12 @@ window.addEventListener("DOMContentLoaded", (evt) => { ruleInfo = JSON.parse(decodeURIComponent(window.location.hash.substring(1))); } updateWithRuleInfo(ruleInfo); + + if (isDarkMode()) { + document.body.setAttribute("class", "dds-theme-zone-g90"); + } else { + document.body.setAttribute("class", "dds-theme-zone-g10"); + } + }) diff --git a/rule-server/src/static/archives/2021.07.21/doc/common/rules.css b/rule-server/src/static/archives/2021.07.21/doc/common/rules.css new file mode 100644 index 000000000..515c8a230 --- /dev/null +++ b/rule-server/src/static/archives/2021.07.21/doc/common/rules.css @@ -0,0 +1,29 @@ +/****************************************************************************** + Copyright:: 2022- IBM, Inc + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + *****************************************************************************/ +@import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); + +html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; +} + +body { + font-family: 'IBM Plex Sans', sans-serif; + padding: 1rem; +} + +h2 { + margin-top: 1rem; + font-size: 16px; + line-height: 24px; + font-weight: 600; +} diff --git a/rule-server/src/static/archives/2021.08.27/doc/common/help.css b/rule-server/src/static/archives/2021.08.27/doc/common/help.css index eea3893a2..1f263f4a7 100644 --- a/rule-server/src/static/archives/2021.08.27/doc/common/help.css +++ b/rule-server/src/static/archives/2021.08.27/doc/common/help.css @@ -10,37 +10,74 @@ See the License for the specific language governing permissions and limitations under the License. *****************************************************************************/ +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css"); @import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/themes.css"); + +bx-list-item>code, p>code, td>code { + background-color: var(--cds-layer); + border-radius: 4px; + bottom: 0.0625em; + color: var(--cds-text-primary); + display: inline; + font-size: .75rem; + font-size: .875em; + font-weight: 400; + letter-spacing: .32px; + line-height: 1.33333; + padding: 0 0.5em; + position: relative; +} + +.toolhelp a { + color: var(--cds-link-primary) +} + +.toolHelp .toolMain p ~ p { + margin-top: .5rem; +} .toolHelp .toolHead h3 { - font-size: 20px; - line-height: 28px; + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 600; + font-size: 16px; + line-height: 24px; } .toolHelp .toolHead .issueLevel { - font-weight: 600; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolHead p { +.toolHelp .toolHead #ruleMessage { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; + margin-top: .5rem; + margin-bottom: .5rem; } -/* productive-heading-03 */ -.toolHelp .toolMain h3 { - font-size: 20px; - line-height: 28px; +.toolHelp .toolHead #groupLabel { + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolMain p { +/* productive-heading-03 */ +.toolHelp .toolMain h3 { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; } .toolHelp .toolSide .bx--list__item { @@ -51,29 +88,44 @@ /* productive-heading-03 */ .toolHelp .toolSide h3 { - font-size: 20px; - line-height: 28px; - font-weight: 400; -} -.toolHelp .toolSide p { - font-size: 20px; - line-height: 28px; - font-weight: 400; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; + font-size: 16px; + line-height: 24px; } -html, body, .toolHelp .bx--row:nth-child(2) { - height: 100%; +@media (min-width: 42rem) { + html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; + } } - body { font-family: 'IBM Plex Sans', sans-serif; + color: var(--cds-text-primary); + background-color: var(--cds-ui-background); } .toolHelp { padding: 0px; margin: 0px; max-width: 100%; - background-color: #be95ff; + background-color: #e8daff; +} + +.toolHelp p { + font-family: 'IBM Plex Sans'; +font-style: normal; +font-weight: 400; +font-size: 14px; +line-height: 20px; +/* or 143% */ + +letter-spacing: 0.16px; +} + +.dds-theme-zone-g90 .toolHelp { + background-color: #31135E; } .toolHelp .bx--row { @@ -85,9 +137,10 @@ body { padding-top: 1rem; } .toolHelp .toolMain { - background-color: #f4f4f4; + background-color: var(--cds-ui-background); padding-top: 1rem; padding-bottom: 1rem; + border-top: solid var(--cds-text-primary) 1px; } .toolHelp .toolMain h2 { margin-top: 32px; @@ -103,9 +156,16 @@ body { .toolHelp .toolSide { padding: 16px 16px 16px 32px; - background-color: #e8daff; - color: black; + background-color: var(--cds-ui-background);; + color: var(--cds-text-primary); + border-top: solid var(--cds-text-primary) 1px; } +@media (min-width: 42rem) { + .toolHelp .toolSide { + border-left: solid var(--cds-text-primary) 1px; + } +} + .toolHelp .toolSide h2 { margin-top: 32px; margin-bottom: 0.5rem; diff --git a/rule-server/src/static/archives/2021.08.27/doc/common/help.js b/rule-server/src/static/archives/2021.08.27/doc/common/help.js index 6bf4ebc24..793ee267d 100644 --- a/rule-server/src/static/archives/2021.08.27/doc/common/help.js +++ b/rule-server/src/static/archives/2021.08.27/doc/common/help.js @@ -49,6 +49,10 @@ class HTMLBaseElement extends HTMLElement { } } +function isDarkMode() { + return (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches); +} + customElements.define( "mark-down", class extends HTMLBaseElement { @@ -86,7 +90,6 @@ customElements.define( const shadowRoot = this; let snip = document.createElement("bx-code-snippet"); snip.setAttribute("type", "multi"); - snip.setAttribute("color-scheme", "light"); snip.innerHTML = oldCode.replace(/ msgArgs[matchedNum]); + let ruleMessage = ruleInfo.message.replace(/\{(\d+)\}/g, (matchedStr, matchedNum, matchedIndex) => ruleInfo.msgArgs[matchedNum]); document.querySelector("#ruleMessage").innerHTML = ruleMessage.replace(/&/g, "&").replace(//g, ">") } setTimeout(() => { @@ -134,29 +137,36 @@ function updateWithRuleInfo(ruleInfo) { if (val === "Violation") icon = ``; if (val === "Needs review") icon = ``; if (val === "Recommendation") icon = ``; - document.querySelector("#locLevel").innerHTML = `
${icon} ${val}
`; + let level = document.querySelector("#locLevel"); + let parent = level.parentElement; + level = parent.removeChild(level); + parent.insertBefore(level, parent.firstElementChild); + document.querySelector("#locLevel").innerHTML = `
${val}
`; } if (RULE_ID) { document.querySelector("#ruleInfo").innerHTML = `

Rule ID: ${RULE_ID}${ruleInfo.reasonId ? `
Reason ID: ${ruleInfo.reasonId}

` : ""}`; @@ -198,5 +212,12 @@ window.addEventListener("DOMContentLoaded", (evt) => { ruleInfo = JSON.parse(decodeURIComponent(window.location.hash.substring(1))); } updateWithRuleInfo(ruleInfo); + + if (isDarkMode()) { + document.body.setAttribute("class", "dds-theme-zone-g90"); + } else { + document.body.setAttribute("class", "dds-theme-zone-g10"); + } + }) diff --git a/rule-server/src/static/archives/2021.08.27/doc/common/rules.css b/rule-server/src/static/archives/2021.08.27/doc/common/rules.css new file mode 100644 index 000000000..515c8a230 --- /dev/null +++ b/rule-server/src/static/archives/2021.08.27/doc/common/rules.css @@ -0,0 +1,29 @@ +/****************************************************************************** + Copyright:: 2022- IBM, Inc + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + *****************************************************************************/ +@import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); + +html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; +} + +body { + font-family: 'IBM Plex Sans', sans-serif; + padding: 1rem; +} + +h2 { + margin-top: 1rem; + font-size: 16px; + line-height: 24px; + font-weight: 600; +} diff --git a/rule-server/src/static/archives/2021.10.25/doc/common/help.css b/rule-server/src/static/archives/2021.10.25/doc/common/help.css index eea3893a2..1f263f4a7 100644 --- a/rule-server/src/static/archives/2021.10.25/doc/common/help.css +++ b/rule-server/src/static/archives/2021.10.25/doc/common/help.css @@ -10,37 +10,74 @@ See the License for the specific language governing permissions and limitations under the License. *****************************************************************************/ +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css"); @import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/themes.css"); + +bx-list-item>code, p>code, td>code { + background-color: var(--cds-layer); + border-radius: 4px; + bottom: 0.0625em; + color: var(--cds-text-primary); + display: inline; + font-size: .75rem; + font-size: .875em; + font-weight: 400; + letter-spacing: .32px; + line-height: 1.33333; + padding: 0 0.5em; + position: relative; +} + +.toolhelp a { + color: var(--cds-link-primary) +} + +.toolHelp .toolMain p ~ p { + margin-top: .5rem; +} .toolHelp .toolHead h3 { - font-size: 20px; - line-height: 28px; + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 600; + font-size: 16px; + line-height: 24px; } .toolHelp .toolHead .issueLevel { - font-weight: 600; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolHead p { +.toolHelp .toolHead #ruleMessage { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; + margin-top: .5rem; + margin-bottom: .5rem; } -/* productive-heading-03 */ -.toolHelp .toolMain h3 { - font-size: 20px; - line-height: 28px; +.toolHelp .toolHead #groupLabel { + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolMain p { +/* productive-heading-03 */ +.toolHelp .toolMain h3 { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; } .toolHelp .toolSide .bx--list__item { @@ -51,29 +88,44 @@ /* productive-heading-03 */ .toolHelp .toolSide h3 { - font-size: 20px; - line-height: 28px; - font-weight: 400; -} -.toolHelp .toolSide p { - font-size: 20px; - line-height: 28px; - font-weight: 400; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; + font-size: 16px; + line-height: 24px; } -html, body, .toolHelp .bx--row:nth-child(2) { - height: 100%; +@media (min-width: 42rem) { + html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; + } } - body { font-family: 'IBM Plex Sans', sans-serif; + color: var(--cds-text-primary); + background-color: var(--cds-ui-background); } .toolHelp { padding: 0px; margin: 0px; max-width: 100%; - background-color: #be95ff; + background-color: #e8daff; +} + +.toolHelp p { + font-family: 'IBM Plex Sans'; +font-style: normal; +font-weight: 400; +font-size: 14px; +line-height: 20px; +/* or 143% */ + +letter-spacing: 0.16px; +} + +.dds-theme-zone-g90 .toolHelp { + background-color: #31135E; } .toolHelp .bx--row { @@ -85,9 +137,10 @@ body { padding-top: 1rem; } .toolHelp .toolMain { - background-color: #f4f4f4; + background-color: var(--cds-ui-background); padding-top: 1rem; padding-bottom: 1rem; + border-top: solid var(--cds-text-primary) 1px; } .toolHelp .toolMain h2 { margin-top: 32px; @@ -103,9 +156,16 @@ body { .toolHelp .toolSide { padding: 16px 16px 16px 32px; - background-color: #e8daff; - color: black; + background-color: var(--cds-ui-background);; + color: var(--cds-text-primary); + border-top: solid var(--cds-text-primary) 1px; } +@media (min-width: 42rem) { + .toolHelp .toolSide { + border-left: solid var(--cds-text-primary) 1px; + } +} + .toolHelp .toolSide h2 { margin-top: 32px; margin-bottom: 0.5rem; diff --git a/rule-server/src/static/archives/2021.10.25/doc/common/help.js b/rule-server/src/static/archives/2021.10.25/doc/common/help.js index 6bf4ebc24..793ee267d 100644 --- a/rule-server/src/static/archives/2021.10.25/doc/common/help.js +++ b/rule-server/src/static/archives/2021.10.25/doc/common/help.js @@ -49,6 +49,10 @@ class HTMLBaseElement extends HTMLElement { } } +function isDarkMode() { + return (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches); +} + customElements.define( "mark-down", class extends HTMLBaseElement { @@ -86,7 +90,6 @@ customElements.define( const shadowRoot = this; let snip = document.createElement("bx-code-snippet"); snip.setAttribute("type", "multi"); - snip.setAttribute("color-scheme", "light"); snip.innerHTML = oldCode.replace(/ msgArgs[matchedNum]); + let ruleMessage = ruleInfo.message.replace(/\{(\d+)\}/g, (matchedStr, matchedNum, matchedIndex) => ruleInfo.msgArgs[matchedNum]); document.querySelector("#ruleMessage").innerHTML = ruleMessage.replace(/&/g, "&").replace(//g, ">") } setTimeout(() => { @@ -134,29 +137,36 @@ function updateWithRuleInfo(ruleInfo) { if (val === "Violation") icon = ``; if (val === "Needs review") icon = ``; if (val === "Recommendation") icon = ``; - document.querySelector("#locLevel").innerHTML = `
${icon} ${val}
`; + let level = document.querySelector("#locLevel"); + let parent = level.parentElement; + level = parent.removeChild(level); + parent.insertBefore(level, parent.firstElementChild); + document.querySelector("#locLevel").innerHTML = `
${val}
`; } if (RULE_ID) { document.querySelector("#ruleInfo").innerHTML = `

Rule ID: ${RULE_ID}${ruleInfo.reasonId ? `
Reason ID: ${ruleInfo.reasonId}

` : ""}`; @@ -198,5 +212,12 @@ window.addEventListener("DOMContentLoaded", (evt) => { ruleInfo = JSON.parse(decodeURIComponent(window.location.hash.substring(1))); } updateWithRuleInfo(ruleInfo); + + if (isDarkMode()) { + document.body.setAttribute("class", "dds-theme-zone-g90"); + } else { + document.body.setAttribute("class", "dds-theme-zone-g10"); + } + }) diff --git a/rule-server/src/static/archives/2021.10.25/doc/common/rules.css b/rule-server/src/static/archives/2021.10.25/doc/common/rules.css new file mode 100644 index 000000000..515c8a230 --- /dev/null +++ b/rule-server/src/static/archives/2021.10.25/doc/common/rules.css @@ -0,0 +1,29 @@ +/****************************************************************************** + Copyright:: 2022- IBM, Inc + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + *****************************************************************************/ +@import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); + +html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; +} + +body { + font-family: 'IBM Plex Sans', sans-serif; + padding: 1rem; +} + +h2 { + margin-top: 1rem; + font-size: 16px; + line-height: 24px; + font-weight: 600; +} diff --git a/rule-server/src/static/archives/2021.11.17/doc/common/help.css b/rule-server/src/static/archives/2021.11.17/doc/common/help.css index eea3893a2..1f263f4a7 100644 --- a/rule-server/src/static/archives/2021.11.17/doc/common/help.css +++ b/rule-server/src/static/archives/2021.11.17/doc/common/help.css @@ -10,37 +10,74 @@ See the License for the specific language governing permissions and limitations under the License. *****************************************************************************/ +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css"); @import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/themes.css"); + +bx-list-item>code, p>code, td>code { + background-color: var(--cds-layer); + border-radius: 4px; + bottom: 0.0625em; + color: var(--cds-text-primary); + display: inline; + font-size: .75rem; + font-size: .875em; + font-weight: 400; + letter-spacing: .32px; + line-height: 1.33333; + padding: 0 0.5em; + position: relative; +} + +.toolhelp a { + color: var(--cds-link-primary) +} + +.toolHelp .toolMain p ~ p { + margin-top: .5rem; +} .toolHelp .toolHead h3 { - font-size: 20px; - line-height: 28px; + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 600; + font-size: 16px; + line-height: 24px; } .toolHelp .toolHead .issueLevel { - font-weight: 600; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolHead p { +.toolHelp .toolHead #ruleMessage { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; + margin-top: .5rem; + margin-bottom: .5rem; } -/* productive-heading-03 */ -.toolHelp .toolMain h3 { - font-size: 20px; - line-height: 28px; +.toolHelp .toolHead #groupLabel { + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolMain p { +/* productive-heading-03 */ +.toolHelp .toolMain h3 { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; } .toolHelp .toolSide .bx--list__item { @@ -51,29 +88,44 @@ /* productive-heading-03 */ .toolHelp .toolSide h3 { - font-size: 20px; - line-height: 28px; - font-weight: 400; -} -.toolHelp .toolSide p { - font-size: 20px; - line-height: 28px; - font-weight: 400; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; + font-size: 16px; + line-height: 24px; } -html, body, .toolHelp .bx--row:nth-child(2) { - height: 100%; +@media (min-width: 42rem) { + html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; + } } - body { font-family: 'IBM Plex Sans', sans-serif; + color: var(--cds-text-primary); + background-color: var(--cds-ui-background); } .toolHelp { padding: 0px; margin: 0px; max-width: 100%; - background-color: #be95ff; + background-color: #e8daff; +} + +.toolHelp p { + font-family: 'IBM Plex Sans'; +font-style: normal; +font-weight: 400; +font-size: 14px; +line-height: 20px; +/* or 143% */ + +letter-spacing: 0.16px; +} + +.dds-theme-zone-g90 .toolHelp { + background-color: #31135E; } .toolHelp .bx--row { @@ -85,9 +137,10 @@ body { padding-top: 1rem; } .toolHelp .toolMain { - background-color: #f4f4f4; + background-color: var(--cds-ui-background); padding-top: 1rem; padding-bottom: 1rem; + border-top: solid var(--cds-text-primary) 1px; } .toolHelp .toolMain h2 { margin-top: 32px; @@ -103,9 +156,16 @@ body { .toolHelp .toolSide { padding: 16px 16px 16px 32px; - background-color: #e8daff; - color: black; + background-color: var(--cds-ui-background);; + color: var(--cds-text-primary); + border-top: solid var(--cds-text-primary) 1px; } +@media (min-width: 42rem) { + .toolHelp .toolSide { + border-left: solid var(--cds-text-primary) 1px; + } +} + .toolHelp .toolSide h2 { margin-top: 32px; margin-bottom: 0.5rem; diff --git a/rule-server/src/static/archives/2021.11.17/doc/common/help.js b/rule-server/src/static/archives/2021.11.17/doc/common/help.js index 6bf4ebc24..793ee267d 100644 --- a/rule-server/src/static/archives/2021.11.17/doc/common/help.js +++ b/rule-server/src/static/archives/2021.11.17/doc/common/help.js @@ -49,6 +49,10 @@ class HTMLBaseElement extends HTMLElement { } } +function isDarkMode() { + return (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches); +} + customElements.define( "mark-down", class extends HTMLBaseElement { @@ -86,7 +90,6 @@ customElements.define( const shadowRoot = this; let snip = document.createElement("bx-code-snippet"); snip.setAttribute("type", "multi"); - snip.setAttribute("color-scheme", "light"); snip.innerHTML = oldCode.replace(/ msgArgs[matchedNum]); + let ruleMessage = ruleInfo.message.replace(/\{(\d+)\}/g, (matchedStr, matchedNum, matchedIndex) => ruleInfo.msgArgs[matchedNum]); document.querySelector("#ruleMessage").innerHTML = ruleMessage.replace(/&/g, "&").replace(//g, ">") } setTimeout(() => { @@ -134,29 +137,36 @@ function updateWithRuleInfo(ruleInfo) { if (val === "Violation") icon = ``; if (val === "Needs review") icon = ``; if (val === "Recommendation") icon = ``; - document.querySelector("#locLevel").innerHTML = `
${icon} ${val}
`; + let level = document.querySelector("#locLevel"); + let parent = level.parentElement; + level = parent.removeChild(level); + parent.insertBefore(level, parent.firstElementChild); + document.querySelector("#locLevel").innerHTML = `
${val}
`; } if (RULE_ID) { document.querySelector("#ruleInfo").innerHTML = `

Rule ID: ${RULE_ID}${ruleInfo.reasonId ? `
Reason ID: ${ruleInfo.reasonId}

` : ""}`; @@ -198,5 +212,12 @@ window.addEventListener("DOMContentLoaded", (evt) => { ruleInfo = JSON.parse(decodeURIComponent(window.location.hash.substring(1))); } updateWithRuleInfo(ruleInfo); + + if (isDarkMode()) { + document.body.setAttribute("class", "dds-theme-zone-g90"); + } else { + document.body.setAttribute("class", "dds-theme-zone-g10"); + } + }) diff --git a/rule-server/src/static/archives/2021.11.17/doc/common/rules.css b/rule-server/src/static/archives/2021.11.17/doc/common/rules.css new file mode 100644 index 000000000..515c8a230 --- /dev/null +++ b/rule-server/src/static/archives/2021.11.17/doc/common/rules.css @@ -0,0 +1,29 @@ +/****************************************************************************** + Copyright:: 2022- IBM, Inc + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + *****************************************************************************/ +@import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); + +html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; +} + +body { + font-family: 'IBM Plex Sans', sans-serif; + padding: 1rem; +} + +h2 { + margin-top: 1rem; + font-size: 16px; + line-height: 24px; + font-weight: 600; +} diff --git a/rule-server/src/static/archives/2022.02.01/doc/common/help.css b/rule-server/src/static/archives/2022.02.01/doc/common/help.css index eea3893a2..1f263f4a7 100644 --- a/rule-server/src/static/archives/2022.02.01/doc/common/help.css +++ b/rule-server/src/static/archives/2022.02.01/doc/common/help.css @@ -10,37 +10,74 @@ See the License for the specific language governing permissions and limitations under the License. *****************************************************************************/ +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css"); @import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/themes.css"); + +bx-list-item>code, p>code, td>code { + background-color: var(--cds-layer); + border-radius: 4px; + bottom: 0.0625em; + color: var(--cds-text-primary); + display: inline; + font-size: .75rem; + font-size: .875em; + font-weight: 400; + letter-spacing: .32px; + line-height: 1.33333; + padding: 0 0.5em; + position: relative; +} + +.toolhelp a { + color: var(--cds-link-primary) +} + +.toolHelp .toolMain p ~ p { + margin-top: .5rem; +} .toolHelp .toolHead h3 { - font-size: 20px; - line-height: 28px; + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 600; + font-size: 16px; + line-height: 24px; } .toolHelp .toolHead .issueLevel { - font-weight: 600; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolHead p { +.toolHelp .toolHead #ruleMessage { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; + margin-top: .5rem; + margin-bottom: .5rem; } -/* productive-heading-03 */ -.toolHelp .toolMain h3 { - font-size: 20px; - line-height: 28px; +.toolHelp .toolHead #groupLabel { + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolMain p { +/* productive-heading-03 */ +.toolHelp .toolMain h3 { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; } .toolHelp .toolSide .bx--list__item { @@ -51,29 +88,44 @@ /* productive-heading-03 */ .toolHelp .toolSide h3 { - font-size: 20px; - line-height: 28px; - font-weight: 400; -} -.toolHelp .toolSide p { - font-size: 20px; - line-height: 28px; - font-weight: 400; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; + font-size: 16px; + line-height: 24px; } -html, body, .toolHelp .bx--row:nth-child(2) { - height: 100%; +@media (min-width: 42rem) { + html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; + } } - body { font-family: 'IBM Plex Sans', sans-serif; + color: var(--cds-text-primary); + background-color: var(--cds-ui-background); } .toolHelp { padding: 0px; margin: 0px; max-width: 100%; - background-color: #be95ff; + background-color: #e8daff; +} + +.toolHelp p { + font-family: 'IBM Plex Sans'; +font-style: normal; +font-weight: 400; +font-size: 14px; +line-height: 20px; +/* or 143% */ + +letter-spacing: 0.16px; +} + +.dds-theme-zone-g90 .toolHelp { + background-color: #31135E; } .toolHelp .bx--row { @@ -85,9 +137,10 @@ body { padding-top: 1rem; } .toolHelp .toolMain { - background-color: #f4f4f4; + background-color: var(--cds-ui-background); padding-top: 1rem; padding-bottom: 1rem; + border-top: solid var(--cds-text-primary) 1px; } .toolHelp .toolMain h2 { margin-top: 32px; @@ -103,9 +156,16 @@ body { .toolHelp .toolSide { padding: 16px 16px 16px 32px; - background-color: #e8daff; - color: black; + background-color: var(--cds-ui-background);; + color: var(--cds-text-primary); + border-top: solid var(--cds-text-primary) 1px; } +@media (min-width: 42rem) { + .toolHelp .toolSide { + border-left: solid var(--cds-text-primary) 1px; + } +} + .toolHelp .toolSide h2 { margin-top: 32px; margin-bottom: 0.5rem; diff --git a/rule-server/src/static/archives/2022.02.01/doc/common/help.js b/rule-server/src/static/archives/2022.02.01/doc/common/help.js index 6bf4ebc24..793ee267d 100644 --- a/rule-server/src/static/archives/2022.02.01/doc/common/help.js +++ b/rule-server/src/static/archives/2022.02.01/doc/common/help.js @@ -49,6 +49,10 @@ class HTMLBaseElement extends HTMLElement { } } +function isDarkMode() { + return (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches); +} + customElements.define( "mark-down", class extends HTMLBaseElement { @@ -86,7 +90,6 @@ customElements.define( const shadowRoot = this; let snip = document.createElement("bx-code-snippet"); snip.setAttribute("type", "multi"); - snip.setAttribute("color-scheme", "light"); snip.innerHTML = oldCode.replace(/ msgArgs[matchedNum]); + let ruleMessage = ruleInfo.message.replace(/\{(\d+)\}/g, (matchedStr, matchedNum, matchedIndex) => ruleInfo.msgArgs[matchedNum]); document.querySelector("#ruleMessage").innerHTML = ruleMessage.replace(/&/g, "&").replace(//g, ">") } setTimeout(() => { @@ -134,29 +137,36 @@ function updateWithRuleInfo(ruleInfo) { if (val === "Violation") icon = ``; if (val === "Needs review") icon = ``; if (val === "Recommendation") icon = ``; - document.querySelector("#locLevel").innerHTML = `
${icon} ${val}
`; + let level = document.querySelector("#locLevel"); + let parent = level.parentElement; + level = parent.removeChild(level); + parent.insertBefore(level, parent.firstElementChild); + document.querySelector("#locLevel").innerHTML = `
${val}
`; } if (RULE_ID) { document.querySelector("#ruleInfo").innerHTML = `

Rule ID: ${RULE_ID}${ruleInfo.reasonId ? `
Reason ID: ${ruleInfo.reasonId}

` : ""}`; @@ -198,5 +212,12 @@ window.addEventListener("DOMContentLoaded", (evt) => { ruleInfo = JSON.parse(decodeURIComponent(window.location.hash.substring(1))); } updateWithRuleInfo(ruleInfo); + + if (isDarkMode()) { + document.body.setAttribute("class", "dds-theme-zone-g90"); + } else { + document.body.setAttribute("class", "dds-theme-zone-g10"); + } + }) diff --git a/rule-server/src/static/archives/2022.02.01/doc/common/rules.css b/rule-server/src/static/archives/2022.02.01/doc/common/rules.css new file mode 100644 index 000000000..515c8a230 --- /dev/null +++ b/rule-server/src/static/archives/2022.02.01/doc/common/rules.css @@ -0,0 +1,29 @@ +/****************************************************************************** + Copyright:: 2022- IBM, Inc + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + *****************************************************************************/ +@import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); + +html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; +} + +body { + font-family: 'IBM Plex Sans', sans-serif; + padding: 1rem; +} + +h2 { + margin-top: 1rem; + font-size: 16px; + line-height: 24px; + font-weight: 600; +} diff --git a/rule-server/src/static/archives/2022.03.03/doc/common/help.css b/rule-server/src/static/archives/2022.03.03/doc/common/help.css index eea3893a2..1f263f4a7 100644 --- a/rule-server/src/static/archives/2022.03.03/doc/common/help.css +++ b/rule-server/src/static/archives/2022.03.03/doc/common/help.css @@ -10,37 +10,74 @@ See the License for the specific language governing permissions and limitations under the License. *****************************************************************************/ +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css"); @import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/themes.css"); + +bx-list-item>code, p>code, td>code { + background-color: var(--cds-layer); + border-radius: 4px; + bottom: 0.0625em; + color: var(--cds-text-primary); + display: inline; + font-size: .75rem; + font-size: .875em; + font-weight: 400; + letter-spacing: .32px; + line-height: 1.33333; + padding: 0 0.5em; + position: relative; +} + +.toolhelp a { + color: var(--cds-link-primary) +} + +.toolHelp .toolMain p ~ p { + margin-top: .5rem; +} .toolHelp .toolHead h3 { - font-size: 20px; - line-height: 28px; + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 600; + font-size: 16px; + line-height: 24px; } .toolHelp .toolHead .issueLevel { - font-weight: 600; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolHead p { +.toolHelp .toolHead #ruleMessage { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; + margin-top: .5rem; + margin-bottom: .5rem; } -/* productive-heading-03 */ -.toolHelp .toolMain h3 { - font-size: 20px; - line-height: 28px; +.toolHelp .toolHead #groupLabel { + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolMain p { +/* productive-heading-03 */ +.toolHelp .toolMain h3 { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; } .toolHelp .toolSide .bx--list__item { @@ -51,29 +88,44 @@ /* productive-heading-03 */ .toolHelp .toolSide h3 { - font-size: 20px; - line-height: 28px; - font-weight: 400; -} -.toolHelp .toolSide p { - font-size: 20px; - line-height: 28px; - font-weight: 400; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; + font-size: 16px; + line-height: 24px; } -html, body, .toolHelp .bx--row:nth-child(2) { - height: 100%; +@media (min-width: 42rem) { + html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; + } } - body { font-family: 'IBM Plex Sans', sans-serif; + color: var(--cds-text-primary); + background-color: var(--cds-ui-background); } .toolHelp { padding: 0px; margin: 0px; max-width: 100%; - background-color: #be95ff; + background-color: #e8daff; +} + +.toolHelp p { + font-family: 'IBM Plex Sans'; +font-style: normal; +font-weight: 400; +font-size: 14px; +line-height: 20px; +/* or 143% */ + +letter-spacing: 0.16px; +} + +.dds-theme-zone-g90 .toolHelp { + background-color: #31135E; } .toolHelp .bx--row { @@ -85,9 +137,10 @@ body { padding-top: 1rem; } .toolHelp .toolMain { - background-color: #f4f4f4; + background-color: var(--cds-ui-background); padding-top: 1rem; padding-bottom: 1rem; + border-top: solid var(--cds-text-primary) 1px; } .toolHelp .toolMain h2 { margin-top: 32px; @@ -103,9 +156,16 @@ body { .toolHelp .toolSide { padding: 16px 16px 16px 32px; - background-color: #e8daff; - color: black; + background-color: var(--cds-ui-background);; + color: var(--cds-text-primary); + border-top: solid var(--cds-text-primary) 1px; } +@media (min-width: 42rem) { + .toolHelp .toolSide { + border-left: solid var(--cds-text-primary) 1px; + } +} + .toolHelp .toolSide h2 { margin-top: 32px; margin-bottom: 0.5rem; diff --git a/rule-server/src/static/archives/2022.03.03/doc/common/help.js b/rule-server/src/static/archives/2022.03.03/doc/common/help.js index 6bf4ebc24..793ee267d 100644 --- a/rule-server/src/static/archives/2022.03.03/doc/common/help.js +++ b/rule-server/src/static/archives/2022.03.03/doc/common/help.js @@ -49,6 +49,10 @@ class HTMLBaseElement extends HTMLElement { } } +function isDarkMode() { + return (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches); +} + customElements.define( "mark-down", class extends HTMLBaseElement { @@ -86,7 +90,6 @@ customElements.define( const shadowRoot = this; let snip = document.createElement("bx-code-snippet"); snip.setAttribute("type", "multi"); - snip.setAttribute("color-scheme", "light"); snip.innerHTML = oldCode.replace(/ msgArgs[matchedNum]); + let ruleMessage = ruleInfo.message.replace(/\{(\d+)\}/g, (matchedStr, matchedNum, matchedIndex) => ruleInfo.msgArgs[matchedNum]); document.querySelector("#ruleMessage").innerHTML = ruleMessage.replace(/&/g, "&").replace(//g, ">") } setTimeout(() => { @@ -134,29 +137,36 @@ function updateWithRuleInfo(ruleInfo) { if (val === "Violation") icon = ``; if (val === "Needs review") icon = ``; if (val === "Recommendation") icon = ``; - document.querySelector("#locLevel").innerHTML = `
${icon} ${val}
`; + let level = document.querySelector("#locLevel"); + let parent = level.parentElement; + level = parent.removeChild(level); + parent.insertBefore(level, parent.firstElementChild); + document.querySelector("#locLevel").innerHTML = `
${val}
`; } if (RULE_ID) { document.querySelector("#ruleInfo").innerHTML = `

Rule ID: ${RULE_ID}${ruleInfo.reasonId ? `
Reason ID: ${ruleInfo.reasonId}

` : ""}`; @@ -198,5 +212,12 @@ window.addEventListener("DOMContentLoaded", (evt) => { ruleInfo = JSON.parse(decodeURIComponent(window.location.hash.substring(1))); } updateWithRuleInfo(ruleInfo); + + if (isDarkMode()) { + document.body.setAttribute("class", "dds-theme-zone-g90"); + } else { + document.body.setAttribute("class", "dds-theme-zone-g10"); + } + }) diff --git a/rule-server/src/static/archives/2022.03.03/doc/common/rules.css b/rule-server/src/static/archives/2022.03.03/doc/common/rules.css new file mode 100644 index 000000000..515c8a230 --- /dev/null +++ b/rule-server/src/static/archives/2022.03.03/doc/common/rules.css @@ -0,0 +1,29 @@ +/****************************************************************************** + Copyright:: 2022- IBM, Inc + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + *****************************************************************************/ +@import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); + +html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; +} + +body { + font-family: 'IBM Plex Sans', sans-serif; + padding: 1rem; +} + +h2 { + margin-top: 1rem; + font-size: 16px; + line-height: 24px; + font-weight: 600; +} diff --git a/rule-server/src/static/archives/2022.03.12/doc/common/help.css b/rule-server/src/static/archives/2022.03.12/doc/common/help.css index d93818bf0..1f263f4a7 100644 --- a/rule-server/src/static/archives/2022.03.12/doc/common/help.css +++ b/rule-server/src/static/archives/2022.03.12/doc/common/help.css @@ -10,13 +10,15 @@ See the License for the specific language governing permissions and limitations under the License. *****************************************************************************/ +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css"); @import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/themes.css"); bx-list-item>code, p>code, td>code { - background-color: #e0e0e0; + background-color: var(--cds-layer); border-radius: 4px; bottom: 0.0625em; - color: #161616; + color: var(--cds-text-primary); display: inline; font-size: .75rem; font-size: .875em; @@ -27,39 +29,55 @@ bx-list-item>code, p>code, td>code { position: relative; } +.toolhelp a { + color: var(--cds-link-primary) +} + .toolHelp .toolMain p ~ p { margin-top: .5rem; } .toolHelp .toolHead h3 { - font-size: 20px; - line-height: 28px; + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 600; + font-size: 16px; + line-height: 24px; } .toolHelp .toolHead .issueLevel { - font-weight: 600; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolHead p { +.toolHelp .toolHead #ruleMessage { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; + margin-top: .5rem; + margin-bottom: .5rem; } -/* productive-heading-03 */ -.toolHelp .toolMain h3 { - font-size: 20px; - line-height: 28px; +.toolHelp .toolHead #groupLabel { + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolMain p { +/* productive-heading-03 */ +.toolHelp .toolMain h3 { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; } .toolHelp .toolSide .bx--list__item { @@ -70,29 +88,44 @@ bx-list-item>code, p>code, td>code { /* productive-heading-03 */ .toolHelp .toolSide h3 { - font-size: 20px; - line-height: 28px; - font-weight: 400; -} -.toolHelp .toolSide p { - font-size: 20px; - line-height: 28px; - font-weight: 400; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; + font-size: 16px; + line-height: 24px; } -html, body, .toolHelp .bx--row:nth-child(2) { - height: 100%; +@media (min-width: 42rem) { + html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; + } } - body { font-family: 'IBM Plex Sans', sans-serif; + color: var(--cds-text-primary); + background-color: var(--cds-ui-background); } .toolHelp { padding: 0px; margin: 0px; max-width: 100%; - background-color: #be95ff; + background-color: #e8daff; +} + +.toolHelp p { + font-family: 'IBM Plex Sans'; +font-style: normal; +font-weight: 400; +font-size: 14px; +line-height: 20px; +/* or 143% */ + +letter-spacing: 0.16px; +} + +.dds-theme-zone-g90 .toolHelp { + background-color: #31135E; } .toolHelp .bx--row { @@ -104,9 +137,10 @@ body { padding-top: 1rem; } .toolHelp .toolMain { - background-color: #f4f4f4; + background-color: var(--cds-ui-background); padding-top: 1rem; padding-bottom: 1rem; + border-top: solid var(--cds-text-primary) 1px; } .toolHelp .toolMain h2 { margin-top: 32px; @@ -122,9 +156,16 @@ body { .toolHelp .toolSide { padding: 16px 16px 16px 32px; - background-color: #e8daff; - color: black; + background-color: var(--cds-ui-background);; + color: var(--cds-text-primary); + border-top: solid var(--cds-text-primary) 1px; +} +@media (min-width: 42rem) { + .toolHelp .toolSide { + border-left: solid var(--cds-text-primary) 1px; + } } + .toolHelp .toolSide h2 { margin-top: 32px; margin-bottom: 0.5rem; diff --git a/rule-server/src/static/archives/2022.03.12/doc/common/help.js b/rule-server/src/static/archives/2022.03.12/doc/common/help.js index 6bf4ebc24..793ee267d 100644 --- a/rule-server/src/static/archives/2022.03.12/doc/common/help.js +++ b/rule-server/src/static/archives/2022.03.12/doc/common/help.js @@ -49,6 +49,10 @@ class HTMLBaseElement extends HTMLElement { } } +function isDarkMode() { + return (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches); +} + customElements.define( "mark-down", class extends HTMLBaseElement { @@ -86,7 +90,6 @@ customElements.define( const shadowRoot = this; let snip = document.createElement("bx-code-snippet"); snip.setAttribute("type", "multi"); - snip.setAttribute("color-scheme", "light"); snip.innerHTML = oldCode.replace(/ msgArgs[matchedNum]); + let ruleMessage = ruleInfo.message.replace(/\{(\d+)\}/g, (matchedStr, matchedNum, matchedIndex) => ruleInfo.msgArgs[matchedNum]); document.querySelector("#ruleMessage").innerHTML = ruleMessage.replace(/&/g, "&").replace(//g, ">") } setTimeout(() => { @@ -134,29 +137,36 @@ function updateWithRuleInfo(ruleInfo) { if (val === "Violation") icon = ``; if (val === "Needs review") icon = ``; if (val === "Recommendation") icon = ``; - document.querySelector("#locLevel").innerHTML = `
${icon} ${val}
`; + let level = document.querySelector("#locLevel"); + let parent = level.parentElement; + level = parent.removeChild(level); + parent.insertBefore(level, parent.firstElementChild); + document.querySelector("#locLevel").innerHTML = `
${val}
`; } if (RULE_ID) { document.querySelector("#ruleInfo").innerHTML = `

Rule ID: ${RULE_ID}${ruleInfo.reasonId ? `
Reason ID: ${ruleInfo.reasonId}

` : ""}`; @@ -198,5 +212,12 @@ window.addEventListener("DOMContentLoaded", (evt) => { ruleInfo = JSON.parse(decodeURIComponent(window.location.hash.substring(1))); } updateWithRuleInfo(ruleInfo); + + if (isDarkMode()) { + document.body.setAttribute("class", "dds-theme-zone-g90"); + } else { + document.body.setAttribute("class", "dds-theme-zone-g10"); + } + }) diff --git a/rule-server/src/static/archives/2022.03.12/doc/common/rules.css b/rule-server/src/static/archives/2022.03.12/doc/common/rules.css new file mode 100644 index 000000000..515c8a230 --- /dev/null +++ b/rule-server/src/static/archives/2022.03.12/doc/common/rules.css @@ -0,0 +1,29 @@ +/****************************************************************************** + Copyright:: 2022- IBM, Inc + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + *****************************************************************************/ +@import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); + +html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; +} + +body { + font-family: 'IBM Plex Sans', sans-serif; + padding: 1rem; +} + +h2 { + margin-top: 1rem; + font-size: 16px; + line-height: 24px; + font-weight: 600; +} diff --git a/rule-server/src/static/archives/2022.03.18/doc/common/help.css b/rule-server/src/static/archives/2022.03.18/doc/common/help.css index d93818bf0..1f263f4a7 100644 --- a/rule-server/src/static/archives/2022.03.18/doc/common/help.css +++ b/rule-server/src/static/archives/2022.03.18/doc/common/help.css @@ -10,13 +10,15 @@ See the License for the specific language governing permissions and limitations under the License. *****************************************************************************/ +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css"); @import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/themes.css"); bx-list-item>code, p>code, td>code { - background-color: #e0e0e0; + background-color: var(--cds-layer); border-radius: 4px; bottom: 0.0625em; - color: #161616; + color: var(--cds-text-primary); display: inline; font-size: .75rem; font-size: .875em; @@ -27,39 +29,55 @@ bx-list-item>code, p>code, td>code { position: relative; } +.toolhelp a { + color: var(--cds-link-primary) +} + .toolHelp .toolMain p ~ p { margin-top: .5rem; } .toolHelp .toolHead h3 { - font-size: 20px; - line-height: 28px; + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 600; + font-size: 16px; + line-height: 24px; } .toolHelp .toolHead .issueLevel { - font-weight: 600; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolHead p { +.toolHelp .toolHead #ruleMessage { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; + margin-top: .5rem; + margin-bottom: .5rem; } -/* productive-heading-03 */ -.toolHelp .toolMain h3 { - font-size: 20px; - line-height: 28px; +.toolHelp .toolHead #groupLabel { + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolMain p { +/* productive-heading-03 */ +.toolHelp .toolMain h3 { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; } .toolHelp .toolSide .bx--list__item { @@ -70,29 +88,44 @@ bx-list-item>code, p>code, td>code { /* productive-heading-03 */ .toolHelp .toolSide h3 { - font-size: 20px; - line-height: 28px; - font-weight: 400; -} -.toolHelp .toolSide p { - font-size: 20px; - line-height: 28px; - font-weight: 400; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; + font-size: 16px; + line-height: 24px; } -html, body, .toolHelp .bx--row:nth-child(2) { - height: 100%; +@media (min-width: 42rem) { + html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; + } } - body { font-family: 'IBM Plex Sans', sans-serif; + color: var(--cds-text-primary); + background-color: var(--cds-ui-background); } .toolHelp { padding: 0px; margin: 0px; max-width: 100%; - background-color: #be95ff; + background-color: #e8daff; +} + +.toolHelp p { + font-family: 'IBM Plex Sans'; +font-style: normal; +font-weight: 400; +font-size: 14px; +line-height: 20px; +/* or 143% */ + +letter-spacing: 0.16px; +} + +.dds-theme-zone-g90 .toolHelp { + background-color: #31135E; } .toolHelp .bx--row { @@ -104,9 +137,10 @@ body { padding-top: 1rem; } .toolHelp .toolMain { - background-color: #f4f4f4; + background-color: var(--cds-ui-background); padding-top: 1rem; padding-bottom: 1rem; + border-top: solid var(--cds-text-primary) 1px; } .toolHelp .toolMain h2 { margin-top: 32px; @@ -122,9 +156,16 @@ body { .toolHelp .toolSide { padding: 16px 16px 16px 32px; - background-color: #e8daff; - color: black; + background-color: var(--cds-ui-background);; + color: var(--cds-text-primary); + border-top: solid var(--cds-text-primary) 1px; +} +@media (min-width: 42rem) { + .toolHelp .toolSide { + border-left: solid var(--cds-text-primary) 1px; + } } + .toolHelp .toolSide h2 { margin-top: 32px; margin-bottom: 0.5rem; diff --git a/rule-server/src/static/archives/2022.03.18/doc/common/help.js b/rule-server/src/static/archives/2022.03.18/doc/common/help.js index 6bf4ebc24..793ee267d 100644 --- a/rule-server/src/static/archives/2022.03.18/doc/common/help.js +++ b/rule-server/src/static/archives/2022.03.18/doc/common/help.js @@ -49,6 +49,10 @@ class HTMLBaseElement extends HTMLElement { } } +function isDarkMode() { + return (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches); +} + customElements.define( "mark-down", class extends HTMLBaseElement { @@ -86,7 +90,6 @@ customElements.define( const shadowRoot = this; let snip = document.createElement("bx-code-snippet"); snip.setAttribute("type", "multi"); - snip.setAttribute("color-scheme", "light"); snip.innerHTML = oldCode.replace(/ msgArgs[matchedNum]); + let ruleMessage = ruleInfo.message.replace(/\{(\d+)\}/g, (matchedStr, matchedNum, matchedIndex) => ruleInfo.msgArgs[matchedNum]); document.querySelector("#ruleMessage").innerHTML = ruleMessage.replace(/&/g, "&").replace(//g, ">") } setTimeout(() => { @@ -134,29 +137,36 @@ function updateWithRuleInfo(ruleInfo) { if (val === "Violation") icon = ``; if (val === "Needs review") icon = ``; if (val === "Recommendation") icon = ``; - document.querySelector("#locLevel").innerHTML = `
${icon} ${val}
`; + let level = document.querySelector("#locLevel"); + let parent = level.parentElement; + level = parent.removeChild(level); + parent.insertBefore(level, parent.firstElementChild); + document.querySelector("#locLevel").innerHTML = `
${val}
`; } if (RULE_ID) { document.querySelector("#ruleInfo").innerHTML = `

Rule ID: ${RULE_ID}${ruleInfo.reasonId ? `
Reason ID: ${ruleInfo.reasonId}

` : ""}`; @@ -198,5 +212,12 @@ window.addEventListener("DOMContentLoaded", (evt) => { ruleInfo = JSON.parse(decodeURIComponent(window.location.hash.substring(1))); } updateWithRuleInfo(ruleInfo); + + if (isDarkMode()) { + document.body.setAttribute("class", "dds-theme-zone-g90"); + } else { + document.body.setAttribute("class", "dds-theme-zone-g10"); + } + }) diff --git a/rule-server/src/static/archives/2022.03.18/doc/common/rules.css b/rule-server/src/static/archives/2022.03.18/doc/common/rules.css new file mode 100644 index 000000000..515c8a230 --- /dev/null +++ b/rule-server/src/static/archives/2022.03.18/doc/common/rules.css @@ -0,0 +1,29 @@ +/****************************************************************************** + Copyright:: 2022- IBM, Inc + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + *****************************************************************************/ +@import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); + +html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; +} + +body { + font-family: 'IBM Plex Sans', sans-serif; + padding: 1rem; +} + +h2 { + margin-top: 1rem; + font-size: 16px; + line-height: 24px; + font-weight: 600; +} diff --git a/rule-server/src/static/archives/2022.04.19/doc/common/help.css b/rule-server/src/static/archives/2022.04.19/doc/common/help.css index d93818bf0..1f263f4a7 100644 --- a/rule-server/src/static/archives/2022.04.19/doc/common/help.css +++ b/rule-server/src/static/archives/2022.04.19/doc/common/help.css @@ -10,13 +10,15 @@ See the License for the specific language governing permissions and limitations under the License. *****************************************************************************/ +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css"); @import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/themes.css"); bx-list-item>code, p>code, td>code { - background-color: #e0e0e0; + background-color: var(--cds-layer); border-radius: 4px; bottom: 0.0625em; - color: #161616; + color: var(--cds-text-primary); display: inline; font-size: .75rem; font-size: .875em; @@ -27,39 +29,55 @@ bx-list-item>code, p>code, td>code { position: relative; } +.toolhelp a { + color: var(--cds-link-primary) +} + .toolHelp .toolMain p ~ p { margin-top: .5rem; } .toolHelp .toolHead h3 { - font-size: 20px; - line-height: 28px; + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 600; + font-size: 16px; + line-height: 24px; } .toolHelp .toolHead .issueLevel { - font-weight: 600; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolHead p { +.toolHelp .toolHead #ruleMessage { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; + margin-top: .5rem; + margin-bottom: .5rem; } -/* productive-heading-03 */ -.toolHelp .toolMain h3 { - font-size: 20px; - line-height: 28px; +.toolHelp .toolHead #groupLabel { + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolMain p { +/* productive-heading-03 */ +.toolHelp .toolMain h3 { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; } .toolHelp .toolSide .bx--list__item { @@ -70,29 +88,44 @@ bx-list-item>code, p>code, td>code { /* productive-heading-03 */ .toolHelp .toolSide h3 { - font-size: 20px; - line-height: 28px; - font-weight: 400; -} -.toolHelp .toolSide p { - font-size: 20px; - line-height: 28px; - font-weight: 400; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; + font-size: 16px; + line-height: 24px; } -html, body, .toolHelp .bx--row:nth-child(2) { - height: 100%; +@media (min-width: 42rem) { + html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; + } } - body { font-family: 'IBM Plex Sans', sans-serif; + color: var(--cds-text-primary); + background-color: var(--cds-ui-background); } .toolHelp { padding: 0px; margin: 0px; max-width: 100%; - background-color: #be95ff; + background-color: #e8daff; +} + +.toolHelp p { + font-family: 'IBM Plex Sans'; +font-style: normal; +font-weight: 400; +font-size: 14px; +line-height: 20px; +/* or 143% */ + +letter-spacing: 0.16px; +} + +.dds-theme-zone-g90 .toolHelp { + background-color: #31135E; } .toolHelp .bx--row { @@ -104,9 +137,10 @@ body { padding-top: 1rem; } .toolHelp .toolMain { - background-color: #f4f4f4; + background-color: var(--cds-ui-background); padding-top: 1rem; padding-bottom: 1rem; + border-top: solid var(--cds-text-primary) 1px; } .toolHelp .toolMain h2 { margin-top: 32px; @@ -122,9 +156,16 @@ body { .toolHelp .toolSide { padding: 16px 16px 16px 32px; - background-color: #e8daff; - color: black; + background-color: var(--cds-ui-background);; + color: var(--cds-text-primary); + border-top: solid var(--cds-text-primary) 1px; +} +@media (min-width: 42rem) { + .toolHelp .toolSide { + border-left: solid var(--cds-text-primary) 1px; + } } + .toolHelp .toolSide h2 { margin-top: 32px; margin-bottom: 0.5rem; diff --git a/rule-server/src/static/archives/2022.04.19/doc/common/help.js b/rule-server/src/static/archives/2022.04.19/doc/common/help.js index 17c597f08..793ee267d 100644 --- a/rule-server/src/static/archives/2022.04.19/doc/common/help.js +++ b/rule-server/src/static/archives/2022.04.19/doc/common/help.js @@ -49,6 +49,10 @@ class HTMLBaseElement extends HTMLElement { } } +function isDarkMode() { + return (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches); +} + customElements.define( "mark-down", class extends HTMLBaseElement { @@ -86,7 +90,6 @@ customElements.define( const shadowRoot = this; let snip = document.createElement("bx-code-snippet"); snip.setAttribute("type", "multi"); - snip.setAttribute("color-scheme", "light"); snip.innerHTML = oldCode.replace(/ - + - + `; if (val === "Needs review") icon = ``; if (val === "Recommendation") icon = ``; - document.querySelector("#locLevel").innerHTML = `
${icon} ${val}
`; + let level = document.querySelector("#locLevel"); + let parent = level.parentElement; + level = parent.removeChild(level); + parent.insertBefore(level, parent.firstElementChild); + document.querySelector("#locLevel").innerHTML = `
${val}
`; } if (RULE_ID) { document.querySelector("#ruleInfo").innerHTML = `

Rule ID: ${RULE_ID}${ruleInfo.reasonId ? `
Reason ID: ${ruleInfo.reasonId}

` : ""}`; @@ -198,5 +212,12 @@ window.addEventListener("DOMContentLoaded", (evt) => { ruleInfo = JSON.parse(decodeURIComponent(window.location.hash.substring(1))); } updateWithRuleInfo(ruleInfo); + + if (isDarkMode()) { + document.body.setAttribute("class", "dds-theme-zone-g90"); + } else { + document.body.setAttribute("class", "dds-theme-zone-g10"); + } + }) diff --git a/rule-server/src/static/archives/2022.05.04/doc/common/help.css b/rule-server/src/static/archives/2022.05.04/doc/common/help.css index d93818bf0..1f263f4a7 100644 --- a/rule-server/src/static/archives/2022.05.04/doc/common/help.css +++ b/rule-server/src/static/archives/2022.05.04/doc/common/help.css @@ -10,13 +10,15 @@ See the License for the specific language governing permissions and limitations under the License. *****************************************************************************/ +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css"); @import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/themes.css"); bx-list-item>code, p>code, td>code { - background-color: #e0e0e0; + background-color: var(--cds-layer); border-radius: 4px; bottom: 0.0625em; - color: #161616; + color: var(--cds-text-primary); display: inline; font-size: .75rem; font-size: .875em; @@ -27,39 +29,55 @@ bx-list-item>code, p>code, td>code { position: relative; } +.toolhelp a { + color: var(--cds-link-primary) +} + .toolHelp .toolMain p ~ p { margin-top: .5rem; } .toolHelp .toolHead h3 { - font-size: 20px; - line-height: 28px; + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 600; + font-size: 16px; + line-height: 24px; } .toolHelp .toolHead .issueLevel { - font-weight: 600; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolHead p { +.toolHelp .toolHead #ruleMessage { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; + margin-top: .5rem; + margin-bottom: .5rem; } -/* productive-heading-03 */ -.toolHelp .toolMain h3 { - font-size: 20px; - line-height: 28px; +.toolHelp .toolHead #groupLabel { + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolMain p { +/* productive-heading-03 */ +.toolHelp .toolMain h3 { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; } .toolHelp .toolSide .bx--list__item { @@ -70,29 +88,44 @@ bx-list-item>code, p>code, td>code { /* productive-heading-03 */ .toolHelp .toolSide h3 { - font-size: 20px; - line-height: 28px; - font-weight: 400; -} -.toolHelp .toolSide p { - font-size: 20px; - line-height: 28px; - font-weight: 400; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; + font-size: 16px; + line-height: 24px; } -html, body, .toolHelp .bx--row:nth-child(2) { - height: 100%; +@media (min-width: 42rem) { + html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; + } } - body { font-family: 'IBM Plex Sans', sans-serif; + color: var(--cds-text-primary); + background-color: var(--cds-ui-background); } .toolHelp { padding: 0px; margin: 0px; max-width: 100%; - background-color: #be95ff; + background-color: #e8daff; +} + +.toolHelp p { + font-family: 'IBM Plex Sans'; +font-style: normal; +font-weight: 400; +font-size: 14px; +line-height: 20px; +/* or 143% */ + +letter-spacing: 0.16px; +} + +.dds-theme-zone-g90 .toolHelp { + background-color: #31135E; } .toolHelp .bx--row { @@ -104,9 +137,10 @@ body { padding-top: 1rem; } .toolHelp .toolMain { - background-color: #f4f4f4; + background-color: var(--cds-ui-background); padding-top: 1rem; padding-bottom: 1rem; + border-top: solid var(--cds-text-primary) 1px; } .toolHelp .toolMain h2 { margin-top: 32px; @@ -122,9 +156,16 @@ body { .toolHelp .toolSide { padding: 16px 16px 16px 32px; - background-color: #e8daff; - color: black; + background-color: var(--cds-ui-background);; + color: var(--cds-text-primary); + border-top: solid var(--cds-text-primary) 1px; +} +@media (min-width: 42rem) { + .toolHelp .toolSide { + border-left: solid var(--cds-text-primary) 1px; + } } + .toolHelp .toolSide h2 { margin-top: 32px; margin-bottom: 0.5rem; diff --git a/rule-server/src/static/archives/2022.05.04/doc/common/help.js b/rule-server/src/static/archives/2022.05.04/doc/common/help.js index 17c597f08..793ee267d 100644 --- a/rule-server/src/static/archives/2022.05.04/doc/common/help.js +++ b/rule-server/src/static/archives/2022.05.04/doc/common/help.js @@ -49,6 +49,10 @@ class HTMLBaseElement extends HTMLElement { } } +function isDarkMode() { + return (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches); +} + customElements.define( "mark-down", class extends HTMLBaseElement { @@ -86,7 +90,6 @@ customElements.define( const shadowRoot = this; let snip = document.createElement("bx-code-snippet"); snip.setAttribute("type", "multi"); - snip.setAttribute("color-scheme", "light"); snip.innerHTML = oldCode.replace(/ - + - + `; if (val === "Needs review") icon = ``; if (val === "Recommendation") icon = ``; - document.querySelector("#locLevel").innerHTML = `
${icon} ${val}
`; + let level = document.querySelector("#locLevel"); + let parent = level.parentElement; + level = parent.removeChild(level); + parent.insertBefore(level, parent.firstElementChild); + document.querySelector("#locLevel").innerHTML = `
${val}
`; } if (RULE_ID) { document.querySelector("#ruleInfo").innerHTML = `

Rule ID: ${RULE_ID}${ruleInfo.reasonId ? `
Reason ID: ${ruleInfo.reasonId}

` : ""}`; @@ -198,5 +212,12 @@ window.addEventListener("DOMContentLoaded", (evt) => { ruleInfo = JSON.parse(decodeURIComponent(window.location.hash.substring(1))); } updateWithRuleInfo(ruleInfo); + + if (isDarkMode()) { + document.body.setAttribute("class", "dds-theme-zone-g90"); + } else { + document.body.setAttribute("class", "dds-theme-zone-g10"); + } + }) diff --git a/rule-server/src/static/archives/2022.06.09/doc/common/help.css b/rule-server/src/static/archives/2022.06.09/doc/common/help.css index d93818bf0..1f263f4a7 100644 --- a/rule-server/src/static/archives/2022.06.09/doc/common/help.css +++ b/rule-server/src/static/archives/2022.06.09/doc/common/help.css @@ -10,13 +10,15 @@ See the License for the specific language governing permissions and limitations under the License. *****************************************************************************/ +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css"); @import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/themes.css"); bx-list-item>code, p>code, td>code { - background-color: #e0e0e0; + background-color: var(--cds-layer); border-radius: 4px; bottom: 0.0625em; - color: #161616; + color: var(--cds-text-primary); display: inline; font-size: .75rem; font-size: .875em; @@ -27,39 +29,55 @@ bx-list-item>code, p>code, td>code { position: relative; } +.toolhelp a { + color: var(--cds-link-primary) +} + .toolHelp .toolMain p ~ p { margin-top: .5rem; } .toolHelp .toolHead h3 { - font-size: 20px; - line-height: 28px; + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 600; + font-size: 16px; + line-height: 24px; } .toolHelp .toolHead .issueLevel { - font-weight: 600; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolHead p { +.toolHelp .toolHead #ruleMessage { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; + margin-top: .5rem; + margin-bottom: .5rem; } -/* productive-heading-03 */ -.toolHelp .toolMain h3 { - font-size: 20px; - line-height: 28px; +.toolHelp .toolHead #groupLabel { + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolMain p { +/* productive-heading-03 */ +.toolHelp .toolMain h3 { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; } .toolHelp .toolSide .bx--list__item { @@ -70,29 +88,44 @@ bx-list-item>code, p>code, td>code { /* productive-heading-03 */ .toolHelp .toolSide h3 { - font-size: 20px; - line-height: 28px; - font-weight: 400; -} -.toolHelp .toolSide p { - font-size: 20px; - line-height: 28px; - font-weight: 400; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; + font-size: 16px; + line-height: 24px; } -html, body, .toolHelp .bx--row:nth-child(2) { - height: 100%; +@media (min-width: 42rem) { + html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; + } } - body { font-family: 'IBM Plex Sans', sans-serif; + color: var(--cds-text-primary); + background-color: var(--cds-ui-background); } .toolHelp { padding: 0px; margin: 0px; max-width: 100%; - background-color: #be95ff; + background-color: #e8daff; +} + +.toolHelp p { + font-family: 'IBM Plex Sans'; +font-style: normal; +font-weight: 400; +font-size: 14px; +line-height: 20px; +/* or 143% */ + +letter-spacing: 0.16px; +} + +.dds-theme-zone-g90 .toolHelp { + background-color: #31135E; } .toolHelp .bx--row { @@ -104,9 +137,10 @@ body { padding-top: 1rem; } .toolHelp .toolMain { - background-color: #f4f4f4; + background-color: var(--cds-ui-background); padding-top: 1rem; padding-bottom: 1rem; + border-top: solid var(--cds-text-primary) 1px; } .toolHelp .toolMain h2 { margin-top: 32px; @@ -122,9 +156,16 @@ body { .toolHelp .toolSide { padding: 16px 16px 16px 32px; - background-color: #e8daff; - color: black; + background-color: var(--cds-ui-background);; + color: var(--cds-text-primary); + border-top: solid var(--cds-text-primary) 1px; +} +@media (min-width: 42rem) { + .toolHelp .toolSide { + border-left: solid var(--cds-text-primary) 1px; + } } + .toolHelp .toolSide h2 { margin-top: 32px; margin-bottom: 0.5rem; diff --git a/rule-server/src/static/archives/2022.06.09/doc/common/help.js b/rule-server/src/static/archives/2022.06.09/doc/common/help.js index 17c597f08..793ee267d 100644 --- a/rule-server/src/static/archives/2022.06.09/doc/common/help.js +++ b/rule-server/src/static/archives/2022.06.09/doc/common/help.js @@ -49,6 +49,10 @@ class HTMLBaseElement extends HTMLElement { } } +function isDarkMode() { + return (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches); +} + customElements.define( "mark-down", class extends HTMLBaseElement { @@ -86,7 +90,6 @@ customElements.define( const shadowRoot = this; let snip = document.createElement("bx-code-snippet"); snip.setAttribute("type", "multi"); - snip.setAttribute("color-scheme", "light"); snip.innerHTML = oldCode.replace(/ - + - + `; if (val === "Needs review") icon = ``; if (val === "Recommendation") icon = ``; - document.querySelector("#locLevel").innerHTML = `
${icon} ${val}
`; + let level = document.querySelector("#locLevel"); + let parent = level.parentElement; + level = parent.removeChild(level); + parent.insertBefore(level, parent.firstElementChild); + document.querySelector("#locLevel").innerHTML = `
${val}
`; } if (RULE_ID) { document.querySelector("#ruleInfo").innerHTML = `

Rule ID: ${RULE_ID}${ruleInfo.reasonId ? `
Reason ID: ${ruleInfo.reasonId}

` : ""}`; @@ -198,5 +212,12 @@ window.addEventListener("DOMContentLoaded", (evt) => { ruleInfo = JSON.parse(decodeURIComponent(window.location.hash.substring(1))); } updateWithRuleInfo(ruleInfo); + + if (isDarkMode()) { + document.body.setAttribute("class", "dds-theme-zone-g90"); + } else { + document.body.setAttribute("class", "dds-theme-zone-g10"); + } + }) diff --git a/rule-server/src/static/archives/2022.07.06/doc/common/help.css b/rule-server/src/static/archives/2022.07.06/doc/common/help.css index d93818bf0..1f263f4a7 100644 --- a/rule-server/src/static/archives/2022.07.06/doc/common/help.css +++ b/rule-server/src/static/archives/2022.07.06/doc/common/help.css @@ -10,13 +10,15 @@ See the License for the specific language governing permissions and limitations under the License. *****************************************************************************/ +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css"); @import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/themes.css"); bx-list-item>code, p>code, td>code { - background-color: #e0e0e0; + background-color: var(--cds-layer); border-radius: 4px; bottom: 0.0625em; - color: #161616; + color: var(--cds-text-primary); display: inline; font-size: .75rem; font-size: .875em; @@ -27,39 +29,55 @@ bx-list-item>code, p>code, td>code { position: relative; } +.toolhelp a { + color: var(--cds-link-primary) +} + .toolHelp .toolMain p ~ p { margin-top: .5rem; } .toolHelp .toolHead h3 { - font-size: 20px; - line-height: 28px; + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 600; + font-size: 16px; + line-height: 24px; } .toolHelp .toolHead .issueLevel { - font-weight: 600; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolHead p { +.toolHelp .toolHead #ruleMessage { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; + margin-top: .5rem; + margin-bottom: .5rem; } -/* productive-heading-03 */ -.toolHelp .toolMain h3 { - font-size: 20px; - line-height: 28px; +.toolHelp .toolHead #groupLabel { + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolMain p { +/* productive-heading-03 */ +.toolHelp .toolMain h3 { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; } .toolHelp .toolSide .bx--list__item { @@ -70,29 +88,44 @@ bx-list-item>code, p>code, td>code { /* productive-heading-03 */ .toolHelp .toolSide h3 { - font-size: 20px; - line-height: 28px; - font-weight: 400; -} -.toolHelp .toolSide p { - font-size: 20px; - line-height: 28px; - font-weight: 400; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; + font-size: 16px; + line-height: 24px; } -html, body, .toolHelp .bx--row:nth-child(2) { - height: 100%; +@media (min-width: 42rem) { + html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; + } } - body { font-family: 'IBM Plex Sans', sans-serif; + color: var(--cds-text-primary); + background-color: var(--cds-ui-background); } .toolHelp { padding: 0px; margin: 0px; max-width: 100%; - background-color: #be95ff; + background-color: #e8daff; +} + +.toolHelp p { + font-family: 'IBM Plex Sans'; +font-style: normal; +font-weight: 400; +font-size: 14px; +line-height: 20px; +/* or 143% */ + +letter-spacing: 0.16px; +} + +.dds-theme-zone-g90 .toolHelp { + background-color: #31135E; } .toolHelp .bx--row { @@ -104,9 +137,10 @@ body { padding-top: 1rem; } .toolHelp .toolMain { - background-color: #f4f4f4; + background-color: var(--cds-ui-background); padding-top: 1rem; padding-bottom: 1rem; + border-top: solid var(--cds-text-primary) 1px; } .toolHelp .toolMain h2 { margin-top: 32px; @@ -122,9 +156,16 @@ body { .toolHelp .toolSide { padding: 16px 16px 16px 32px; - background-color: #e8daff; - color: black; + background-color: var(--cds-ui-background);; + color: var(--cds-text-primary); + border-top: solid var(--cds-text-primary) 1px; +} +@media (min-width: 42rem) { + .toolHelp .toolSide { + border-left: solid var(--cds-text-primary) 1px; + } } + .toolHelp .toolSide h2 { margin-top: 32px; margin-bottom: 0.5rem; diff --git a/rule-server/src/static/archives/2022.07.06/doc/common/help.js b/rule-server/src/static/archives/2022.07.06/doc/common/help.js index 17c597f08..793ee267d 100644 --- a/rule-server/src/static/archives/2022.07.06/doc/common/help.js +++ b/rule-server/src/static/archives/2022.07.06/doc/common/help.js @@ -49,6 +49,10 @@ class HTMLBaseElement extends HTMLElement { } } +function isDarkMode() { + return (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches); +} + customElements.define( "mark-down", class extends HTMLBaseElement { @@ -86,7 +90,6 @@ customElements.define( const shadowRoot = this; let snip = document.createElement("bx-code-snippet"); snip.setAttribute("type", "multi"); - snip.setAttribute("color-scheme", "light"); snip.innerHTML = oldCode.replace(/ - + - + `; if (val === "Needs review") icon = ``; if (val === "Recommendation") icon = ``; - document.querySelector("#locLevel").innerHTML = `
${icon} ${val}
`; + let level = document.querySelector("#locLevel"); + let parent = level.parentElement; + level = parent.removeChild(level); + parent.insertBefore(level, parent.firstElementChild); + document.querySelector("#locLevel").innerHTML = `
${val}
`; } if (RULE_ID) { document.querySelector("#ruleInfo").innerHTML = `

Rule ID: ${RULE_ID}${ruleInfo.reasonId ? `
Reason ID: ${ruleInfo.reasonId}

` : ""}`; @@ -198,5 +212,12 @@ window.addEventListener("DOMContentLoaded", (evt) => { ruleInfo = JSON.parse(decodeURIComponent(window.location.hash.substring(1))); } updateWithRuleInfo(ruleInfo); + + if (isDarkMode()) { + document.body.setAttribute("class", "dds-theme-zone-g90"); + } else { + document.body.setAttribute("class", "dds-theme-zone-g10"); + } + }) diff --git a/rule-server/src/static/archives/2022.08.10/doc/common/help.css b/rule-server/src/static/archives/2022.08.10/doc/common/help.css index d93818bf0..1f263f4a7 100644 --- a/rule-server/src/static/archives/2022.08.10/doc/common/help.css +++ b/rule-server/src/static/archives/2022.08.10/doc/common/help.css @@ -10,13 +10,15 @@ See the License for the specific language governing permissions and limitations under the License. *****************************************************************************/ +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css"); @import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/themes.css"); bx-list-item>code, p>code, td>code { - background-color: #e0e0e0; + background-color: var(--cds-layer); border-radius: 4px; bottom: 0.0625em; - color: #161616; + color: var(--cds-text-primary); display: inline; font-size: .75rem; font-size: .875em; @@ -27,39 +29,55 @@ bx-list-item>code, p>code, td>code { position: relative; } +.toolhelp a { + color: var(--cds-link-primary) +} + .toolHelp .toolMain p ~ p { margin-top: .5rem; } .toolHelp .toolHead h3 { - font-size: 20px; - line-height: 28px; + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 600; + font-size: 16px; + line-height: 24px; } .toolHelp .toolHead .issueLevel { - font-weight: 600; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolHead p { +.toolHelp .toolHead #ruleMessage { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; + margin-top: .5rem; + margin-bottom: .5rem; } -/* productive-heading-03 */ -.toolHelp .toolMain h3 { - font-size: 20px; - line-height: 28px; +.toolHelp .toolHead #groupLabel { + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolMain p { +/* productive-heading-03 */ +.toolHelp .toolMain h3 { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; } .toolHelp .toolSide .bx--list__item { @@ -70,29 +88,44 @@ bx-list-item>code, p>code, td>code { /* productive-heading-03 */ .toolHelp .toolSide h3 { - font-size: 20px; - line-height: 28px; - font-weight: 400; -} -.toolHelp .toolSide p { - font-size: 20px; - line-height: 28px; - font-weight: 400; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; + font-size: 16px; + line-height: 24px; } -html, body, .toolHelp .bx--row:nth-child(2) { - height: 100%; +@media (min-width: 42rem) { + html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; + } } - body { font-family: 'IBM Plex Sans', sans-serif; + color: var(--cds-text-primary); + background-color: var(--cds-ui-background); } .toolHelp { padding: 0px; margin: 0px; max-width: 100%; - background-color: #be95ff; + background-color: #e8daff; +} + +.toolHelp p { + font-family: 'IBM Plex Sans'; +font-style: normal; +font-weight: 400; +font-size: 14px; +line-height: 20px; +/* or 143% */ + +letter-spacing: 0.16px; +} + +.dds-theme-zone-g90 .toolHelp { + background-color: #31135E; } .toolHelp .bx--row { @@ -104,9 +137,10 @@ body { padding-top: 1rem; } .toolHelp .toolMain { - background-color: #f4f4f4; + background-color: var(--cds-ui-background); padding-top: 1rem; padding-bottom: 1rem; + border-top: solid var(--cds-text-primary) 1px; } .toolHelp .toolMain h2 { margin-top: 32px; @@ -122,9 +156,16 @@ body { .toolHelp .toolSide { padding: 16px 16px 16px 32px; - background-color: #e8daff; - color: black; + background-color: var(--cds-ui-background);; + color: var(--cds-text-primary); + border-top: solid var(--cds-text-primary) 1px; +} +@media (min-width: 42rem) { + .toolHelp .toolSide { + border-left: solid var(--cds-text-primary) 1px; + } } + .toolHelp .toolSide h2 { margin-top: 32px; margin-bottom: 0.5rem; diff --git a/rule-server/src/static/archives/2022.08.10/doc/common/help.js b/rule-server/src/static/archives/2022.08.10/doc/common/help.js index 17c597f08..793ee267d 100644 --- a/rule-server/src/static/archives/2022.08.10/doc/common/help.js +++ b/rule-server/src/static/archives/2022.08.10/doc/common/help.js @@ -49,6 +49,10 @@ class HTMLBaseElement extends HTMLElement { } } +function isDarkMode() { + return (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches); +} + customElements.define( "mark-down", class extends HTMLBaseElement { @@ -86,7 +90,6 @@ customElements.define( const shadowRoot = this; let snip = document.createElement("bx-code-snippet"); snip.setAttribute("type", "multi"); - snip.setAttribute("color-scheme", "light"); snip.innerHTML = oldCode.replace(/ - + - + `; if (val === "Needs review") icon = ``; if (val === "Recommendation") icon = ``; - document.querySelector("#locLevel").innerHTML = `
${icon} ${val}
`; + let level = document.querySelector("#locLevel"); + let parent = level.parentElement; + level = parent.removeChild(level); + parent.insertBefore(level, parent.firstElementChild); + document.querySelector("#locLevel").innerHTML = `
${val}
`; } if (RULE_ID) { document.querySelector("#ruleInfo").innerHTML = `

Rule ID: ${RULE_ID}${ruleInfo.reasonId ? `
Reason ID: ${ruleInfo.reasonId}

` : ""}`; @@ -198,5 +212,12 @@ window.addEventListener("DOMContentLoaded", (evt) => { ruleInfo = JSON.parse(decodeURIComponent(window.location.hash.substring(1))); } updateWithRuleInfo(ruleInfo); + + if (isDarkMode()) { + document.body.setAttribute("class", "dds-theme-zone-g90"); + } else { + document.body.setAttribute("class", "dds-theme-zone-g10"); + } + }) diff --git a/rule-server/src/static/archives/2022.09.21/doc/common/help.css b/rule-server/src/static/archives/2022.09.21/doc/common/help.css index d93818bf0..1f263f4a7 100644 --- a/rule-server/src/static/archives/2022.09.21/doc/common/help.css +++ b/rule-server/src/static/archives/2022.09.21/doc/common/help.css @@ -10,13 +10,15 @@ See the License for the specific language governing permissions and limitations under the License. *****************************************************************************/ +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css"); @import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/themes.css"); bx-list-item>code, p>code, td>code { - background-color: #e0e0e0; + background-color: var(--cds-layer); border-radius: 4px; bottom: 0.0625em; - color: #161616; + color: var(--cds-text-primary); display: inline; font-size: .75rem; font-size: .875em; @@ -27,39 +29,55 @@ bx-list-item>code, p>code, td>code { position: relative; } +.toolhelp a { + color: var(--cds-link-primary) +} + .toolHelp .toolMain p ~ p { margin-top: .5rem; } .toolHelp .toolHead h3 { - font-size: 20px; - line-height: 28px; + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 600; + font-size: 16px; + line-height: 24px; } .toolHelp .toolHead .issueLevel { - font-weight: 600; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolHead p { +.toolHelp .toolHead #ruleMessage { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; + margin-top: .5rem; + margin-bottom: .5rem; } -/* productive-heading-03 */ -.toolHelp .toolMain h3 { - font-size: 20px; - line-height: 28px; +.toolHelp .toolHead #groupLabel { + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolMain p { +/* productive-heading-03 */ +.toolHelp .toolMain h3 { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; } .toolHelp .toolSide .bx--list__item { @@ -70,29 +88,44 @@ bx-list-item>code, p>code, td>code { /* productive-heading-03 */ .toolHelp .toolSide h3 { - font-size: 20px; - line-height: 28px; - font-weight: 400; -} -.toolHelp .toolSide p { - font-size: 20px; - line-height: 28px; - font-weight: 400; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; + font-size: 16px; + line-height: 24px; } -html, body, .toolHelp .bx--row:nth-child(2) { - height: 100%; +@media (min-width: 42rem) { + html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; + } } - body { font-family: 'IBM Plex Sans', sans-serif; + color: var(--cds-text-primary); + background-color: var(--cds-ui-background); } .toolHelp { padding: 0px; margin: 0px; max-width: 100%; - background-color: #be95ff; + background-color: #e8daff; +} + +.toolHelp p { + font-family: 'IBM Plex Sans'; +font-style: normal; +font-weight: 400; +font-size: 14px; +line-height: 20px; +/* or 143% */ + +letter-spacing: 0.16px; +} + +.dds-theme-zone-g90 .toolHelp { + background-color: #31135E; } .toolHelp .bx--row { @@ -104,9 +137,10 @@ body { padding-top: 1rem; } .toolHelp .toolMain { - background-color: #f4f4f4; + background-color: var(--cds-ui-background); padding-top: 1rem; padding-bottom: 1rem; + border-top: solid var(--cds-text-primary) 1px; } .toolHelp .toolMain h2 { margin-top: 32px; @@ -122,9 +156,16 @@ body { .toolHelp .toolSide { padding: 16px 16px 16px 32px; - background-color: #e8daff; - color: black; + background-color: var(--cds-ui-background);; + color: var(--cds-text-primary); + border-top: solid var(--cds-text-primary) 1px; +} +@media (min-width: 42rem) { + .toolHelp .toolSide { + border-left: solid var(--cds-text-primary) 1px; + } } + .toolHelp .toolSide h2 { margin-top: 32px; margin-bottom: 0.5rem; diff --git a/rule-server/src/static/archives/2022.09.21/doc/common/help.js b/rule-server/src/static/archives/2022.09.21/doc/common/help.js index 17c597f08..793ee267d 100644 --- a/rule-server/src/static/archives/2022.09.21/doc/common/help.js +++ b/rule-server/src/static/archives/2022.09.21/doc/common/help.js @@ -49,6 +49,10 @@ class HTMLBaseElement extends HTMLElement { } } +function isDarkMode() { + return (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches); +} + customElements.define( "mark-down", class extends HTMLBaseElement { @@ -86,7 +90,6 @@ customElements.define( const shadowRoot = this; let snip = document.createElement("bx-code-snippet"); snip.setAttribute("type", "multi"); - snip.setAttribute("color-scheme", "light"); snip.innerHTML = oldCode.replace(/ - + - + `; if (val === "Needs review") icon = ``; if (val === "Recommendation") icon = ``; - document.querySelector("#locLevel").innerHTML = `
${icon} ${val}
`; + let level = document.querySelector("#locLevel"); + let parent = level.parentElement; + level = parent.removeChild(level); + parent.insertBefore(level, parent.firstElementChild); + document.querySelector("#locLevel").innerHTML = `
${val}
`; } if (RULE_ID) { document.querySelector("#ruleInfo").innerHTML = `

Rule ID: ${RULE_ID}${ruleInfo.reasonId ? `
Reason ID: ${ruleInfo.reasonId}

` : ""}`; @@ -198,5 +212,12 @@ window.addEventListener("DOMContentLoaded", (evt) => { ruleInfo = JSON.parse(decodeURIComponent(window.location.hash.substring(1))); } updateWithRuleInfo(ruleInfo); + + if (isDarkMode()) { + document.body.setAttribute("class", "dds-theme-zone-g90"); + } else { + document.body.setAttribute("class", "dds-theme-zone-g10"); + } + }) diff --git a/rule-server/src/static/archives/2022.10.13/doc/common/help.css b/rule-server/src/static/archives/2022.10.13/doc/common/help.css index d93818bf0..1f263f4a7 100644 --- a/rule-server/src/static/archives/2022.10.13/doc/common/help.css +++ b/rule-server/src/static/archives/2022.10.13/doc/common/help.css @@ -10,13 +10,15 @@ See the License for the specific language governing permissions and limitations under the License. *****************************************************************************/ +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css"); @import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/themes.css"); bx-list-item>code, p>code, td>code { - background-color: #e0e0e0; + background-color: var(--cds-layer); border-radius: 4px; bottom: 0.0625em; - color: #161616; + color: var(--cds-text-primary); display: inline; font-size: .75rem; font-size: .875em; @@ -27,39 +29,55 @@ bx-list-item>code, p>code, td>code { position: relative; } +.toolhelp a { + color: var(--cds-link-primary) +} + .toolHelp .toolMain p ~ p { margin-top: .5rem; } .toolHelp .toolHead h3 { - font-size: 20px; - line-height: 28px; + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 600; + font-size: 16px; + line-height: 24px; } .toolHelp .toolHead .issueLevel { - font-weight: 600; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolHead p { +.toolHelp .toolHead #ruleMessage { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; + margin-top: .5rem; + margin-bottom: .5rem; } -/* productive-heading-03 */ -.toolHelp .toolMain h3 { - font-size: 20px; - line-height: 28px; +.toolHelp .toolHead #groupLabel { + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolMain p { +/* productive-heading-03 */ +.toolHelp .toolMain h3 { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; } .toolHelp .toolSide .bx--list__item { @@ -70,29 +88,44 @@ bx-list-item>code, p>code, td>code { /* productive-heading-03 */ .toolHelp .toolSide h3 { - font-size: 20px; - line-height: 28px; - font-weight: 400; -} -.toolHelp .toolSide p { - font-size: 20px; - line-height: 28px; - font-weight: 400; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; + font-size: 16px; + line-height: 24px; } -html, body, .toolHelp .bx--row:nth-child(2) { - height: 100%; +@media (min-width: 42rem) { + html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; + } } - body { font-family: 'IBM Plex Sans', sans-serif; + color: var(--cds-text-primary); + background-color: var(--cds-ui-background); } .toolHelp { padding: 0px; margin: 0px; max-width: 100%; - background-color: #be95ff; + background-color: #e8daff; +} + +.toolHelp p { + font-family: 'IBM Plex Sans'; +font-style: normal; +font-weight: 400; +font-size: 14px; +line-height: 20px; +/* or 143% */ + +letter-spacing: 0.16px; +} + +.dds-theme-zone-g90 .toolHelp { + background-color: #31135E; } .toolHelp .bx--row { @@ -104,9 +137,10 @@ body { padding-top: 1rem; } .toolHelp .toolMain { - background-color: #f4f4f4; + background-color: var(--cds-ui-background); padding-top: 1rem; padding-bottom: 1rem; + border-top: solid var(--cds-text-primary) 1px; } .toolHelp .toolMain h2 { margin-top: 32px; @@ -122,9 +156,16 @@ body { .toolHelp .toolSide { padding: 16px 16px 16px 32px; - background-color: #e8daff; - color: black; + background-color: var(--cds-ui-background);; + color: var(--cds-text-primary); + border-top: solid var(--cds-text-primary) 1px; +} +@media (min-width: 42rem) { + .toolHelp .toolSide { + border-left: solid var(--cds-text-primary) 1px; + } } + .toolHelp .toolSide h2 { margin-top: 32px; margin-bottom: 0.5rem; diff --git a/rule-server/src/static/archives/2022.10.13/doc/common/help.js b/rule-server/src/static/archives/2022.10.13/doc/common/help.js index 17c597f08..793ee267d 100644 --- a/rule-server/src/static/archives/2022.10.13/doc/common/help.js +++ b/rule-server/src/static/archives/2022.10.13/doc/common/help.js @@ -49,6 +49,10 @@ class HTMLBaseElement extends HTMLElement { } } +function isDarkMode() { + return (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches); +} + customElements.define( "mark-down", class extends HTMLBaseElement { @@ -86,7 +90,6 @@ customElements.define( const shadowRoot = this; let snip = document.createElement("bx-code-snippet"); snip.setAttribute("type", "multi"); - snip.setAttribute("color-scheme", "light"); snip.innerHTML = oldCode.replace(/ - + - + `; if (val === "Needs review") icon = ``; if (val === "Recommendation") icon = ``; - document.querySelector("#locLevel").innerHTML = `
${icon} ${val}
`; + let level = document.querySelector("#locLevel"); + let parent = level.parentElement; + level = parent.removeChild(level); + parent.insertBefore(level, parent.firstElementChild); + document.querySelector("#locLevel").innerHTML = `
${val}
`; } if (RULE_ID) { document.querySelector("#ruleInfo").innerHTML = `

Rule ID: ${RULE_ID}${ruleInfo.reasonId ? `
Reason ID: ${ruleInfo.reasonId}

` : ""}`; @@ -198,5 +212,12 @@ window.addEventListener("DOMContentLoaded", (evt) => { ruleInfo = JSON.parse(decodeURIComponent(window.location.hash.substring(1))); } updateWithRuleInfo(ruleInfo); + + if (isDarkMode()) { + document.body.setAttribute("class", "dds-theme-zone-g90"); + } else { + document.body.setAttribute("class", "dds-theme-zone-g10"); + } + }) diff --git a/rule-server/src/static/archives/2022.11.08/doc/common/help.css b/rule-server/src/static/archives/2022.11.08/doc/common/help.css index d93818bf0..1f263f4a7 100644 --- a/rule-server/src/static/archives/2022.11.08/doc/common/help.css +++ b/rule-server/src/static/archives/2022.11.08/doc/common/help.css @@ -10,13 +10,15 @@ See the License for the specific language governing permissions and limitations under the License. *****************************************************************************/ +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css"); @import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/themes.css"); bx-list-item>code, p>code, td>code { - background-color: #e0e0e0; + background-color: var(--cds-layer); border-radius: 4px; bottom: 0.0625em; - color: #161616; + color: var(--cds-text-primary); display: inline; font-size: .75rem; font-size: .875em; @@ -27,39 +29,55 @@ bx-list-item>code, p>code, td>code { position: relative; } +.toolhelp a { + color: var(--cds-link-primary) +} + .toolHelp .toolMain p ~ p { margin-top: .5rem; } .toolHelp .toolHead h3 { - font-size: 20px; - line-height: 28px; + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 600; + font-size: 16px; + line-height: 24px; } .toolHelp .toolHead .issueLevel { - font-weight: 600; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolHead p { +.toolHelp .toolHead #ruleMessage { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; + margin-top: .5rem; + margin-bottom: .5rem; } -/* productive-heading-03 */ -.toolHelp .toolMain h3 { - font-size: 20px; - line-height: 28px; +.toolHelp .toolHead #groupLabel { + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolMain p { +/* productive-heading-03 */ +.toolHelp .toolMain h3 { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; } .toolHelp .toolSide .bx--list__item { @@ -70,29 +88,44 @@ bx-list-item>code, p>code, td>code { /* productive-heading-03 */ .toolHelp .toolSide h3 { - font-size: 20px; - line-height: 28px; - font-weight: 400; -} -.toolHelp .toolSide p { - font-size: 20px; - line-height: 28px; - font-weight: 400; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; + font-size: 16px; + line-height: 24px; } -html, body, .toolHelp .bx--row:nth-child(2) { - height: 100%; +@media (min-width: 42rem) { + html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; + } } - body { font-family: 'IBM Plex Sans', sans-serif; + color: var(--cds-text-primary); + background-color: var(--cds-ui-background); } .toolHelp { padding: 0px; margin: 0px; max-width: 100%; - background-color: #be95ff; + background-color: #e8daff; +} + +.toolHelp p { + font-family: 'IBM Plex Sans'; +font-style: normal; +font-weight: 400; +font-size: 14px; +line-height: 20px; +/* or 143% */ + +letter-spacing: 0.16px; +} + +.dds-theme-zone-g90 .toolHelp { + background-color: #31135E; } .toolHelp .bx--row { @@ -104,9 +137,10 @@ body { padding-top: 1rem; } .toolHelp .toolMain { - background-color: #f4f4f4; + background-color: var(--cds-ui-background); padding-top: 1rem; padding-bottom: 1rem; + border-top: solid var(--cds-text-primary) 1px; } .toolHelp .toolMain h2 { margin-top: 32px; @@ -122,9 +156,16 @@ body { .toolHelp .toolSide { padding: 16px 16px 16px 32px; - background-color: #e8daff; - color: black; + background-color: var(--cds-ui-background);; + color: var(--cds-text-primary); + border-top: solid var(--cds-text-primary) 1px; +} +@media (min-width: 42rem) { + .toolHelp .toolSide { + border-left: solid var(--cds-text-primary) 1px; + } } + .toolHelp .toolSide h2 { margin-top: 32px; margin-bottom: 0.5rem; diff --git a/rule-server/src/static/archives/2022.11.08/doc/common/help.js b/rule-server/src/static/archives/2022.11.08/doc/common/help.js index 17c597f08..793ee267d 100644 --- a/rule-server/src/static/archives/2022.11.08/doc/common/help.js +++ b/rule-server/src/static/archives/2022.11.08/doc/common/help.js @@ -49,6 +49,10 @@ class HTMLBaseElement extends HTMLElement { } } +function isDarkMode() { + return (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches); +} + customElements.define( "mark-down", class extends HTMLBaseElement { @@ -86,7 +90,6 @@ customElements.define( const shadowRoot = this; let snip = document.createElement("bx-code-snippet"); snip.setAttribute("type", "multi"); - snip.setAttribute("color-scheme", "light"); snip.innerHTML = oldCode.replace(/ - + - + `; if (val === "Needs review") icon = ``; if (val === "Recommendation") icon = ``; - document.querySelector("#locLevel").innerHTML = `
${icon} ${val}
`; + let level = document.querySelector("#locLevel"); + let parent = level.parentElement; + level = parent.removeChild(level); + parent.insertBefore(level, parent.firstElementChild); + document.querySelector("#locLevel").innerHTML = `
${val}
`; } if (RULE_ID) { document.querySelector("#ruleInfo").innerHTML = `

Rule ID: ${RULE_ID}${ruleInfo.reasonId ? `
Reason ID: ${ruleInfo.reasonId}

` : ""}`; @@ -198,5 +212,12 @@ window.addEventListener("DOMContentLoaded", (evt) => { ruleInfo = JSON.parse(decodeURIComponent(window.location.hash.substring(1))); } updateWithRuleInfo(ruleInfo); + + if (isDarkMode()) { + document.body.setAttribute("class", "dds-theme-zone-g90"); + } else { + document.body.setAttribute("class", "dds-theme-zone-g10"); + } + }) diff --git a/rule-server/src/static/archives/2023.01.11/doc/common/help.css b/rule-server/src/static/archives/2023.01.11/doc/common/help.css index d93818bf0..1f263f4a7 100644 --- a/rule-server/src/static/archives/2023.01.11/doc/common/help.css +++ b/rule-server/src/static/archives/2023.01.11/doc/common/help.css @@ -10,13 +10,15 @@ See the License for the specific language governing permissions and limitations under the License. *****************************************************************************/ +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css"); @import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/themes.css"); bx-list-item>code, p>code, td>code { - background-color: #e0e0e0; + background-color: var(--cds-layer); border-radius: 4px; bottom: 0.0625em; - color: #161616; + color: var(--cds-text-primary); display: inline; font-size: .75rem; font-size: .875em; @@ -27,39 +29,55 @@ bx-list-item>code, p>code, td>code { position: relative; } +.toolhelp a { + color: var(--cds-link-primary) +} + .toolHelp .toolMain p ~ p { margin-top: .5rem; } .toolHelp .toolHead h3 { - font-size: 20px; - line-height: 28px; + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 600; + font-size: 16px; + line-height: 24px; } .toolHelp .toolHead .issueLevel { - font-weight: 600; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolHead p { +.toolHelp .toolHead #ruleMessage { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; + margin-top: .5rem; + margin-bottom: .5rem; } -/* productive-heading-03 */ -.toolHelp .toolMain h3 { - font-size: 20px; - line-height: 28px; +.toolHelp .toolHead #groupLabel { + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolMain p { +/* productive-heading-03 */ +.toolHelp .toolMain h3 { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; } .toolHelp .toolSide .bx--list__item { @@ -70,29 +88,44 @@ bx-list-item>code, p>code, td>code { /* productive-heading-03 */ .toolHelp .toolSide h3 { - font-size: 20px; - line-height: 28px; - font-weight: 400; -} -.toolHelp .toolSide p { - font-size: 20px; - line-height: 28px; - font-weight: 400; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; + font-size: 16px; + line-height: 24px; } -html, body, .toolHelp .bx--row:nth-child(2) { - height: 100%; +@media (min-width: 42rem) { + html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; + } } - body { font-family: 'IBM Plex Sans', sans-serif; + color: var(--cds-text-primary); + background-color: var(--cds-ui-background); } .toolHelp { padding: 0px; margin: 0px; max-width: 100%; - background-color: #be95ff; + background-color: #e8daff; +} + +.toolHelp p { + font-family: 'IBM Plex Sans'; +font-style: normal; +font-weight: 400; +font-size: 14px; +line-height: 20px; +/* or 143% */ + +letter-spacing: 0.16px; +} + +.dds-theme-zone-g90 .toolHelp { + background-color: #31135E; } .toolHelp .bx--row { @@ -104,9 +137,10 @@ body { padding-top: 1rem; } .toolHelp .toolMain { - background-color: #f4f4f4; + background-color: var(--cds-ui-background); padding-top: 1rem; padding-bottom: 1rem; + border-top: solid var(--cds-text-primary) 1px; } .toolHelp .toolMain h2 { margin-top: 32px; @@ -122,9 +156,16 @@ body { .toolHelp .toolSide { padding: 16px 16px 16px 32px; - background-color: #e8daff; - color: black; + background-color: var(--cds-ui-background);; + color: var(--cds-text-primary); + border-top: solid var(--cds-text-primary) 1px; +} +@media (min-width: 42rem) { + .toolHelp .toolSide { + border-left: solid var(--cds-text-primary) 1px; + } } + .toolHelp .toolSide h2 { margin-top: 32px; margin-bottom: 0.5rem; diff --git a/rule-server/src/static/archives/2023.01.11/doc/common/help.js b/rule-server/src/static/archives/2023.01.11/doc/common/help.js index 17c597f08..793ee267d 100644 --- a/rule-server/src/static/archives/2023.01.11/doc/common/help.js +++ b/rule-server/src/static/archives/2023.01.11/doc/common/help.js @@ -49,6 +49,10 @@ class HTMLBaseElement extends HTMLElement { } } +function isDarkMode() { + return (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches); +} + customElements.define( "mark-down", class extends HTMLBaseElement { @@ -86,7 +90,6 @@ customElements.define( const shadowRoot = this; let snip = document.createElement("bx-code-snippet"); snip.setAttribute("type", "multi"); - snip.setAttribute("color-scheme", "light"); snip.innerHTML = oldCode.replace(/ - + - + `; if (val === "Needs review") icon = ``; if (val === "Recommendation") icon = ``; - document.querySelector("#locLevel").innerHTML = `
${icon} ${val}
`; + let level = document.querySelector("#locLevel"); + let parent = level.parentElement; + level = parent.removeChild(level); + parent.insertBefore(level, parent.firstElementChild); + document.querySelector("#locLevel").innerHTML = `
${val}
`; } if (RULE_ID) { document.querySelector("#ruleInfo").innerHTML = `

Rule ID: ${RULE_ID}${ruleInfo.reasonId ? `
Reason ID: ${ruleInfo.reasonId}

` : ""}`; @@ -198,5 +212,12 @@ window.addEventListener("DOMContentLoaded", (evt) => { ruleInfo = JSON.parse(decodeURIComponent(window.location.hash.substring(1))); } updateWithRuleInfo(ruleInfo); + + if (isDarkMode()) { + document.body.setAttribute("class", "dds-theme-zone-g90"); + } else { + document.body.setAttribute("class", "dds-theme-zone-g10"); + } + }) diff --git a/rule-server/src/static/archives/2023.01.27/doc/common/help.css b/rule-server/src/static/archives/2023.01.27/doc/common/help.css index d93818bf0..1f263f4a7 100644 --- a/rule-server/src/static/archives/2023.01.27/doc/common/help.css +++ b/rule-server/src/static/archives/2023.01.27/doc/common/help.css @@ -10,13 +10,15 @@ See the License for the specific language governing permissions and limitations under the License. *****************************************************************************/ +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css"); @import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/themes.css"); bx-list-item>code, p>code, td>code { - background-color: #e0e0e0; + background-color: var(--cds-layer); border-radius: 4px; bottom: 0.0625em; - color: #161616; + color: var(--cds-text-primary); display: inline; font-size: .75rem; font-size: .875em; @@ -27,39 +29,55 @@ bx-list-item>code, p>code, td>code { position: relative; } +.toolhelp a { + color: var(--cds-link-primary) +} + .toolHelp .toolMain p ~ p { margin-top: .5rem; } .toolHelp .toolHead h3 { - font-size: 20px; - line-height: 28px; + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 600; + font-size: 16px; + line-height: 24px; } .toolHelp .toolHead .issueLevel { - font-weight: 600; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolHead p { +.toolHelp .toolHead #ruleMessage { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; + margin-top: .5rem; + margin-bottom: .5rem; } -/* productive-heading-03 */ -.toolHelp .toolMain h3 { - font-size: 20px; - line-height: 28px; +.toolHelp .toolHead #groupLabel { + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolMain p { +/* productive-heading-03 */ +.toolHelp .toolMain h3 { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; } .toolHelp .toolSide .bx--list__item { @@ -70,29 +88,44 @@ bx-list-item>code, p>code, td>code { /* productive-heading-03 */ .toolHelp .toolSide h3 { - font-size: 20px; - line-height: 28px; - font-weight: 400; -} -.toolHelp .toolSide p { - font-size: 20px; - line-height: 28px; - font-weight: 400; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; + font-size: 16px; + line-height: 24px; } -html, body, .toolHelp .bx--row:nth-child(2) { - height: 100%; +@media (min-width: 42rem) { + html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; + } } - body { font-family: 'IBM Plex Sans', sans-serif; + color: var(--cds-text-primary); + background-color: var(--cds-ui-background); } .toolHelp { padding: 0px; margin: 0px; max-width: 100%; - background-color: #be95ff; + background-color: #e8daff; +} + +.toolHelp p { + font-family: 'IBM Plex Sans'; +font-style: normal; +font-weight: 400; +font-size: 14px; +line-height: 20px; +/* or 143% */ + +letter-spacing: 0.16px; +} + +.dds-theme-zone-g90 .toolHelp { + background-color: #31135E; } .toolHelp .bx--row { @@ -104,9 +137,10 @@ body { padding-top: 1rem; } .toolHelp .toolMain { - background-color: #f4f4f4; + background-color: var(--cds-ui-background); padding-top: 1rem; padding-bottom: 1rem; + border-top: solid var(--cds-text-primary) 1px; } .toolHelp .toolMain h2 { margin-top: 32px; @@ -122,9 +156,16 @@ body { .toolHelp .toolSide { padding: 16px 16px 16px 32px; - background-color: #e8daff; - color: black; + background-color: var(--cds-ui-background);; + color: var(--cds-text-primary); + border-top: solid var(--cds-text-primary) 1px; +} +@media (min-width: 42rem) { + .toolHelp .toolSide { + border-left: solid var(--cds-text-primary) 1px; + } } + .toolHelp .toolSide h2 { margin-top: 32px; margin-bottom: 0.5rem; diff --git a/rule-server/src/static/archives/2023.01.27/doc/common/help.js b/rule-server/src/static/archives/2023.01.27/doc/common/help.js index 17c597f08..793ee267d 100644 --- a/rule-server/src/static/archives/2023.01.27/doc/common/help.js +++ b/rule-server/src/static/archives/2023.01.27/doc/common/help.js @@ -49,6 +49,10 @@ class HTMLBaseElement extends HTMLElement { } } +function isDarkMode() { + return (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches); +} + customElements.define( "mark-down", class extends HTMLBaseElement { @@ -86,7 +90,6 @@ customElements.define( const shadowRoot = this; let snip = document.createElement("bx-code-snippet"); snip.setAttribute("type", "multi"); - snip.setAttribute("color-scheme", "light"); snip.innerHTML = oldCode.replace(/ - + - + `; if (val === "Needs review") icon = ``; if (val === "Recommendation") icon = ``; - document.querySelector("#locLevel").innerHTML = `
${icon} ${val}
`; + let level = document.querySelector("#locLevel"); + let parent = level.parentElement; + level = parent.removeChild(level); + parent.insertBefore(level, parent.firstElementChild); + document.querySelector("#locLevel").innerHTML = `
${val}
`; } if (RULE_ID) { document.querySelector("#ruleInfo").innerHTML = `

Rule ID: ${RULE_ID}${ruleInfo.reasonId ? `
Reason ID: ${ruleInfo.reasonId}

` : ""}`; @@ -198,5 +212,12 @@ window.addEventListener("DOMContentLoaded", (evt) => { ruleInfo = JSON.parse(decodeURIComponent(window.location.hash.substring(1))); } updateWithRuleInfo(ruleInfo); + + if (isDarkMode()) { + document.body.setAttribute("class", "dds-theme-zone-g90"); + } else { + document.body.setAttribute("class", "dds-theme-zone-g10"); + } + }) diff --git a/rule-server/src/static/archives/2023.02.23/doc/common/help.css b/rule-server/src/static/archives/2023.02.23/doc/common/help.css index d93818bf0..1f263f4a7 100644 --- a/rule-server/src/static/archives/2023.02.23/doc/common/help.css +++ b/rule-server/src/static/archives/2023.02.23/doc/common/help.css @@ -10,13 +10,15 @@ See the License for the specific language governing permissions and limitations under the License. *****************************************************************************/ +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css"); @import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/themes.css"); bx-list-item>code, p>code, td>code { - background-color: #e0e0e0; + background-color: var(--cds-layer); border-radius: 4px; bottom: 0.0625em; - color: #161616; + color: var(--cds-text-primary); display: inline; font-size: .75rem; font-size: .875em; @@ -27,39 +29,55 @@ bx-list-item>code, p>code, td>code { position: relative; } +.toolhelp a { + color: var(--cds-link-primary) +} + .toolHelp .toolMain p ~ p { margin-top: .5rem; } .toolHelp .toolHead h3 { - font-size: 20px; - line-height: 28px; + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 600; + font-size: 16px; + line-height: 24px; } .toolHelp .toolHead .issueLevel { - font-weight: 600; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolHead p { +.toolHelp .toolHead #ruleMessage { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; + margin-top: .5rem; + margin-bottom: .5rem; } -/* productive-heading-03 */ -.toolHelp .toolMain h3 { - font-size: 20px; - line-height: 28px; +.toolHelp .toolHead #groupLabel { + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolMain p { +/* productive-heading-03 */ +.toolHelp .toolMain h3 { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; } .toolHelp .toolSide .bx--list__item { @@ -70,29 +88,44 @@ bx-list-item>code, p>code, td>code { /* productive-heading-03 */ .toolHelp .toolSide h3 { - font-size: 20px; - line-height: 28px; - font-weight: 400; -} -.toolHelp .toolSide p { - font-size: 20px; - line-height: 28px; - font-weight: 400; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; + font-size: 16px; + line-height: 24px; } -html, body, .toolHelp .bx--row:nth-child(2) { - height: 100%; +@media (min-width: 42rem) { + html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; + } } - body { font-family: 'IBM Plex Sans', sans-serif; + color: var(--cds-text-primary); + background-color: var(--cds-ui-background); } .toolHelp { padding: 0px; margin: 0px; max-width: 100%; - background-color: #be95ff; + background-color: #e8daff; +} + +.toolHelp p { + font-family: 'IBM Plex Sans'; +font-style: normal; +font-weight: 400; +font-size: 14px; +line-height: 20px; +/* or 143% */ + +letter-spacing: 0.16px; +} + +.dds-theme-zone-g90 .toolHelp { + background-color: #31135E; } .toolHelp .bx--row { @@ -104,9 +137,10 @@ body { padding-top: 1rem; } .toolHelp .toolMain { - background-color: #f4f4f4; + background-color: var(--cds-ui-background); padding-top: 1rem; padding-bottom: 1rem; + border-top: solid var(--cds-text-primary) 1px; } .toolHelp .toolMain h2 { margin-top: 32px; @@ -122,9 +156,16 @@ body { .toolHelp .toolSide { padding: 16px 16px 16px 32px; - background-color: #e8daff; - color: black; + background-color: var(--cds-ui-background);; + color: var(--cds-text-primary); + border-top: solid var(--cds-text-primary) 1px; +} +@media (min-width: 42rem) { + .toolHelp .toolSide { + border-left: solid var(--cds-text-primary) 1px; + } } + .toolHelp .toolSide h2 { margin-top: 32px; margin-bottom: 0.5rem; diff --git a/rule-server/src/static/archives/2023.02.23/doc/common/help.js b/rule-server/src/static/archives/2023.02.23/doc/common/help.js index 17c597f08..793ee267d 100644 --- a/rule-server/src/static/archives/2023.02.23/doc/common/help.js +++ b/rule-server/src/static/archives/2023.02.23/doc/common/help.js @@ -49,6 +49,10 @@ class HTMLBaseElement extends HTMLElement { } } +function isDarkMode() { + return (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches); +} + customElements.define( "mark-down", class extends HTMLBaseElement { @@ -86,7 +90,6 @@ customElements.define( const shadowRoot = this; let snip = document.createElement("bx-code-snippet"); snip.setAttribute("type", "multi"); - snip.setAttribute("color-scheme", "light"); snip.innerHTML = oldCode.replace(/ - + - + `; if (val === "Needs review") icon = ``; if (val === "Recommendation") icon = ``; - document.querySelector("#locLevel").innerHTML = `
${icon} ${val}
`; + let level = document.querySelector("#locLevel"); + let parent = level.parentElement; + level = parent.removeChild(level); + parent.insertBefore(level, parent.firstElementChild); + document.querySelector("#locLevel").innerHTML = `
${val}
`; } if (RULE_ID) { document.querySelector("#ruleInfo").innerHTML = `

Rule ID: ${RULE_ID}${ruleInfo.reasonId ? `
Reason ID: ${ruleInfo.reasonId}

` : ""}`; @@ -198,5 +212,12 @@ window.addEventListener("DOMContentLoaded", (evt) => { ruleInfo = JSON.parse(decodeURIComponent(window.location.hash.substring(1))); } updateWithRuleInfo(ruleInfo); + + if (isDarkMode()) { + document.body.setAttribute("class", "dds-theme-zone-g90"); + } else { + document.body.setAttribute("class", "dds-theme-zone-g10"); + } + }) diff --git a/rule-server/src/static/archives/2023.03.09/doc/common/help.css b/rule-server/src/static/archives/2023.03.09/doc/common/help.css index d93818bf0..1f263f4a7 100644 --- a/rule-server/src/static/archives/2023.03.09/doc/common/help.css +++ b/rule-server/src/static/archives/2023.03.09/doc/common/help.css @@ -10,13 +10,15 @@ See the License for the specific language governing permissions and limitations under the License. *****************************************************************************/ +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css"); @import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/themes.css"); bx-list-item>code, p>code, td>code { - background-color: #e0e0e0; + background-color: var(--cds-layer); border-radius: 4px; bottom: 0.0625em; - color: #161616; + color: var(--cds-text-primary); display: inline; font-size: .75rem; font-size: .875em; @@ -27,39 +29,55 @@ bx-list-item>code, p>code, td>code { position: relative; } +.toolhelp a { + color: var(--cds-link-primary) +} + .toolHelp .toolMain p ~ p { margin-top: .5rem; } .toolHelp .toolHead h3 { - font-size: 20px; - line-height: 28px; + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 600; + font-size: 16px; + line-height: 24px; } .toolHelp .toolHead .issueLevel { - font-weight: 600; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolHead p { +.toolHelp .toolHead #ruleMessage { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; + margin-top: .5rem; + margin-bottom: .5rem; } -/* productive-heading-03 */ -.toolHelp .toolMain h3 { - font-size: 20px; - line-height: 28px; +.toolHelp .toolHead #groupLabel { + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolMain p { +/* productive-heading-03 */ +.toolHelp .toolMain h3 { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; } .toolHelp .toolSide .bx--list__item { @@ -70,29 +88,44 @@ bx-list-item>code, p>code, td>code { /* productive-heading-03 */ .toolHelp .toolSide h3 { - font-size: 20px; - line-height: 28px; - font-weight: 400; -} -.toolHelp .toolSide p { - font-size: 20px; - line-height: 28px; - font-weight: 400; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; + font-size: 16px; + line-height: 24px; } -html, body, .toolHelp .bx--row:nth-child(2) { - height: 100%; +@media (min-width: 42rem) { + html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; + } } - body { font-family: 'IBM Plex Sans', sans-serif; + color: var(--cds-text-primary); + background-color: var(--cds-ui-background); } .toolHelp { padding: 0px; margin: 0px; max-width: 100%; - background-color: #be95ff; + background-color: #e8daff; +} + +.toolHelp p { + font-family: 'IBM Plex Sans'; +font-style: normal; +font-weight: 400; +font-size: 14px; +line-height: 20px; +/* or 143% */ + +letter-spacing: 0.16px; +} + +.dds-theme-zone-g90 .toolHelp { + background-color: #31135E; } .toolHelp .bx--row { @@ -104,9 +137,10 @@ body { padding-top: 1rem; } .toolHelp .toolMain { - background-color: #f4f4f4; + background-color: var(--cds-ui-background); padding-top: 1rem; padding-bottom: 1rem; + border-top: solid var(--cds-text-primary) 1px; } .toolHelp .toolMain h2 { margin-top: 32px; @@ -122,9 +156,16 @@ body { .toolHelp .toolSide { padding: 16px 16px 16px 32px; - background-color: #e8daff; - color: black; + background-color: var(--cds-ui-background);; + color: var(--cds-text-primary); + border-top: solid var(--cds-text-primary) 1px; +} +@media (min-width: 42rem) { + .toolHelp .toolSide { + border-left: solid var(--cds-text-primary) 1px; + } } + .toolHelp .toolSide h2 { margin-top: 32px; margin-bottom: 0.5rem; diff --git a/rule-server/src/static/archives/2023.03.09/doc/common/help.js b/rule-server/src/static/archives/2023.03.09/doc/common/help.js index 17c597f08..793ee267d 100644 --- a/rule-server/src/static/archives/2023.03.09/doc/common/help.js +++ b/rule-server/src/static/archives/2023.03.09/doc/common/help.js @@ -49,6 +49,10 @@ class HTMLBaseElement extends HTMLElement { } } +function isDarkMode() { + return (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches); +} + customElements.define( "mark-down", class extends HTMLBaseElement { @@ -86,7 +90,6 @@ customElements.define( const shadowRoot = this; let snip = document.createElement("bx-code-snippet"); snip.setAttribute("type", "multi"); - snip.setAttribute("color-scheme", "light"); snip.innerHTML = oldCode.replace(/ - + - + `; if (val === "Needs review") icon = ``; if (val === "Recommendation") icon = ``; - document.querySelector("#locLevel").innerHTML = `
${icon} ${val}
`; + let level = document.querySelector("#locLevel"); + let parent = level.parentElement; + level = parent.removeChild(level); + parent.insertBefore(level, parent.firstElementChild); + document.querySelector("#locLevel").innerHTML = `
${val}
`; } if (RULE_ID) { document.querySelector("#ruleInfo").innerHTML = `

Rule ID: ${RULE_ID}${ruleInfo.reasonId ? `
Reason ID: ${ruleInfo.reasonId}

` : ""}`; @@ -198,5 +212,12 @@ window.addEventListener("DOMContentLoaded", (evt) => { ruleInfo = JSON.parse(decodeURIComponent(window.location.hash.substring(1))); } updateWithRuleInfo(ruleInfo); + + if (isDarkMode()) { + document.body.setAttribute("class", "dds-theme-zone-g90"); + } else { + document.body.setAttribute("class", "dds-theme-zone-g10"); + } + }) diff --git a/rule-server/src/static/archives/2023.03.31/doc/common/help.css b/rule-server/src/static/archives/2023.03.31/doc/common/help.css index d93818bf0..1f263f4a7 100644 --- a/rule-server/src/static/archives/2023.03.31/doc/common/help.css +++ b/rule-server/src/static/archives/2023.03.31/doc/common/help.css @@ -10,13 +10,15 @@ See the License for the specific language governing permissions and limitations under the License. *****************************************************************************/ +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css"); @import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/themes.css"); bx-list-item>code, p>code, td>code { - background-color: #e0e0e0; + background-color: var(--cds-layer); border-radius: 4px; bottom: 0.0625em; - color: #161616; + color: var(--cds-text-primary); display: inline; font-size: .75rem; font-size: .875em; @@ -27,39 +29,55 @@ bx-list-item>code, p>code, td>code { position: relative; } +.toolhelp a { + color: var(--cds-link-primary) +} + .toolHelp .toolMain p ~ p { margin-top: .5rem; } .toolHelp .toolHead h3 { - font-size: 20px; - line-height: 28px; + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 600; + font-size: 16px; + line-height: 24px; } .toolHelp .toolHead .issueLevel { - font-weight: 600; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolHead p { +.toolHelp .toolHead #ruleMessage { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; + margin-top: .5rem; + margin-bottom: .5rem; } -/* productive-heading-03 */ -.toolHelp .toolMain h3 { - font-size: 20px; - line-height: 28px; +.toolHelp .toolHead #groupLabel { + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolMain p { +/* productive-heading-03 */ +.toolHelp .toolMain h3 { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; } .toolHelp .toolSide .bx--list__item { @@ -70,29 +88,44 @@ bx-list-item>code, p>code, td>code { /* productive-heading-03 */ .toolHelp .toolSide h3 { - font-size: 20px; - line-height: 28px; - font-weight: 400; -} -.toolHelp .toolSide p { - font-size: 20px; - line-height: 28px; - font-weight: 400; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; + font-size: 16px; + line-height: 24px; } -html, body, .toolHelp .bx--row:nth-child(2) { - height: 100%; +@media (min-width: 42rem) { + html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; + } } - body { font-family: 'IBM Plex Sans', sans-serif; + color: var(--cds-text-primary); + background-color: var(--cds-ui-background); } .toolHelp { padding: 0px; margin: 0px; max-width: 100%; - background-color: #be95ff; + background-color: #e8daff; +} + +.toolHelp p { + font-family: 'IBM Plex Sans'; +font-style: normal; +font-weight: 400; +font-size: 14px; +line-height: 20px; +/* or 143% */ + +letter-spacing: 0.16px; +} + +.dds-theme-zone-g90 .toolHelp { + background-color: #31135E; } .toolHelp .bx--row { @@ -104,9 +137,10 @@ body { padding-top: 1rem; } .toolHelp .toolMain { - background-color: #f4f4f4; + background-color: var(--cds-ui-background); padding-top: 1rem; padding-bottom: 1rem; + border-top: solid var(--cds-text-primary) 1px; } .toolHelp .toolMain h2 { margin-top: 32px; @@ -122,9 +156,16 @@ body { .toolHelp .toolSide { padding: 16px 16px 16px 32px; - background-color: #e8daff; - color: black; + background-color: var(--cds-ui-background);; + color: var(--cds-text-primary); + border-top: solid var(--cds-text-primary) 1px; +} +@media (min-width: 42rem) { + .toolHelp .toolSide { + border-left: solid var(--cds-text-primary) 1px; + } } + .toolHelp .toolSide h2 { margin-top: 32px; margin-bottom: 0.5rem; diff --git a/rule-server/src/static/archives/2023.03.31/doc/common/help.js b/rule-server/src/static/archives/2023.03.31/doc/common/help.js index 17c597f08..793ee267d 100644 --- a/rule-server/src/static/archives/2023.03.31/doc/common/help.js +++ b/rule-server/src/static/archives/2023.03.31/doc/common/help.js @@ -49,6 +49,10 @@ class HTMLBaseElement extends HTMLElement { } } +function isDarkMode() { + return (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches); +} + customElements.define( "mark-down", class extends HTMLBaseElement { @@ -86,7 +90,6 @@ customElements.define( const shadowRoot = this; let snip = document.createElement("bx-code-snippet"); snip.setAttribute("type", "multi"); - snip.setAttribute("color-scheme", "light"); snip.innerHTML = oldCode.replace(/ - + - + `; if (val === "Needs review") icon = ``; if (val === "Recommendation") icon = ``; - document.querySelector("#locLevel").innerHTML = `
${icon} ${val}
`; + let level = document.querySelector("#locLevel"); + let parent = level.parentElement; + level = parent.removeChild(level); + parent.insertBefore(level, parent.firstElementChild); + document.querySelector("#locLevel").innerHTML = `
${val}
`; } if (RULE_ID) { document.querySelector("#ruleInfo").innerHTML = `

Rule ID: ${RULE_ID}${ruleInfo.reasonId ? `
Reason ID: ${ruleInfo.reasonId}

` : ""}`; @@ -198,5 +212,12 @@ window.addEventListener("DOMContentLoaded", (evt) => { ruleInfo = JSON.parse(decodeURIComponent(window.location.hash.substring(1))); } updateWithRuleInfo(ruleInfo); + + if (isDarkMode()) { + document.body.setAttribute("class", "dds-theme-zone-g90"); + } else { + document.body.setAttribute("class", "dds-theme-zone-g10"); + } + }) diff --git a/rule-server/src/static/archives/2023.05.15/doc/common/help.css b/rule-server/src/static/archives/2023.05.15/doc/common/help.css index d93818bf0..1f263f4a7 100644 --- a/rule-server/src/static/archives/2023.05.15/doc/common/help.css +++ b/rule-server/src/static/archives/2023.05.15/doc/common/help.css @@ -10,13 +10,15 @@ See the License for the specific language governing permissions and limitations under the License. *****************************************************************************/ +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css"); @import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/themes.css"); bx-list-item>code, p>code, td>code { - background-color: #e0e0e0; + background-color: var(--cds-layer); border-radius: 4px; bottom: 0.0625em; - color: #161616; + color: var(--cds-text-primary); display: inline; font-size: .75rem; font-size: .875em; @@ -27,39 +29,55 @@ bx-list-item>code, p>code, td>code { position: relative; } +.toolhelp a { + color: var(--cds-link-primary) +} + .toolHelp .toolMain p ~ p { margin-top: .5rem; } .toolHelp .toolHead h3 { - font-size: 20px; - line-height: 28px; + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 600; + font-size: 16px; + line-height: 24px; } .toolHelp .toolHead .issueLevel { - font-weight: 600; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolHead p { +.toolHelp .toolHead #ruleMessage { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; + margin-top: .5rem; + margin-bottom: .5rem; } -/* productive-heading-03 */ -.toolHelp .toolMain h3 { - font-size: 20px; - line-height: 28px; +.toolHelp .toolHead #groupLabel { + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolMain p { +/* productive-heading-03 */ +.toolHelp .toolMain h3 { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; } .toolHelp .toolSide .bx--list__item { @@ -70,29 +88,44 @@ bx-list-item>code, p>code, td>code { /* productive-heading-03 */ .toolHelp .toolSide h3 { - font-size: 20px; - line-height: 28px; - font-weight: 400; -} -.toolHelp .toolSide p { - font-size: 20px; - line-height: 28px; - font-weight: 400; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; + font-size: 16px; + line-height: 24px; } -html, body, .toolHelp .bx--row:nth-child(2) { - height: 100%; +@media (min-width: 42rem) { + html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; + } } - body { font-family: 'IBM Plex Sans', sans-serif; + color: var(--cds-text-primary); + background-color: var(--cds-ui-background); } .toolHelp { padding: 0px; margin: 0px; max-width: 100%; - background-color: #be95ff; + background-color: #e8daff; +} + +.toolHelp p { + font-family: 'IBM Plex Sans'; +font-style: normal; +font-weight: 400; +font-size: 14px; +line-height: 20px; +/* or 143% */ + +letter-spacing: 0.16px; +} + +.dds-theme-zone-g90 .toolHelp { + background-color: #31135E; } .toolHelp .bx--row { @@ -104,9 +137,10 @@ body { padding-top: 1rem; } .toolHelp .toolMain { - background-color: #f4f4f4; + background-color: var(--cds-ui-background); padding-top: 1rem; padding-bottom: 1rem; + border-top: solid var(--cds-text-primary) 1px; } .toolHelp .toolMain h2 { margin-top: 32px; @@ -122,9 +156,16 @@ body { .toolHelp .toolSide { padding: 16px 16px 16px 32px; - background-color: #e8daff; - color: black; + background-color: var(--cds-ui-background);; + color: var(--cds-text-primary); + border-top: solid var(--cds-text-primary) 1px; +} +@media (min-width: 42rem) { + .toolHelp .toolSide { + border-left: solid var(--cds-text-primary) 1px; + } } + .toolHelp .toolSide h2 { margin-top: 32px; margin-bottom: 0.5rem; diff --git a/rule-server/src/static/archives/2023.05.15/doc/common/help.js b/rule-server/src/static/archives/2023.05.15/doc/common/help.js index 17c597f08..793ee267d 100644 --- a/rule-server/src/static/archives/2023.05.15/doc/common/help.js +++ b/rule-server/src/static/archives/2023.05.15/doc/common/help.js @@ -49,6 +49,10 @@ class HTMLBaseElement extends HTMLElement { } } +function isDarkMode() { + return (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches); +} + customElements.define( "mark-down", class extends HTMLBaseElement { @@ -86,7 +90,6 @@ customElements.define( const shadowRoot = this; let snip = document.createElement("bx-code-snippet"); snip.setAttribute("type", "multi"); - snip.setAttribute("color-scheme", "light"); snip.innerHTML = oldCode.replace(/ - + - + `; if (val === "Needs review") icon = ``; if (val === "Recommendation") icon = ``; - document.querySelector("#locLevel").innerHTML = `
${icon} ${val}
`; + let level = document.querySelector("#locLevel"); + let parent = level.parentElement; + level = parent.removeChild(level); + parent.insertBefore(level, parent.firstElementChild); + document.querySelector("#locLevel").innerHTML = `
${val}
`; } if (RULE_ID) { document.querySelector("#ruleInfo").innerHTML = `

Rule ID: ${RULE_ID}${ruleInfo.reasonId ? `
Reason ID: ${ruleInfo.reasonId}

` : ""}`; @@ -198,5 +212,12 @@ window.addEventListener("DOMContentLoaded", (evt) => { ruleInfo = JSON.parse(decodeURIComponent(window.location.hash.substring(1))); } updateWithRuleInfo(ruleInfo); + + if (isDarkMode()) { + document.body.setAttribute("class", "dds-theme-zone-g90"); + } else { + document.body.setAttribute("class", "dds-theme-zone-g10"); + } + }) diff --git a/rule-server/src/static/archives/2023.05.26/doc/common/help.css b/rule-server/src/static/archives/2023.05.26/doc/common/help.css index d93818bf0..1f263f4a7 100644 --- a/rule-server/src/static/archives/2023.05.26/doc/common/help.css +++ b/rule-server/src/static/archives/2023.05.26/doc/common/help.css @@ -10,13 +10,15 @@ See the License for the specific language governing permissions and limitations under the License. *****************************************************************************/ +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/plex.css"); @import url('https://unpkg.com/carbon-components/css/carbon-components.min.css'); +@import url("https://1.www.s81c.com/common/carbon-for-ibm-dotcom/tag/v1/latest/themes.css"); bx-list-item>code, p>code, td>code { - background-color: #e0e0e0; + background-color: var(--cds-layer); border-radius: 4px; bottom: 0.0625em; - color: #161616; + color: var(--cds-text-primary); display: inline; font-size: .75rem; font-size: .875em; @@ -27,39 +29,55 @@ bx-list-item>code, p>code, td>code { position: relative; } +.toolhelp a { + color: var(--cds-link-primary) +} + .toolHelp .toolMain p ~ p { margin-top: .5rem; } .toolHelp .toolHead h3 { - font-size: 20px; - line-height: 28px; + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 600; + font-size: 16px; + line-height: 24px; } .toolHelp .toolHead .issueLevel { - font-weight: 600; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolHead p { +.toolHelp .toolHead #ruleMessage { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; + margin-top: .5rem; + margin-bottom: .5rem; } -/* productive-heading-03 */ -.toolHelp .toolMain h3 { - font-size: 20px; - line-height: 28px; +.toolHelp .toolHead #groupLabel { + font-family: 'IBM Plex Sans'; + font-style: normal; font-weight: 400; + font-size: 12px; + line-height: 16px; } -/* body-long-02 */ -.toolHelp .toolMain p { +/* productive-heading-03 */ +.toolHelp .toolMain h3 { + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; font-size: 16px; line-height: 24px; - font-weight: 400; } .toolHelp .toolSide .bx--list__item { @@ -70,29 +88,44 @@ bx-list-item>code, p>code, td>code { /* productive-heading-03 */ .toolHelp .toolSide h3 { - font-size: 20px; - line-height: 28px; - font-weight: 400; -} -.toolHelp .toolSide p { - font-size: 20px; - line-height: 28px; - font-weight: 400; + font-family: 'IBM Plex Sans'; + font-style: normal; + font-weight: 600; + font-size: 16px; + line-height: 24px; } -html, body, .toolHelp .bx--row:nth-child(2) { - height: 100%; +@media (min-width: 42rem) { + html, body, .toolHelp .bx--row:nth-child(2) { + height: 100%; + } } - body { font-family: 'IBM Plex Sans', sans-serif; + color: var(--cds-text-primary); + background-color: var(--cds-ui-background); } .toolHelp { padding: 0px; margin: 0px; max-width: 100%; - background-color: #be95ff; + background-color: #e8daff; +} + +.toolHelp p { + font-family: 'IBM Plex Sans'; +font-style: normal; +font-weight: 400; +font-size: 14px; +line-height: 20px; +/* or 143% */ + +letter-spacing: 0.16px; +} + +.dds-theme-zone-g90 .toolHelp { + background-color: #31135E; } .toolHelp .bx--row { @@ -104,9 +137,10 @@ body { padding-top: 1rem; } .toolHelp .toolMain { - background-color: #f4f4f4; + background-color: var(--cds-ui-background); padding-top: 1rem; padding-bottom: 1rem; + border-top: solid var(--cds-text-primary) 1px; } .toolHelp .toolMain h2 { margin-top: 32px; @@ -122,9 +156,16 @@ body { .toolHelp .toolSide { padding: 16px 16px 16px 32px; - background-color: #e8daff; - color: black; + background-color: var(--cds-ui-background);; + color: var(--cds-text-primary); + border-top: solid var(--cds-text-primary) 1px; +} +@media (min-width: 42rem) { + .toolHelp .toolSide { + border-left: solid var(--cds-text-primary) 1px; + } } + .toolHelp .toolSide h2 { margin-top: 32px; margin-bottom: 0.5rem; diff --git a/rule-server/src/static/archives/2023.05.26/doc/common/help.js b/rule-server/src/static/archives/2023.05.26/doc/common/help.js index 17c597f08..793ee267d 100644 --- a/rule-server/src/static/archives/2023.05.26/doc/common/help.js +++ b/rule-server/src/static/archives/2023.05.26/doc/common/help.js @@ -49,6 +49,10 @@ class HTMLBaseElement extends HTMLElement { } } +function isDarkMode() { + return (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches); +} + customElements.define( "mark-down", class extends HTMLBaseElement { @@ -86,7 +90,6 @@ customElements.define( const shadowRoot = this; let snip = document.createElement("bx-code-snippet"); snip.setAttribute("type", "multi"); - snip.setAttribute("color-scheme", "light"); snip.innerHTML = oldCode.replace(/ - + - + `; if (val === "Needs review") icon = ``; if (val === "Recommendation") icon = ``; - document.querySelector("#locLevel").innerHTML = `
${icon} ${val}
`; + let level = document.querySelector("#locLevel"); + let parent = level.parentElement; + level = parent.removeChild(level); + parent.insertBefore(level, parent.firstElementChild); + document.querySelector("#locLevel").innerHTML = `
${val}
`; } if (RULE_ID) { document.querySelector("#ruleInfo").innerHTML = `

Rule ID: ${RULE_ID}${ruleInfo.reasonId ? `
Reason ID: ${ruleInfo.reasonId}

` : ""}`; @@ -198,5 +212,12 @@ window.addEventListener("DOMContentLoaded", (evt) => { ruleInfo = JSON.parse(decodeURIComponent(window.location.hash.substring(1))); } updateWithRuleInfo(ruleInfo); + + if (isDarkMode()) { + document.body.setAttribute("class", "dds-theme-zone-g90"); + } else { + document.body.setAttribute("class", "dds-theme-zone-g10"); + } + })