diff options
author | Alexander Early <alexander.early@gmail.com> | 2016-06-30 17:56:53 -0700 |
---|---|---|
committer | Alexander Early <alexander.early@gmail.com> | 2016-06-30 17:56:53 -0700 |
commit | c1a26634b5394061975975e06b316a61681ffffe (patch) | |
tree | b6023ec50f8d5ef79d35df5efa24360c754b8cbc | |
parent | 98f36b4624f9fa953c62bc0b8dea7e1f313fbc2e (diff) | |
download | async-c1a26634b5394061975975e06b316a61681ffffe.tar.gz |
copy custom styles into main css, tweak layout
-rw-r--r-- | support/jsdoc/jsdoc-custom.css | 65 | ||||
-rw-r--r-- | support/jsdoc/jsdoc-fix-html.js | 1 | ||||
-rw-r--r-- | support/jsdoc/theme/static/styles/jsdoc-default.css | 69 | ||||
-rw-r--r-- | support/jsdoc/theme/tmpl/layout.tmpl | 1 |
4 files changed, 64 insertions, 72 deletions
diff --git a/support/jsdoc/jsdoc-custom.css b/support/jsdoc/jsdoc-custom.css deleted file mode 100644 index b42226d..0000000 --- a/support/jsdoc/jsdoc-custom.css +++ /dev/null @@ -1,65 +0,0 @@ -body { - height: 100%; - width: 100%; - padding-left: 0px; -} - -body nav { - position: fixed; - top: 50px; - padding-left: 12px; - overflow-y: auto; - height: calc(100% - 50px); -} - -/* fix bootstrap's styling */ -pre { - background: #fff; - padding: 0px; -} - -footer { - margin-left: 0px; -} - -.navbar-brand { - padding: 5px; -} - -.navbar-brand img { - height: 40px; -} - -#main { - position: fixed; - float: none; - overflow-y: auto; - margin-left: 250px; - top: 50px; - height: calc(100% - 50px); -} - -.tt-menu { - background-color: white; - padding: 10px; - width: 100%; - border-radius: 4px; - border: 1px solid #D3D3D3; - z-index: 11; - overflow-y: auto; -} - -.tt-cursor { - background-color: #D3D3D3; -} - -.search-bar-header-first { - margin: 5px 0px; - border-bottom: 1px solid #D3D3D3; -} - -.search-bar-header { - margin: 5px 0px; - border-top: 1px solid #D3D3D3; - border-bottom: 1px solid #D3D3D3; -} diff --git a/support/jsdoc/jsdoc-fix-html.js b/support/jsdoc/jsdoc-fix-html.js index 3892d09..981228a 100644 --- a/support/jsdoc/jsdoc-fix-html.js +++ b/support/jsdoc/jsdoc-fix-html.js @@ -162,7 +162,6 @@ function fixModuleLinks(files, callback) { fs.copySync(path.join(__dirname, '../../dist/async.js'), path.join(docsDir, 'scripts/async.js'), { clobber: true }); fs.copySync(path.join(__dirname, './jsdoc-custom.js'), path.join(docsDir, 'scripts/jsdoc-custom.js'), { clobber: true }); -fs.copySync(path.join(__dirname, './jsdoc-custom.css'), path.join(docsDir, 'styles/jsdoc-custom.css'), { clobber: true }); fs.copySync(path.join(__dirname, '..', '..', 'logo', 'favicon.ico'), path.join(docsDir, 'favicon.ico'), { clobber: true }); fs.copySync(path.join(__dirname, '..', '..', 'logo', 'async-logo.svg'), path.join(docsDir, 'img', 'async-logo.svg'), { clobber: true }); diff --git a/support/jsdoc/theme/static/styles/jsdoc-default.css b/support/jsdoc/theme/static/styles/jsdoc-default.css index 9b4282e..e814fb8 100644 --- a/support/jsdoc/theme/static/styles/jsdoc-default.css +++ b/support/jsdoc/theme/static/styles/jsdoc-default.css @@ -13,7 +13,7 @@ body { color: #4d4e53; background-color: white; margin: 0 auto; - padding: 0 20px; + padding: 0; font-family: 'Helvetica Neue', Helvetica, sans-serif; font-size: 16px; @@ -69,6 +69,7 @@ h3 { h4 { font-size: 18px; margin: 1em 0 .2em; + padding-top: 4em; color: #4d4e53; } @@ -104,21 +105,52 @@ tt, code, kbd, samp { } #main { - float: right; + position: fixed; + top: 50px; + float: none; min-width: 360px; - width: calc(100% - 250px); + overflow-y: auto; + padding-left: 250px; + width: 100%; + height: calc(100% - 50px); } header { display: block } -section { +section, h1 { display: block; background-color: #fff; padding: 0 30px; } + +.tt-menu { + background-color: white; + padding: 10px; + width: 100%; + border-radius: 4px; + border: 1px solid #D3D3D3; + z-index: 11; + overflow-y: auto; +} + +.tt-cursor { + background-color: #D3D3D3; +} + +.search-bar-header-first { + margin: 5px 0px; + border-bottom: 1px solid #D3D3D3; +} + +.search-bar-header { + margin: 5px 0px; + border-top: 1px solid #D3D3D3; + border-bottom: 1px solid #D3D3D3; +} + .variation { display: none } @@ -138,6 +170,10 @@ nav { overflow: auto; position: fixed; height: 100%; + top: 50px; + padding-left: 12px; + overflow-y: auto; + height: calc(100% - 50px); } nav h3 { @@ -210,6 +246,15 @@ nav > h2 > a { color: hsl(202, 71%, 50%) !important; } + +.navbar-brand { + padding: 5px; +} + +.navbar-brand img { + height: 40px; +} + .navbar-fixed-top { background-color: #101010; } @@ -224,13 +269,27 @@ nav > h2 > a { footer { color: hsl(0, 0%, 28%); - margin-left: 250px; display: block; padding: 15px; font-style: italic; font-size: 90%; } +#main section, #main h1 { + margin: 0 auto; + max-width: 800px; +} + +article img { + max-width: 100%; +} + +/* fix bootstrap's styling */ +pre { + background: #fff; + padding: 0px; +} + .ancestors { color: #999 } diff --git a/support/jsdoc/theme/tmpl/layout.tmpl b/support/jsdoc/theme/tmpl/layout.tmpl index 5fe2d38..c0551d1 100644 --- a/support/jsdoc/theme/tmpl/layout.tmpl +++ b/support/jsdoc/theme/tmpl/layout.tmpl @@ -19,7 +19,6 @@ <link type="text/css" rel="stylesheet" href="styles/prettify-tomorrow.css"> <link type="text/css" rel="stylesheet" href="styles/jsdoc-default.css"> - <link src="text/css" rel="stylesheet" href="styles/jsdoc-custom.css"> <script src="https://cdn.jsdelivr.net/jquery/2.2.4/jquery.min.js"></script> <script src="https://cdn.jsdelivr.net/bootstrap/3.3.6/js/bootstrap.min.js"></script> |