diff options
Diffstat (limited to 'plugins/base/src')
130 files changed, 668 insertions, 198 deletions
diff --git a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/-search.html b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/-search.html index 13611eb6..61e7d537 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/-search.html +++ b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/-search.html @@ -1,6 +1,6 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>Search</title> <link href="styles/style.css" rel="Stylesheet"> <script type="text/javascript" src="scripts/pages.js" async="async"></script> diff --git a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[jvm root]/f.html b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[jvm root]/f.html index 6c049b35..6ca7daa7 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[jvm root]/f.html +++ b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[jvm root]/f.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>f</title> <link href="../../styles/style.css" rel="Stylesheet"> + <link href="../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../";</script> diff --git a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[jvm root]/index.html index 8ab1c93f..da204f6b 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[jvm root]/index.html +++ b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/[jvm root]/index.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>[jvm root]</title> <link href="../../styles/style.css" rel="Stylesheet"> + <link href="../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../";</script> diff --git a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/index.html b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/index.html index 440758c2..ca7ec92c 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/root/index.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>root</title> <link href="../styles/style.css" rel="Stylesheet"> + <link href="../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../";</script> diff --git a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/scripts/navigationLoader.js b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/scripts/navigationLoader.js index ecbabb4c..b30a866d 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/scripts/navigationLoader.js +++ b/plugins/base/src/test/resources/expect/annotatedFunction/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/annotatedFunction/out/html/styles/jetbrains-mono.css b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/styles/jetbrains-mono.css new file mode 100644 index 00000000..2af32a92 --- /dev/null +++ b/plugins/base/src/test/resources/expect/annotatedFunction/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/annotatedFunction/out/html/styles/style.css b/plugins/base/src/test/resources/expect/annotatedFunction/out/html/styles/style.css index 720998ad..9eda5f6e 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunction/out/html/styles/style.css +++ b/plugins/base/src/test/resources/expect/annotatedFunction/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) { diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/-search.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/-search.html index 13611eb6..61e7d537 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/-search.html +++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/-search.html @@ -1,6 +1,6 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>Search</title> <link href="styles/style.css" rel="Stylesheet"> <script type="text/javascript" src="scripts/pages.js" async="async"></script> diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/-init-.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/-init-.html index 09cadac4..6e578700 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/-init-.html +++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/-init-.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title><init></title> <link href="../../../styles/style.css" rel="Stylesheet"> + <link href="../../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../../";</script> diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/equals.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/equals.html index 0c1760d6..52566473 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/equals.html +++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/equals.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>equals</title> <link href="../../../styles/style.css" rel="Stylesheet"> + <link href="../../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../../";</script> diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/hash-code.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/hash-code.html index 654b11b4..98338519 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/hash-code.html +++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/hash-code.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>hashCode</title> <link href="../../../styles/style.css" rel="Stylesheet"> + <link href="../../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../../";</script> diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/index.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/index.html index c3b383d1..4bca9c82 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/index.html +++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/index.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>Fancy</title> <link href="../../../styles/style.css" rel="Stylesheet"> + <link href="../../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../../";</script> diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/to-string.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/to-string.html index c0a3a7e0..b64fcf93 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/to-string.html +++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/-fancy/to-string.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>toString</title> <link href="../../../styles/style.css" rel="Stylesheet"> + <link href="../../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../../";</script> diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/f.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/f.html index 6c049b35..6ca7daa7 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/f.html +++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/f.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>f</title> <link href="../../styles/style.css" rel="Stylesheet"> + <link href="../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../";</script> diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/index.html index dfad54b3..5e059180 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/index.html +++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/[jvm root]/index.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>[jvm root]</title> <link href="../../styles/style.css" rel="Stylesheet"> + <link href="../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../";</script> diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/index.html b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/index.html index 440758c2..ca7ec92c 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/root/index.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>root</title> <link href="../styles/style.css" rel="Stylesheet"> + <link href="../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../";</script> diff --git a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/scripts/navigationLoader.js b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/scripts/navigationLoader.js index ecbabb4c..b30a866d 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/scripts/navigationLoader.js +++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/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/annotatedFunctionWithAnnotationParameters/out/html/styles/jetbrains-mono.css b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/styles/jetbrains-mono.css new file mode 100644 index 00000000..2af32a92 --- /dev/null +++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/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/annotatedFunctionWithAnnotationParameters/out/html/styles/style.css b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/styles/style.css index 720998ad..9eda5f6e 100644 --- a/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/out/html/styles/style.css +++ b/plugins/base/src/test/resources/expect/annotatedFunctionWithAnnotationParameters/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) { 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 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>Search</title> <link href="styles/style.css" rel="Stylesheet"> <script type="text/javascript" src="scripts/pages.js" async="async"></script> 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 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>fn</title> <link href="../../styles/style.css" rel="Stylesheet"> + <link href="../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../";</script> 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 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>[jvm root]</title> <link href="../../styles/style.css" rel="Stylesheet"> + <link href="../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../";</script> 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 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>root</title> <link href="../styles/style.css" rel="Stylesheet"> + <link href="../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../";</script> 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) { diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/-search.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/-search.html index 13611eb6..61e7d537 100644 --- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/-search.html +++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/-search.html @@ -1,6 +1,6 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>Search</title> <link href="styles/style.css" rel="Stylesheet"> <script type="text/javascript" src="scripts/pages.js" async="async"></script> diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/-init-.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/-init-.html index 6fa1a1f0..5aa8aba5 100644 --- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/-init-.html +++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/-init-.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title><init></title> <link href="../../../styles/style.css" rel="Stylesheet"> + <link href="../../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../../";</script> diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/equals.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/equals.html index 0c1760d6..52566473 100644 --- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/equals.html +++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/equals.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>equals</title> <link href="../../../styles/style.css" rel="Stylesheet"> + <link href="../../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../../";</script> diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/hash-code.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/hash-code.html index 654b11b4..98338519 100644 --- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/hash-code.html +++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/hash-code.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>hashCode</title> <link href="../../../styles/style.css" rel="Stylesheet"> + <link href="../../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../../";</script> diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/index.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/index.html index 2f458d5a..69ed4ecf 100644 --- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/index.html +++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/index.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>Fancy</title> <link href="../../../styles/style.css" rel="Stylesheet"> + <link href="../../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../../";</script> diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/to-string.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/to-string.html index c0a3a7e0..b64fcf93 100644 --- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/to-string.html +++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/-fancy/to-string.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>toString</title> <link href="../../../styles/style.css" rel="Stylesheet"> + <link href="../../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../../";</script> diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/function.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/function.html index 9e0ce05c..d4436f44 100644 --- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/function.html +++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/function.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>function</title> <link href="../../styles/style.css" rel="Stylesheet"> + <link href="../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../";</script> diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/index.html index 5a7adf9f..067f9b8c 100644 --- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/index.html +++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/[jvm root]/index.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>[jvm root]</title> <link href="../../styles/style.css" rel="Stylesheet"> + <link href="../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../";</script> diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/index.html b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/index.html index 440758c2..ca7ec92c 100644 --- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/root/index.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>root</title> <link href="../styles/style.css" rel="Stylesheet"> + <link href="../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../";</script> diff --git a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/scripts/navigationLoader.js b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/scripts/navigationLoader.js index ecbabb4c..b30a866d 100644 --- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/scripts/navigationLoader.js +++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/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/functionWithAnnotatedParam/out/html/styles/jetbrains-mono.css b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/styles/jetbrains-mono.css new file mode 100644 index 00000000..2af32a92 --- /dev/null +++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/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/functionWithAnnotatedParam/out/html/styles/style.css b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/styles/style.css index 720998ad..9eda5f6e 100644 --- a/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/out/html/styles/style.css +++ b/plugins/base/src/test/resources/expect/functionWithAnnotatedParam/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) { diff --git a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/-search.html b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/-search.html index 13611eb6..61e7d537 100644 --- a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/-search.html +++ b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/-search.html @@ -1,6 +1,6 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>Search</title> <link href="styles/style.css" rel="Stylesheet"> <script type="text/javascript" src="scripts/pages.js" async="async"></script> diff --git a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[jvm root]/f.html b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[jvm root]/f.html index bde81d3f..c395f3b6 100644 --- a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[jvm root]/f.html +++ b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[jvm root]/f.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>f</title> <link href="../../styles/style.css" rel="Stylesheet"> + <link href="../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../";</script> diff --git a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[jvm root]/index.html index 16e168fa..8989b79b 100644 --- a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[jvm root]/index.html +++ b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/[jvm root]/index.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>[jvm root]</title> <link href="../../styles/style.css" rel="Stylesheet"> + <link href="../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../";</script> diff --git a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/index.html b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/index.html index 440758c2..ca7ec92c 100644 --- a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/root/index.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>root</title> <link href="../styles/style.css" rel="Stylesheet"> + <link href="../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../";</script> diff --git a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/scripts/navigationLoader.js b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/scripts/navigationLoader.js index ecbabb4c..b30a866d 100644 --- a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/scripts/navigationLoader.js +++ b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/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/functionWithDefaultParameter/out/html/styles/jetbrains-mono.css b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/styles/jetbrains-mono.css new file mode 100644 index 00000000..2af32a92 --- /dev/null +++ b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/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/functionWithDefaultParameter/out/html/styles/style.css b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/styles/style.css index 720998ad..9eda5f6e 100644 --- a/plugins/base/src/test/resources/expect/functionWithDefaultParameter/out/html/styles/style.css +++ b/plugins/base/src/test/resources/expect/functionWithDefaultParameter/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) { diff --git a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/-search.html b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/-search.html index 13611eb6..61e7d537 100644 --- a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/-search.html +++ b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/-search.html @@ -1,6 +1,6 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>Search</title> <link href="styles/style.css" rel="Stylesheet"> <script type="text/javascript" src="scripts/pages.js" async="async"></script> diff --git a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[jvm root]/function.html b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[jvm root]/function.html index 9e0ce05c..d4436f44 100644 --- a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[jvm root]/function.html +++ b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[jvm root]/function.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>function</title> <link href="../../styles/style.css" rel="Stylesheet"> + <link href="../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../";</script> diff --git a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[jvm root]/index.html index 48dcf46a..008229a7 100644 --- a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[jvm root]/index.html +++ b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/[jvm root]/index.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>[jvm root]</title> <link href="../../styles/style.css" rel="Stylesheet"> + <link href="../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../";</script> diff --git a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/index.html b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/index.html index 440758c2..ca7ec92c 100644 --- a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/root/index.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>root</title> <link href="../styles/style.css" rel="Stylesheet"> + <link href="../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../";</script> diff --git a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/scripts/navigationLoader.js b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/scripts/navigationLoader.js index ecbabb4c..b30a866d 100644 --- a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/scripts/navigationLoader.js +++ b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/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/functionWithNoinlineParam/out/html/styles/jetbrains-mono.css b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/styles/jetbrains-mono.css new file mode 100644 index 00000000..2af32a92 --- /dev/null +++ b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/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/functionWithNoinlineParam/out/html/styles/style.css b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/styles/style.css index 720998ad..9eda5f6e 100644 --- a/plugins/base/src/test/resources/expect/functionWithNoinlineParam/out/html/styles/style.css +++ b/plugins/base/src/test/resources/expect/functionWithNoinlineParam/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) { diff --git a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/-search.html b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/-search.html index 13611eb6..61e7d537 100644 --- a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/-search.html +++ b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/-search.html @@ -1,6 +1,6 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>Search</title> <link href="styles/style.css" rel="Stylesheet"> <script type="text/javascript" src="scripts/pages.js" async="async"></script> diff --git a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[jvm root]/f.html b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[jvm root]/f.html index 6c049b35..6ca7daa7 100644 --- a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[jvm root]/f.html +++ b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[jvm root]/f.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>f</title> <link href="../../styles/style.css" rel="Stylesheet"> + <link href="../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../";</script> diff --git a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[jvm root]/index.html index 8ab1c93f..da204f6b 100644 --- a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[jvm root]/index.html +++ b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/[jvm root]/index.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>[jvm root]</title> <link href="../../styles/style.css" rel="Stylesheet"> + <link href="../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../";</script> diff --git a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/index.html b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/index.html index 440758c2..ca7ec92c 100644 --- a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/root/index.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>root</title> <link href="../styles/style.css" rel="Stylesheet"> + <link href="../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../";</script> diff --git a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/scripts/navigationLoader.js b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/scripts/navigationLoader.js index ecbabb4c..b30a866d 100644 --- a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/scripts/navigationLoader.js +++ b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/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/functionWithNotDocumentedAnnotation/out/html/styles/jetbrains-mono.css b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/styles/jetbrains-mono.css new file mode 100644 index 00000000..2af32a92 --- /dev/null +++ b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/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/functionWithNotDocumentedAnnotation/out/html/styles/style.css b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/styles/style.css index 720998ad..9eda5f6e 100644 --- a/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/out/html/styles/style.css +++ b/plugins/base/src/test/resources/expect/functionWithNotDocumentedAnnotation/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) { diff --git a/plugins/base/src/test/resources/expect/functionWithParams/out/html/-search.html b/plugins/base/src/test/resources/expect/functionWithParams/out/html/-search.html index 13611eb6..61e7d537 100644 --- a/plugins/base/src/test/resources/expect/functionWithParams/out/html/-search.html +++ b/plugins/base/src/test/resources/expect/functionWithParams/out/html/-search.html @@ -1,6 +1,6 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>Search</title> <link href="styles/style.css" rel="Stylesheet"> <script type="text/javascript" src="scripts/pages.js" async="async"></script> diff --git a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[jvm root]/function.html b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[jvm root]/function.html index e70eca57..0fb966a6 100644 --- a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[jvm root]/function.html +++ b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[jvm root]/function.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>function</title> <link href="../../styles/style.css" rel="Stylesheet"> + <link href="../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../";</script> diff --git a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[jvm root]/index.html index 57ff2cc6..ad72d9f0 100644 --- a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[jvm root]/index.html +++ b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/[jvm root]/index.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>[jvm root]</title> <link href="../../styles/style.css" rel="Stylesheet"> + <link href="../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../";</script> diff --git a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/index.html b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/index.html index 440758c2..ca7ec92c 100644 --- a/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/functionWithParams/out/html/root/index.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>root</title> <link href="../styles/style.css" rel="Stylesheet"> + <link href="../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../";</script> diff --git a/plugins/base/src/test/resources/expect/functionWithParams/out/html/scripts/navigationLoader.js b/plugins/base/src/test/resources/expect/functionWithParams/out/html/scripts/navigationLoader.js index ecbabb4c..b30a866d 100644 --- a/plugins/base/src/test/resources/expect/functionWithParams/out/html/scripts/navigationLoader.js +++ b/plugins/base/src/test/resources/expect/functionWithParams/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/functionWithParams/out/html/styles/jetbrains-mono.css b/plugins/base/src/test/resources/expect/functionWithParams/out/html/styles/jetbrains-mono.css new file mode 100644 index 00000000..2af32a92 --- /dev/null +++ b/plugins/base/src/test/resources/expect/functionWithParams/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/functionWithParams/out/html/styles/style.css b/plugins/base/src/test/resources/expect/functionWithParams/out/html/styles/style.css index 720998ad..9eda5f6e 100644 --- a/plugins/base/src/test/resources/expect/functionWithParams/out/html/styles/style.css +++ b/plugins/base/src/test/resources/expect/functionWithParams/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) { diff --git a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/-search.html b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/-search.html index 13611eb6..61e7d537 100644 --- a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/-search.html +++ b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/-search.html @@ -1,6 +1,6 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>Search</title> <link href="styles/style.css" rel="Stylesheet"> <script type="text/javascript" src="scripts/pages.js" async="async"></script> diff --git a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[jvm root]/fn.html b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[jvm root]/fn.html index 8d47a590..a922d72f 100644 --- a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[jvm root]/fn.html +++ b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[jvm root]/fn.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>fn</title> <link href="../../styles/style.css" rel="Stylesheet"> + <link href="../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../";</script> diff --git a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[jvm root]/index.html index d60b6d9d..726726b1 100644 --- a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[jvm root]/index.html +++ b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/[jvm root]/index.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>[jvm root]</title> <link href="../../styles/style.css" rel="Stylesheet"> + <link href="../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../";</script> diff --git a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/index.html b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/index.html index 440758c2..ca7ec92c 100644 --- a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/root/index.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>root</title> <link href="../styles/style.css" rel="Stylesheet"> + <link href="../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../";</script> diff --git a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/scripts/navigationLoader.js b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/scripts/navigationLoader.js index ecbabb4c..b30a866d 100644 --- a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/scripts/navigationLoader.js +++ b/plugins/base/src/test/resources/expect/functionWithReceiver/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/functionWithReceiver/out/html/styles/jetbrains-mono.css b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/styles/jetbrains-mono.css new file mode 100644 index 00000000..2af32a92 --- /dev/null +++ b/plugins/base/src/test/resources/expect/functionWithReceiver/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/functionWithReceiver/out/html/styles/style.css b/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/styles/style.css index 720998ad..9eda5f6e 100644 --- a/plugins/base/src/test/resources/expect/functionWithReceiver/out/html/styles/style.css +++ b/plugins/base/src/test/resources/expect/functionWithReceiver/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) { diff --git a/plugins/base/src/test/resources/expect/genericFunction/out/html/-search.html b/plugins/base/src/test/resources/expect/genericFunction/out/html/-search.html index 13611eb6..61e7d537 100644 --- a/plugins/base/src/test/resources/expect/genericFunction/out/html/-search.html +++ b/plugins/base/src/test/resources/expect/genericFunction/out/html/-search.html @@ -1,6 +1,6 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>Search</title> <link href="styles/style.css" rel="Stylesheet"> <script type="text/javascript" src="scripts/pages.js" async="async"></script> diff --git a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/[jvm root]/generic.html b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/[jvm root]/generic.html index a9efa176..91519d2b 100644 --- a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/[jvm root]/generic.html +++ b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/[jvm root]/generic.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>generic</title> <link href="../../styles/style.css" rel="Stylesheet"> + <link href="../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../";</script> diff --git a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/[jvm root]/index.html index 3d9a7000..1cc3a71f 100644 --- a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/[jvm root]/index.html +++ b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/[jvm root]/index.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>[jvm root]</title> <link href="../../styles/style.css" rel="Stylesheet"> + <link href="../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../";</script> diff --git a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/index.html b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/index.html index 440758c2..ca7ec92c 100644 --- a/plugins/base/src/test/resources/expect/genericFunction/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/genericFunction/out/html/root/index.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>root</title> <link href="../styles/style.css" rel="Stylesheet"> + <link href="../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../";</script> diff --git a/plugins/base/src/test/resources/expect/genericFunction/out/html/scripts/navigationLoader.js b/plugins/base/src/test/resources/expect/genericFunction/out/html/scripts/navigationLoader.js index ecbabb4c..b30a866d 100644 --- a/plugins/base/src/test/resources/expect/genericFunction/out/html/scripts/navigationLoader.js +++ b/plugins/base/src/test/resources/expect/genericFunction/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/genericFunction/out/html/styles/jetbrains-mono.css b/plugins/base/src/test/resources/expect/genericFunction/out/html/styles/jetbrains-mono.css new file mode 100644 index 00000000..2af32a92 --- /dev/null +++ b/plugins/base/src/test/resources/expect/genericFunction/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/genericFunction/out/html/styles/style.css b/plugins/base/src/test/resources/expect/genericFunction/out/html/styles/style.css index 720998ad..9eda5f6e 100644 --- a/plugins/base/src/test/resources/expect/genericFunction/out/html/styles/style.css +++ b/plugins/base/src/test/resources/expect/genericFunction/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) { diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/-search.html b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/-search.html index 13611eb6..61e7d537 100644 --- a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/-search.html +++ b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/-search.html @@ -1,6 +1,6 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>Search</title> <link href="styles/style.css" rel="Stylesheet"> <script type="text/javascript" src="scripts/pages.js" async="async"></script> diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/generic.html b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/generic.html index 360045a2..3e44781b 100644 --- a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/generic.html +++ b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/generic.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>generic</title> <link href="../../styles/style.css" rel="Stylesheet"> + <link href="../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../";</script> diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/index.html index bc4888ba..6b116381 100644 --- a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/index.html +++ b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/[jvm root]/index.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>[jvm root]</title> <link href="../../styles/style.css" rel="Stylesheet"> + <link href="../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../";</script> diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/index.html b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/index.html index 440758c2..ca7ec92c 100644 --- a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/root/index.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>root</title> <link href="../styles/style.css" rel="Stylesheet"> + <link href="../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../";</script> diff --git a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/scripts/navigationLoader.js b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/scripts/navigationLoader.js index ecbabb4c..b30a866d 100644 --- a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/scripts/navigationLoader.js +++ b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/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/genericFunctionWithConstraints/out/html/styles/jetbrains-mono.css b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/styles/jetbrains-mono.css new file mode 100644 index 00000000..2af32a92 --- /dev/null +++ b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/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/genericFunctionWithConstraints/out/html/styles/style.css b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/styles/style.css index 720998ad..9eda5f6e 100644 --- a/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/out/html/styles/style.css +++ b/plugins/base/src/test/resources/expect/genericFunctionWithConstraints/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) { diff --git a/plugins/base/src/test/resources/expect/inlineFunction/out/html/-search.html b/plugins/base/src/test/resources/expect/inlineFunction/out/html/-search.html index 13611eb6..61e7d537 100644 --- a/plugins/base/src/test/resources/expect/inlineFunction/out/html/-search.html +++ b/plugins/base/src/test/resources/expect/inlineFunction/out/html/-search.html @@ -1,6 +1,6 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>Search</title> <link href="styles/style.css" rel="Stylesheet"> <script type="text/javascript" src="scripts/pages.js" async="async"></script> diff --git a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[jvm root]/f.html b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[jvm root]/f.html index 5b26e5a8..3766ad15 100644 --- a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[jvm root]/f.html +++ b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[jvm root]/f.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>f</title> <link href="../../styles/style.css" rel="Stylesheet"> + <link href="../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../";</script> diff --git a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[jvm root]/index.html index 27fbc21c..45308f09 100644 --- a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[jvm root]/index.html +++ b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/[jvm root]/index.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>[jvm root]</title> <link href="../../styles/style.css" rel="Stylesheet"> + <link href="../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../";</script> diff --git a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/index.html b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/index.html index 440758c2..ca7ec92c 100644 --- a/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/inlineFunction/out/html/root/index.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>root</title> <link href="../styles/style.css" rel="Stylesheet"> + <link href="../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../";</script> diff --git a/plugins/base/src/test/resources/expect/inlineFunction/out/html/scripts/navigationLoader.js b/plugins/base/src/test/resources/expect/inlineFunction/out/html/scripts/navigationLoader.js index ecbabb4c..b30a866d 100644 --- a/plugins/base/src/test/resources/expect/inlineFunction/out/html/scripts/navigationLoader.js +++ b/plugins/base/src/test/resources/expect/inlineFunction/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/inlineFunction/out/html/styles/jetbrains-mono.css b/plugins/base/src/test/resources/expect/inlineFunction/out/html/styles/jetbrains-mono.css new file mode 100644 index 00000000..2af32a92 --- /dev/null +++ b/plugins/base/src/test/resources/expect/inlineFunction/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/inlineFunction/out/html/styles/style.css b/plugins/base/src/test/resources/expect/inlineFunction/out/html/styles/style.css index 720998ad..9eda5f6e 100644 --- a/plugins/base/src/test/resources/expect/inlineFunction/out/html/styles/style.css +++ b/plugins/base/src/test/resources/expect/inlineFunction/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) { diff --git a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/-search.html b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/-search.html index 13611eb6..61e7d537 100644 --- a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/-search.html +++ b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/-search.html @@ -1,6 +1,6 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>Search</title> <link href="styles/style.css" rel="Stylesheet"> <script type="text/javascript" src="scripts/pages.js" async="async"></script> diff --git a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[jvm root]/f.html b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[jvm root]/f.html index 5b26e5a8..3766ad15 100644 --- a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[jvm root]/f.html +++ b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[jvm root]/f.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>f</title> <link href="../../styles/style.css" rel="Stylesheet"> + <link href="../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../";</script> diff --git a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[jvm root]/index.html index 27fbc21c..45308f09 100644 --- a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[jvm root]/index.html +++ b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/[jvm root]/index.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>[jvm root]</title> <link href="../../styles/style.css" rel="Stylesheet"> + <link href="../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../";</script> diff --git a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/index.html b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/index.html index 440758c2..ca7ec92c 100644 --- a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/root/index.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>root</title> <link href="../styles/style.css" rel="Stylesheet"> + <link href="../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../";</script> diff --git a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/scripts/navigationLoader.js b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/scripts/navigationLoader.js index ecbabb4c..b30a866d 100644 --- a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/scripts/navigationLoader.js +++ b/plugins/base/src/test/resources/expect/inlineSuspendFunction/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/inlineSuspendFunction/out/html/styles/jetbrains-mono.css b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/styles/jetbrains-mono.css new file mode 100644 index 00000000..2af32a92 --- /dev/null +++ b/plugins/base/src/test/resources/expect/inlineSuspendFunction/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/inlineSuspendFunction/out/html/styles/style.css b/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/styles/style.css index 720998ad..9eda5f6e 100644 --- a/plugins/base/src/test/resources/expect/inlineSuspendFunction/out/html/styles/style.css +++ b/plugins/base/src/test/resources/expect/inlineSuspendFunction/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) { diff --git a/plugins/base/src/test/resources/expect/signatureTest/out/html/-search.html b/plugins/base/src/test/resources/expect/signatureTest/out/html/-search.html index 13611eb6..61e7d537 100644 --- a/plugins/base/src/test/resources/expect/signatureTest/out/html/-search.html +++ b/plugins/base/src/test/resources/expect/signatureTest/out/html/-search.html @@ -1,6 +1,6 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>Search</title> <link href="styles/style.css" rel="Stylesheet"> <script type="text/javascript" src="scripts/pages.js" async="async"></script> diff --git a/plugins/base/src/test/resources/expect/signatureTest/out/html/root/index.html b/plugins/base/src/test/resources/expect/signatureTest/out/html/root/index.html index 7cec6415..af1f23e1 100644 --- a/plugins/base/src/test/resources/expect/signatureTest/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/signatureTest/out/html/root/index.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>root</title> <link href="../styles/style.css" rel="Stylesheet"> + <link href="../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../";</script> diff --git a/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/index.html b/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/index.html index f6c108eb..43fc499b 100644 --- a/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/index.html +++ b/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/index.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>signatureTest</title> <link href="../../styles/style.css" rel="Stylesheet"> + <link href="../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../";</script> diff --git a/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/test.html b/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/test.html index b0e440b1..0252ebc5 100644 --- a/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/test.html +++ b/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/test.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>test</title> <link href="../../styles/style.css" rel="Stylesheet"> + <link href="../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../";</script> diff --git a/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/test2.html b/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/test2.html index 3128a10b..ab388675 100644 --- a/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/test2.html +++ b/plugins/base/src/test/resources/expect/signatureTest/out/html/root/signatureTest/test2.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>test2</title> <link href="../../styles/style.css" rel="Stylesheet"> + <link href="../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../";</script> diff --git a/plugins/base/src/test/resources/expect/signatureTest/out/html/scripts/navigationLoader.js b/plugins/base/src/test/resources/expect/signatureTest/out/html/scripts/navigationLoader.js index ecbabb4c..b30a866d 100644 --- a/plugins/base/src/test/resources/expect/signatureTest/out/html/scripts/navigationLoader.js +++ b/plugins/base/src/test/resources/expect/signatureTest/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/signatureTest/out/html/styles/jetbrains-mono.css b/plugins/base/src/test/resources/expect/signatureTest/out/html/styles/jetbrains-mono.css new file mode 100644 index 00000000..2af32a92 --- /dev/null +++ b/plugins/base/src/test/resources/expect/signatureTest/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/signatureTest/out/html/styles/style.css b/plugins/base/src/test/resources/expect/signatureTest/out/html/styles/style.css index 720998ad..9eda5f6e 100644 --- a/plugins/base/src/test/resources/expect/signatureTest/out/html/styles/style.css +++ b/plugins/base/src/test/resources/expect/signatureTest/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) { diff --git a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/-search.html b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/-search.html index 13611eb6..61e7d537 100644 --- a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/-search.html +++ b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/-search.html @@ -1,6 +1,6 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>Search</title> <link href="styles/style.css" rel="Stylesheet"> <script type="text/javascript" src="scripts/pages.js" async="async"></script> diff --git a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[jvm root]/available-since1.1.html b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[jvm root]/available-since1.1.html index 3c8a55a7..cdf2898c 100644 --- a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[jvm root]/available-since1.1.html +++ b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[jvm root]/available-since1.1.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>availableSince1.1</title> <link href="../../styles/style.css" rel="Stylesheet"> + <link href="../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../";</script> diff --git a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[jvm root]/index.html index 9d7ae2e7..2df1ac33 100644 --- a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[jvm root]/index.html +++ b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/[jvm root]/index.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>[jvm root]</title> <link href="../../styles/style.css" rel="Stylesheet"> + <link href="../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../";</script> diff --git a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/index.html b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/index.html index 440758c2..ca7ec92c 100644 --- a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/root/index.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>root</title> <link href="../styles/style.css" rel="Stylesheet"> + <link href="../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../";</script> diff --git a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/scripts/navigationLoader.js b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/scripts/navigationLoader.js index ecbabb4c..b30a866d 100644 --- a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/scripts/navigationLoader.js +++ b/plugins/base/src/test/resources/expect/sinceKotlin/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/sinceKotlin/out/html/styles/jetbrains-mono.css b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/styles/jetbrains-mono.css new file mode 100644 index 00000000..2af32a92 --- /dev/null +++ b/plugins/base/src/test/resources/expect/sinceKotlin/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/sinceKotlin/out/html/styles/style.css b/plugins/base/src/test/resources/expect/sinceKotlin/out/html/styles/style.css index 720998ad..9eda5f6e 100644 --- a/plugins/base/src/test/resources/expect/sinceKotlin/out/html/styles/style.css +++ b/plugins/base/src/test/resources/expect/sinceKotlin/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) { diff --git a/plugins/base/src/test/resources/expect/suspendFunction/out/html/-search.html b/plugins/base/src/test/resources/expect/suspendFunction/out/html/-search.html index 13611eb6..61e7d537 100644 --- a/plugins/base/src/test/resources/expect/suspendFunction/out/html/-search.html +++ b/plugins/base/src/test/resources/expect/suspendFunction/out/html/-search.html @@ -1,6 +1,6 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>Search</title> <link href="styles/style.css" rel="Stylesheet"> <script type="text/javascript" src="scripts/pages.js" async="async"></script> diff --git a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[jvm root]/f.html b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[jvm root]/f.html index 6c049b35..6ca7daa7 100644 --- a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[jvm root]/f.html +++ b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[jvm root]/f.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>f</title> <link href="../../styles/style.css" rel="Stylesheet"> + <link href="../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../";</script> diff --git a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[jvm root]/index.html index 8ab1c93f..da204f6b 100644 --- a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[jvm root]/index.html +++ b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/[jvm root]/index.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>[jvm root]</title> <link href="../../styles/style.css" rel="Stylesheet"> + <link href="../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../";</script> diff --git a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/index.html b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/index.html index 440758c2..ca7ec92c 100644 --- a/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/suspendFunction/out/html/root/index.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>root</title> <link href="../styles/style.css" rel="Stylesheet"> + <link href="../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../";</script> diff --git a/plugins/base/src/test/resources/expect/suspendFunction/out/html/scripts/navigationLoader.js b/plugins/base/src/test/resources/expect/suspendFunction/out/html/scripts/navigationLoader.js index ecbabb4c..b30a866d 100644 --- a/plugins/base/src/test/resources/expect/suspendFunction/out/html/scripts/navigationLoader.js +++ b/plugins/base/src/test/resources/expect/suspendFunction/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/suspendFunction/out/html/styles/jetbrains-mono.css b/plugins/base/src/test/resources/expect/suspendFunction/out/html/styles/jetbrains-mono.css new file mode 100644 index 00000000..2af32a92 --- /dev/null +++ b/plugins/base/src/test/resources/expect/suspendFunction/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/suspendFunction/out/html/styles/style.css b/plugins/base/src/test/resources/expect/suspendFunction/out/html/styles/style.css index 720998ad..9eda5f6e 100644 --- a/plugins/base/src/test/resources/expect/suspendFunction/out/html/styles/style.css +++ b/plugins/base/src/test/resources/expect/suspendFunction/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) { diff --git a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/-search.html b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/-search.html index 13611eb6..61e7d537 100644 --- a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/-search.html +++ b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/-search.html @@ -1,6 +1,6 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>Search</title> <link href="styles/style.css" rel="Stylesheet"> <script type="text/javascript" src="scripts/pages.js" async="async"></script> diff --git a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[jvm root]/f.html b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[jvm root]/f.html index 5b26e5a8..3766ad15 100644 --- a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[jvm root]/f.html +++ b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[jvm root]/f.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>f</title> <link href="../../styles/style.css" rel="Stylesheet"> + <link href="../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../";</script> diff --git a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[jvm root]/index.html b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[jvm root]/index.html index 27fbc21c..45308f09 100644 --- a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[jvm root]/index.html +++ b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/[jvm root]/index.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>[jvm root]</title> <link href="../../styles/style.css" rel="Stylesheet"> + <link href="../../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../../";</script> diff --git a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/index.html b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/index.html index 440758c2..ca7ec92c 100644 --- a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/index.html +++ b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/root/index.html @@ -1,8 +1,9 @@ <html> <head> - <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8"> <title>root</title> <link href="../styles/style.css" rel="Stylesheet"> + <link href="../styles/jetbrains-mono.css" rel="Stylesheet"> <script type="text/javascript" src="../scripts/navigationLoader.js" async="async"></script> <script type="text/javascript" src="../scripts/platformContentHandler.js" async="async"></script> <script>var pathToRoot = "../";</script> diff --git a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/scripts/navigationLoader.js b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/scripts/navigationLoader.js index ecbabb4c..b30a866d 100644 --- a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/scripts/navigationLoader.js +++ b/plugins/base/src/test/resources/expect/suspendInlineFunction/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/suspendInlineFunction/out/html/styles/jetbrains-mono.css b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/styles/jetbrains-mono.css new file mode 100644 index 00000000..2af32a92 --- /dev/null +++ b/plugins/base/src/test/resources/expect/suspendInlineFunction/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/suspendInlineFunction/out/html/styles/style.css b/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/styles/style.css index 720998ad..9eda5f6e 100644 --- a/plugins/base/src/test/resources/expect/suspendInlineFunction/out/html/styles/style.css +++ b/plugins/base/src/test/resources/expect/suspendInlineFunction/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) { |