From 620a204b6d659b1723c6f795c0aecbd143740736 Mon Sep 17 00:00:00 2001 From: Filip Zybała Date: Wed, 22 Apr 2020 10:06:17 +0200 Subject: Fix to tests --- .../resources/expect/function/out/html/-search.html | 2 +- .../expect/function/out/html/root/[jvm root]/fn.html | 3 ++- .../function/out/html/root/[jvm root]/index.html | 3 ++- .../expect/function/out/html/root/index.html | 3 ++- .../function/out/html/scripts/navigationLoader.js | 5 ++++- .../function/out/html/styles/jetbrains-mono.css | 13 +++++++++++++ .../expect/function/out/html/styles/style.css | 20 ++++++++++++++------ 7 files changed, 38 insertions(+), 11 deletions(-) create mode 100644 plugins/base/src/test/resources/expect/function/out/html/styles/jetbrains-mono.css (limited to 'plugins/base/src/test/resources/expect/function') diff --git a/plugins/base/src/test/resources/expect/function/out/html/-search.html b/plugins/base/src/test/resources/expect/function/out/html/-search.html index 13611eb6..61e7d537 100644 --- a/plugins/base/src/test/resources/expect/function/out/html/-search.html +++ b/plugins/base/src/test/resources/expect/function/out/html/-search.html @@ -1,6 +1,6 @@ - + Search diff --git a/plugins/base/src/test/resources/expect/function/out/html/root/[jvm root]/fn.html b/plugins/base/src/test/resources/expect/function/out/html/root/[jvm root]/fn.html index f6ae6ff7..abb882ae 100644 --- a/plugins/base/src/test/resources/expect/function/out/html/root/[jvm root]/fn.html +++ b/plugins/base/src/test/resources/expect/function/out/html/root/[jvm root]/fn.html @@ -1,8 +1,9 @@ - + fn + diff --git a/plugins/base/src/test/resources/expect/function/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/function/out/html/root/[jvm root]/index.html index 23d4864c..f137619d 100644 --- a/plugins/base/src/test/resources/expect/function/out/html/root/[jvm root]/index.html +++ b/plugins/base/src/test/resources/expect/function/out/html/root/[jvm root]/index.html @@ -1,8 +1,9 @@ - + [jvm root] + diff --git a/plugins/base/src/test/resources/expect/function/out/html/root/index.html b/plugins/base/src/test/resources/expect/function/out/html/root/index.html index 440758c2..ca7ec92c 100644 --- a/plugins/base/src/test/resources/expect/function/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/function/out/html/root/index.html @@ -1,8 +1,9 @@ - + root + diff --git a/plugins/base/src/test/resources/expect/function/out/html/scripts/navigationLoader.js b/plugins/base/src/test/resources/expect/function/out/html/scripts/navigationLoader.js index ecbabb4c..b30a866d 100644 --- a/plugins/base/src/test/resources/expect/function/out/html/scripts/navigationLoader.js +++ b/plugins/base/src/test/resources/expect/function/out/html/scripts/navigationLoader.js @@ -25,7 +25,10 @@ revealNavigationForCurrentPage = () => { parts.forEach(part => { if (part.attributes['pageId'].value.indexOf(pageId) !== -1 && found === 0) { found = 1; - if (part.classList.contains("hidden")) part.classList.remove("hidden"); + if (part.classList.contains("hidden")){ + part.classList.remove("hidden"); + part.setAttribute('data-active',""); + } revealParents(part) } }); diff --git a/plugins/base/src/test/resources/expect/function/out/html/styles/jetbrains-mono.css b/plugins/base/src/test/resources/expect/function/out/html/styles/jetbrains-mono.css new file mode 100644 index 00000000..2af32a92 --- /dev/null +++ b/plugins/base/src/test/resources/expect/function/out/html/styles/jetbrains-mono.css @@ -0,0 +1,13 @@ +@font-face{ + font-family: 'JetBrains Mono'; + src: url('https://raw.githubusercontent.com/JetBrains/JetBrainsMono/master/web/woff2/JetBrainsMono-Regular.woff2') format('woff2'); + font-weight: normal; + font-style: normal; +} + +@font-face{ + font-family: 'JetBrains Mono'; + src: url('https://raw.githubusercontent.com/JetBrains/JetBrainsMono/master/web/woff2/JetBrainsMono-Bold.woff2') format('woff2'); + font-weight: bold; + font-style: normal; +} \ No newline at end of file diff --git a/plugins/base/src/test/resources/expect/function/out/html/styles/style.css b/plugins/base/src/test/resources/expect/function/out/html/styles/style.css index 720998ad..9eda5f6e 100644 --- a/plugins/base/src/test/resources/expect/function/out/html/styles/style.css +++ b/plugins/base/src/test/resources/expect/function/out/html/styles/style.css @@ -1,5 +1,6 @@ @import url(https://fonts.googleapis.com/css?family=Open+Sans:300i,400,700); - +@import url('https://rsms.me/inter/inter.css'); +@import url('jetbrains-mono.css'); #container { display: flex; @@ -163,9 +164,12 @@ } body, table { - font: 14px/1.5 'Open Sans', "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: 'Inter', "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; background: #F4F4F4; - font-weight: 300; + font-style: normal; + font-weight: normal; + font-size: 14px; + line-height: 24px; margin: 0; max-width: 1440px; } @@ -188,12 +192,12 @@ td:first-child { .keyword { color: black; - font-family: Monaco, Bitstream Vera Sans Mono, Lucida Console, Terminal; + font-family: JetBrains Mono, Monaco, Bitstream Vera Sans Mono, Lucida Console, Terminal; font-size: 12px; } .symbol { - font-family: Monaco, Bitstream Vera Sans Mono, Lucida Console, Terminal; + font-family: JetBrains Mono, Monaco, Bitstream Vera Sans Mono, Lucida Console, Terminal; font-size: 12px; min-height: 43px; } @@ -206,7 +210,7 @@ td:first-child { .identifier { color: darkblue; font-size: 12px; - font-family: Monaco, Bitstream Vera Sans Mono, Lucida Console, Terminal; + font-family: JetBrains Mono, Monaco, Bitstream Vera Sans Mono, Lucida Console, Terminal; } .brief { @@ -536,6 +540,10 @@ td.content { display: none } +.sideMenuPart[data-active] { + background: rgba(91, 93, 239, 0.15); + border-left: 4px solid #5B5DEF; +} @media print, screen and (max-width: 960px) { -- cgit