diff options
| author | Szymon Świstun <sswistun@virtuslab.com> | 2020-02-26 11:33:43 +0100 |
|---|---|---|
| committer | Paweł Marks <Kordyjan@users.noreply.github.com> | 2020-02-27 10:06:41 +0100 |
| commit | 971ca471fbca2d382557e8609706eb683a3ada96 (patch) | |
| tree | f8aae07bec3c7020f6a6339c16bfc869c9d3f3e1 | |
| parent | c5b4475e4adf5f5168b6131df78970dc06d470a2 (diff) | |
| download | dokka-971ca471fbca2d382557e8609706eb683a3ada96.tar.gz dokka-971ca471fbca2d382557e8609706eb683a3ada96.tar.bz2 dokka-971ca471fbca2d382557e8609706eb683a3ada96.zip | |
response to comments
13 files changed, 213 insertions, 228 deletions
diff --git a/plugins/base/src/test/kotlin/expect/ExpectTest.kt b/plugins/base/src/test/kotlin/expect/ExpectTest.kt index c014c65f..3a85db17 100644 --- a/plugins/base/src/test/kotlin/expect/ExpectTest.kt +++ b/plugins/base/src/test/kotlin/expect/ExpectTest.kt @@ -1,6 +1,5 @@ package expect -import org.jetbrains.dokka.utilities.DokkaConsoleLogger import org.junit.Test import testApi.testRunner.AbstractCoreTest import java.nio.file.Files @@ -34,19 +33,18 @@ class ExpectTest : AbstractCoreTest() { "diff", expected.asString(), path.asString() - ).also { DokkaConsoleLogger.info("git diff command: ${it.command().joinToString(" ")}") } + ).also { logger.info("git diff command: ${it.command().joinToString(" ")}") } .start() assert(gitCompare.waitFor(gitTimeout, TimeUnit.MILLISECONDS)) { "Git timed out after $gitTimeout" } - gitCompare.inputStream.bufferedReader().lines().forEach { DokkaConsoleLogger.info(it) } - gitCompare.errorStream.bufferedReader().lines().forEach { DokkaConsoleLogger.info(it) } + gitCompare.inputStream.bufferedReader().lines().forEach { logger.info(it) } + gitCompare.errorStream.bufferedReader().lines().forEach { logger.info(it) } assert(gitCompare.exitValue() == 0) { "${path.fileName}: outputs don't match" } } ?: throw AssertionError("obtained path is null") } @Test fun expectTest() { - val logger = DokkaConsoleLogger val sources = Paths.get("src/test", "resources", "expect") Files.list(sources).forEach { p -> @@ -55,6 +53,7 @@ class ExpectTest : AbstractCoreTest() { .also { logger.info("Test out: ${it?.asString()}") } compareOutput(expectOut, testOut) + testOut?.toFile()?.deleteRecursively() } } diff --git a/plugins/base/src/test/resources/expect/test/out/-search.html b/plugins/base/src/test/resources/expect/test/out/-search.html index 6f6af500..1ee812bb 100644 --- a/plugins/base/src/test/resources/expect/test/out/-search.html +++ b/plugins/base/src/test/resources/expect/test/out/-search.html @@ -1,25 +1,23 @@ <html> -<head> - <title>Search</title> - <link href="styles/style.css" rel="Stylesheet"> - <script type="text/javascript" src="scripts/pages.js" async="async"></script> - <script>var pathToRoot = "";</script> -</head> -<body> -<div id="navigation"> - <div id="searchBar"> - <form action="-search.html" method="get" id="searchForm"><input type="search" name="query"><input type="submit" - value="Search"> - </form> - </div> - <div id="sideMenu"></div> -</div> -<div id="content"> - <h1 id="searchTitle">Search results for </h1> - <table> - <tbody id="searchTable"></tbody> - </table> -</div> -</body> + <head> + <title>Search</title> + <link href="styles/style.css" rel="Stylesheet"> + <script type="text/javascript" src="scripts/pages.js" async="async"></script> + <script>var pathToRoot = "";</script> + </head> + <body> + <div id="navigation"> + <div id="searchBar"> + <form action="-search.html" method="get" id="searchForm"><input type="search" name="query"><input type="submit" value="Search"></form> + </div> + <div id="sideMenu"></div> + </div> + <div id="content"> + <h1 id="searchTitle">Search results for </h1> + <table> + <tbody id="searchTable"></tbody> + </table> + </div> + </body> </html> diff --git a/plugins/base/src/test/resources/expect/test/out/images/arrow_down.svg b/plugins/base/src/test/resources/expect/test/out/images/arrow_down.svg index d6dedd64..89e7df47 100644 --- a/plugins/base/src/test/resources/expect/test/out/images/arrow_down.svg +++ b/plugins/base/src/test/resources/expect/test/out/images/arrow_down.svg @@ -1,4 +1,3 @@ <svg width="10" height="7" viewBox="0 0 10 7" fill="none" xmlns="http://www.w3.org/2000/svg"> - <path d="M9.71824 1.66658L9.01113 0.959473L5.00497 4.96447L1.00008 0.959473L0.292969 1.66658L5.01113 6.38474L9.71824 1.66658Z" - fill="#A1AAB4"/> +<path d="M9.71824 1.66658L9.01113 0.959473L5.00497 4.96447L1.00008 0.959473L0.292969 1.66658L5.01113 6.38474L9.71824 1.66658Z" fill="#A1AAB4"/> </svg> diff --git a/plugins/base/src/test/resources/expect/test/out/images/logo-icon.svg b/plugins/base/src/test/resources/expect/test/out/images/logo-icon.svg index 61606c7e..1b3b3670 100644 --- a/plugins/base/src/test/resources/expect/test/out/images/logo-icon.svg +++ b/plugins/base/src/test/resources/expect/test/out/images/logo-icon.svg @@ -1,3 +1,3 @@ <svg width="26" height="26" viewBox="0 0 26 26" fill="none" xmlns="http://www.w3.org/2000/svg"> - <path d="M26 26H0V0H26L12.9243 12.9747L26 26Z" fill="#F8873C"/> +<path d="M26 26H0V0H26L12.9243 12.9747L26 26Z" fill="#F8873C"/> </svg> diff --git a/plugins/base/src/test/resources/expect/test/out/images/logo-text.svg b/plugins/base/src/test/resources/expect/test/out/images/logo-text.svg index e98992a8..7bf3e6c5 100644 --- a/plugins/base/src/test/resources/expect/test/out/images/logo-text.svg +++ b/plugins/base/src/test/resources/expect/test/out/images/logo-text.svg @@ -1,10 +1,6 @@ <svg width="83" height="27" viewBox="0 0 83 27" fill="none" xmlns="http://www.w3.org/2000/svg"> - <path d="M47.1611 7.6297V25.6345V25.6867H61.8428V21.8039H51.3589V10.3852H61.8428V6.50244H47.1611V7.6297Z" - fill="#27282C"/> - <path d="M82.9891 21.8039L72.778 10.3852H82.9051V6.50244H67.0586V10.3852L77.4585 21.8039H67.0586V25.6867H82.9996V21.8039H82.9891Z" - fill="#27282C"/> - <path d="M16.2978 7.76556C14.5872 6.46086 12.4463 5.67804 10.1271 5.67804C4.53357 5.67804 0 10.1871 0 15.7503C0 21.3135 4.53357 25.8226 10.1271 25.8226C12.4463 25.8226 14.5872 25.0502 16.2978 23.735V25.7182H20.4955V0H16.2978V7.76556ZM10.1271 21.8041C6.75838 21.8041 4.02984 19.0903 4.02984 15.7399C4.02984 12.3894 6.75838 9.67563 10.1271 9.67563C13.4958 9.67563 16.2243 12.3894 16.2243 15.7399C16.2138 19.0903 13.4853 21.8041 10.1271 21.8041Z" - fill="#27282C"/> - <path d="M33.9703 5.86566C28.3768 5.86566 23.8433 10.3747 23.8433 15.9379C23.8433 21.5011 28.3768 26.0102 33.9703 26.0102C39.5638 26.0102 44.0974 21.5011 44.0974 15.9379C44.0974 10.3747 39.5638 5.86566 33.9703 5.86566ZM33.9703 21.9917C30.6016 21.9917 27.8731 19.2779 27.8731 15.9275C27.8731 12.577 30.6016 9.86325 33.9703 9.86325C37.339 9.86325 40.0676 12.577 40.0676 15.9275C40.0676 19.2779 37.339 21.9917 33.9703 21.9917Z" - fill="#27282C"/> +<path d="M47.1611 7.6297V25.6345V25.6867H61.8428V21.8039H51.3589V10.3852H61.8428V6.50244H47.1611V7.6297Z" fill="#27282C"/> +<path d="M82.9891 21.8039L72.778 10.3852H82.9051V6.50244H67.0586V10.3852L77.4585 21.8039H67.0586V25.6867H82.9996V21.8039H82.9891Z" fill="#27282C"/> +<path d="M16.2978 7.76556C14.5872 6.46086 12.4463 5.67804 10.1271 5.67804C4.53357 5.67804 0 10.1871 0 15.7503C0 21.3135 4.53357 25.8226 10.1271 25.8226C12.4463 25.8226 14.5872 25.0502 16.2978 23.735V25.7182H20.4955V0H16.2978V7.76556ZM10.1271 21.8041C6.75838 21.8041 4.02984 19.0903 4.02984 15.7399C4.02984 12.3894 6.75838 9.67563 10.1271 9.67563C13.4958 9.67563 16.2243 12.3894 16.2243 15.7399C16.2138 19.0903 13.4853 21.8041 10.1271 21.8041Z" fill="#27282C"/> +<path d="M33.9703 5.86566C28.3768 5.86566 23.8433 10.3747 23.8433 15.9379C23.8433 21.5011 28.3768 26.0102 33.9703 26.0102C39.5638 26.0102 44.0974 21.5011 44.0974 15.9379C44.0974 10.3747 39.5638 5.86566 33.9703 5.86566ZM33.9703 21.9917C30.6016 21.9917 27.8731 19.2779 27.8731 15.9275C27.8731 12.577 30.6016 9.86325 33.9703 9.86325C37.339 9.86325 40.0676 12.577 40.0676 15.9275C40.0676 19.2779 37.339 21.9917 33.9703 21.9917Z" fill="#27282C"/> </svg> diff --git a/plugins/base/src/test/resources/expect/test/out/navigation.html b/plugins/base/src/test/resources/expect/test/out/navigation.html index b0f35878..ebff817d 100644 --- a/plugins/base/src/test/resources/expect/test/out/navigation.html +++ b/plugins/base/src/test/resources/expect/test/out/navigation.html @@ -1,14 +1,10 @@ <div class="sideMenuPart" id="nav-submenu"> - <div class="overview"><a href="root/index.html">root</a><span class="navButton" - onclick="document.getElementById("nav-submenu").classList.toggle("hidden");"><span - class="navButtonContent"></span></span></div> - <div class="sideMenuPart" id="nav-submenu-0"> - <div class="overview"><a href="root//index.html"></a><span class="navButton" - onclick="document.getElementById("nav-submenu-0").classList.toggle("hidden");"><span - class="navButtonContent"></span></span></div> - <div class="sideMenuPart" id="nav-submenu-0-0"> - <div class="overview"><a href="root//fn.html">fn</a></div> - </div> + <div class="overview"><a href="root/index.html">root</a><span class="navButton" onclick="document.getElementById("nav-submenu").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> + <div class="sideMenuPart" id="nav-submenu-0"> + <div class="overview"><a href="root//index.html"></a><span class="navButton" onclick="document.getElementById("nav-submenu-0").classList.toggle("hidden");"><span class="navButtonContent"></span></span></div> + <div class="sideMenuPart" id="nav-submenu-0-0"> + <div class="overview"><a href="root//fn.html">fn</a></div> </div> + </div> </div> diff --git a/plugins/base/src/test/resources/expect/test/out/root/fn.html b/plugins/base/src/test/resources/expect/test/out/root/fn.html index 8b6a80c1..f272cbe7 100644 --- a/plugins/base/src/test/resources/expect/test/out/root/fn.html +++ b/plugins/base/src/test/resources/expect/test/out/root/fn.html @@ -1,30 +1,29 @@ <html> -<head> + <head> <title>fn</title> <link href="../../styles/style.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script>var pathToRoot = "../../";</script> -</head> -<body> -<div id="navigation"> - <div id="searchBar"> - <form action="../../-search.html" method="get" id="searchForm"><input type="search" name="query"><input - type="submit" value="Search"></form> + </head> + <body> + <div id="navigation"> + <div id="searchBar"> + <form action="../../-search.html" method="get" id="searchForm"><input type="search" name="query"><input type="submit" value="Search"></form> + </div> + <div id="sideMenu"></div> </div> - <div id="sideMenu"></div> -</div> -<div id="content">//<a href="../index.html">root</a>/<a href="index.html"></a>/<a href="fn.html">fn</a> - <h1>fn</h1> - fun <a href="fn.html">fn</a>() - <h3>Description [jvm]</h3> - Function fn + <div id="content">//<a href="../index.html">root</a>/<a href="index.html"></a>/<a href="fn.html">fn</a> + <h1>fn</h1> +fun <a href="fn.html">fn</a>() + <h3>Description [jvm]</h3> +Function fn - <h2>Parameters</h2> - <table> + <h2>Parameters</h2> + <table> <thead></thead> <tbody></tbody> - </table> -</div> -</body> + </table> + </div> + </body> </html> diff --git a/plugins/base/src/test/resources/expect/test/out/root/index.html b/plugins/base/src/test/resources/expect/test/out/root/index.html index 0c469a1d..c17e426d 100644 --- a/plugins/base/src/test/resources/expect/test/out/root/index.html +++ b/plugins/base/src/test/resources/expect/test/out/root/index.html @@ -1,37 +1,36 @@ <html> -<head> + <head> <title></title> <link href="../../styles/style.css" rel="Stylesheet"> <script type="text/javascript" src="../../scripts/navigationLoader.js" async="async"></script> <script>var pathToRoot = "../../";</script> -</head> -<body> -<div id="navigation"> - <div id="searchBar"> - <form action="../../-search.html" method="get" id="searchForm"><input type="search" name="query"><input - type="submit" value="Search"></form> + </head> + <body> + <div id="navigation"> + <div id="searchBar"> + <form action="../../-search.html" method="get" id="searchForm"><input type="search" name="query"><input type="submit" value="Search"></form> + </div> + <div id="sideMenu"></div> </div> - <div id="sideMenu"></div> -</div> -<div id="content">//<a href="../index.html">root</a>/<a href="index.html"></a> - <h1>Package </h1> - <h2>Types</h2> - <table> + <div id="content">//<a href="../index.html">root</a>/<a href="index.html"></a> + <h1>Package </h1> + <h2>Types</h2> + <table> <thead></thead> <tbody></tbody> - </table> - <h2>Functions</h2> - <table> + </table> + <h2>Functions</h2> + <table> <thead></thead> <tbody> - <tr> + <tr> <td><a href="fn.html">fn</a></td> <td>fun <a href="fn.html">fn</a>()</td> <td>Function fn</td> - </tr> + </tr> </tbody> - </table> -</div> -</body> + </table> + </div> + </body> </html> diff --git a/plugins/base/src/test/resources/expect/test/out/scripts/navigationLoader.js b/plugins/base/src/test/resources/expect/test/out/scripts/navigationLoader.js index c2117dd5..99a885a9 100644 --- a/plugins/base/src/test/resources/expect/test/out/scripts/navigationLoader.js +++ b/plugins/base/src/test/resources/expect/test/out/scripts/navigationLoader.js @@ -1,9 +1,9 @@ onload = () => { fetch(pathToRoot + "navigation.html") - .then(response => response.text()) - .then(data => { - document.getElementById("sideMenu").innerHTML = data; - }).then(() => { + .then(response => response.text()) + .then(data => { + document.getElementById("sideMenu").innerHTML = data; + }).then(() => { document.querySelectorAll(".overview > a").forEach(link => { link.setAttribute("href", pathToRoot + link.getAttribute("href")) console.log(link.attributes["href"]) diff --git a/plugins/base/src/test/resources/expect/test/out/scripts/pages.js b/plugins/base/src/test/resources/expect/test/out/scripts/pages.js index 93315f40..c0bd7a2f 100644 --- a/plugins/base/src/test/resources/expect/test/out/scripts/pages.js +++ b/plugins/base/src/test/resources/expect/test/out/scripts/pages.js @@ -1,5 +1,5 @@ var pages = [ - {"name": "root", "location": "root/index.html"}, - {"name": "", "location": "root//index.html"}, - {"name": "fn", "location": "root//fn.html"} +{ "name": "root", "location": "root/index.html" }, +{ "name": "", "location": "root//index.html" }, +{ "name": "fn", "location": "root//fn.html" } ] diff --git a/plugins/base/src/test/resources/expect/test/out/scripts/scripts.js b/plugins/base/src/test/resources/expect/test/out/scripts/scripts.js index 8b84d525..c2e29b9f 100644 --- a/plugins/base/src/test/resources/expect/test/out/scripts/scripts.js +++ b/plugins/base/src/test/resources/expect/test/out/scripts/scripts.js @@ -1,11 +1,11 @@ document.getElementById("navigationFilter").oninput = function (e) { - var input = e.target.value; - var menuParts = document.getElementsByClassName("sideMenuPart") - for (let part of menuParts) { - if (part.querySelector("a").textContent.startsWith(input)) { - part.classList.remove("filtered"); - } else { - part.classList.add("filtered"); - } - } + var input = e.target.value; + var menuParts = document.getElementsByClassName("sideMenuPart") + for (let part of menuParts) { + if(part.querySelector("a").textContent.startsWith(input)) { + part.classList.remove("filtered"); + } else { + part.classList.add("filtered"); + } + } }
\ No newline at end of file diff --git a/plugins/base/src/test/resources/expect/test/out/scripts/search.js b/plugins/base/src/test/resources/expect/test/out/scripts/search.js index 22346f38..63112ac5 100644 --- a/plugins/base/src/test/resources/expect/test/out/scripts/search.js +++ b/plugins/base/src/test/resources/expect/test/out/scripts/search.js @@ -1,6 +1,5 @@ var query = new URLSearchParams(window.location.search).get("query"); -document.getElementById("searchTitle").innerHTML += '"' + query + '":'; -document.getElementById("searchTable").innerHTML = pages.filter(el => el.name.startsWith(query)).reduce((acc, element) => { - return acc + + document.getElementById("searchTitle").innerHTML += '"' + query + '":'; + document.getElementById("searchTable").innerHTML = pages.filter(el => el.name.startsWith(query)).reduce((acc, element) => { return acc + '<tr><td><a href="' + element.location + '">' + element.name + '</a></td></tr>' -}, "");
\ No newline at end of file + }, "");
\ No newline at end of file diff --git a/plugins/base/src/test/resources/expect/test/out/styles/style.css b/plugins/base/src/test/resources/expect/test/out/styles/style.css index 9a44da89..4a76dd96 100644 --- a/plugins/base/src/test/resources/expect/test/out/styles/style.css +++ b/plugins/base/src/test/resources/expect/test/out/styles/style.css @@ -42,7 +42,7 @@ } .sideMenuPart > .navButton { - margin-left: 0.25em + margin-left:0.25em } .sideMenuPart > .overview .navButtonContent::after { @@ -62,10 +62,10 @@ display: none; } -body, table { - font: 14px/1.5 'Open Sans', "Helvetica Neue", Helvetica, Arial, sans-serif; +body, table{ + font:14px/1.5 'Open Sans', "Helvetica Neue", Helvetica, Arial, sans-serif; background: #F4F4F4; - font-weight: 300; + font-weight:300; margin-left: auto; margin-right: auto; max-width: 1440px; @@ -73,7 +73,7 @@ body, table { table { display: flex; - padding: 5px; + padding:5px; } td:first-child { @@ -81,273 +81,273 @@ td:first-child { } .keyword { - color: black; - font-family: Monaco, Bitstream Vera Sans Mono, Lucida Console, Terminal; - font-size: 12px; + color:black; + font-family:Monaco, Bitstream Vera Sans Mono, Lucida Console, Terminal; + font-size:12px; } .symbol { - font-family: Monaco, Bitstream Vera Sans Mono, Lucida Console, Terminal; - font-size: 12px; + font-family:Monaco, Bitstream Vera Sans Mono, Lucida Console, Terminal; + font-size:12px; } .identifier { color: darkblue; - font-size: 12px; - font-family: Monaco, Bitstream Vera Sans Mono, Lucida Console, Terminal; + font-size:12px; + font-family:Monaco, Bitstream Vera Sans Mono, Lucida Console, Terminal; } h1, h2, h3, h4, h5, h6 { - color: #222; - margin: 0 0 20px; + color:#222; + margin:0 0 20px; } p, ul, ol, table, pre, dl { - margin: 0 0 20px; + margin:0 0 20px; } h1, h2, h3 { - line-height: 1.1; + line-height:1.1; } h1 { - font-size: 28px; + font-size:28px; } h2 { - color: #393939; + color:#393939; } h3, h4, h5, h6 { - color: #494949; + color:#494949; } a { - color: #258aaf; - font-weight: 400; - text-decoration: none; + color:#258aaf; + font-weight:400; + text-decoration:none; } a:hover { color: inherit; - text-decoration: underline; + text-decoration:underline; } a small { - font-size: 11px; - color: #555; - margin-top: -0.6em; - display: block; + font-size:11px; + color:#555; + margin-top:-0.6em; + display:block; } .wrapper { - width: 860px; - margin: 0 auto; + width:860px; + margin:0 auto; } blockquote { - border-left: 1px solid #e5e5e5; - margin: 0; - padding: 0 0 0 20px; - font-style: italic; + border-left:1px solid #e5e5e5; + margin:0; + padding:0 0 0 20px; + font-style:italic; } code, pre { - font-family: Monaco, Bitstream Vera Sans Mono, Lucida Console, Terminal; - color: #333; - font-size: 12px; + font-family:Monaco, Bitstream Vera Sans Mono, Lucida Console, Terminal; + color:#333; + font-size:12px; } pre { display: block; - /* - padding:8px 8px; - background: #f8f8f8; - border-radius:5px; - border:1px solid #e5e5e5; - */ +/* + padding:8px 8px; + background: #f8f8f8; + border-radius:5px; + border:1px solid #e5e5e5; +*/ overflow-x: auto; } table { - width: 100%; - border-collapse: collapse; + width:100%; + border-collapse:collapse; } th, td { - text-align: left; + text-align:left; vertical-align: top; - padding: 5px 10px; + padding:5px 10px; } dt { - color: #444; - font-weight: 700; + color:#444; + font-weight:700; } th { - color: #444; + color:#444; } img { - max-width: 100%; + max-width:100%; } header { - width: 270px; - float: left; - position: fixed; + width:270px; + float:left; + position:fixed; } header ul { - list-style: none; - height: 40px; + list-style:none; + height:40px; - padding: 0; + padding:0; background: #eee; background: -moz-linear-gradient(top, #f8f8f8 0%, #dddddd 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f8f8f8), color-stop(100%, #dddddd)); - background: -webkit-linear-gradient(top, #f8f8f8 0%, #dddddd 100%); - background: -o-linear-gradient(top, #f8f8f8 0%, #dddddd 100%); - background: -ms-linear-gradient(top, #f8f8f8 0%, #dddddd 100%); - background: linear-gradient(top, #f8f8f8 0%, #dddddd 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f8f8f8), color-stop(100%,#dddddd)); + background: -webkit-linear-gradient(top, #f8f8f8 0%,#dddddd 100%); + background: -o-linear-gradient(top, #f8f8f8 0%,#dddddd 100%); + background: -ms-linear-gradient(top, #f8f8f8 0%,#dddddd 100%); + background: linear-gradient(top, #f8f8f8 0%,#dddddd 100%); - border-radius: 5px; - border: 1px solid #d2d2d2; - box-shadow: inset #fff 0 1px 0, inset rgba(0, 0, 0, 0.03) 0 -1px 0; - width: 270px; + border-radius:5px; + border:1px solid #d2d2d2; + box-shadow:inset #fff 0 1px 0, inset rgba(0,0,0,0.03) 0 -1px 0; + width:270px; } header li { - width: 89px; - float: left; - border-right: 1px solid #d2d2d2; - height: 40px; + width:89px; + float:left; + border-right:1px solid #d2d2d2; + height:40px; } header ul a { - line-height: 1; - font-size: 11px; - color: #999; - display: block; - text-align: center; - padding-top: 6px; - height: 40px; + line-height:1; + font-size:11px; + color:#999; + display:block; + text-align:center; + padding-top:6px; + height:40px; } strong { - color: #222; - font-weight: 700; + color:#222; + font-weight:700; } header ul li + li { - width: 88px; - border-left: 1px solid #fff; + width:88px; + border-left:1px solid #fff; } header ul li + li + li { - border-right: none; - width: 89px; + border-right:none; + width:89px; } header ul a strong { - font-size: 14px; - display: block; - color: #222; + font-size:14px; + display:block; + color:#222; } section { - width: 500px; - float: right; - padding-bottom: 50px; + width:500px; + float:right; + padding-bottom:50px; } small { - font-size: 11px; + font-size:11px; } hr { - border: 0; - background: #e5e5e5; - height: 1px; - margin: 0 0 20px; + border:0; + background:#e5e5e5; + height:1px; + margin:0 0 20px; } footer { - width: 270px; - float: left; - position: fixed; - bottom: 50px; + width:270px; + float:left; + position:fixed; + bottom:50px; } @media print, screen and (max-width: 960px) { div.wrapper { - width: auto; - margin: 0; + width:auto; + margin:0; } header, section, footer { - float: none; - position: static; - width: auto; + float:none; + position:static; + width:auto; } header { - padding-right: 320px; + padding-right:320px; } section { - border: 1px solid #e5e5e5; - border-width: 1px 0; - padding: 20px 0; - margin: 0 0 20px; + border:1px solid #e5e5e5; + border-width:1px 0; + padding:20px 0; + margin:0 0 20px; } header a small { - display: inline; + display:inline; } header ul { - position: absolute; - right: 50px; - top: 52px; + position:absolute; + right:50px; + top:52px; } } @media print, screen and (max-width: 720px) { body { - word-wrap: break-word; + word-wrap:break-word; } header { - padding: 0; + padding:0; } header ul, header p.view { - position: static; + position:static; } pre, code { - word-wrap: normal; + word-wrap:normal; } } @media print, screen and (max-width: 480px) { body { - padding: 15px; + padding:15px; } header ul { - display: none; + display:none; } } @media print { body { - padding: 0.4in; - font-size: 12pt; - color: #444; + padding:0.4in; + font-size:12pt; + color:#444; } } |
