diff --git a/godoc/godoc.go b/godoc/godoc.go index e77a81f522..6b176c6ab2 100644 --- a/godoc/godoc.go +++ b/godoc/godoc.go @@ -98,6 +98,9 @@ func (p *Presentation) initFuncMap() { // formatting of Notes "noteTitle": noteTitle, + + // Number operation + "multiply": multiply, } if p.URLForSrc != nil { p.funcMap["srcLink"] = p.URLForSrc @@ -110,6 +113,8 @@ func (p *Presentation) initFuncMap() { } } +func multiply(a, b int) int { return a * b } + func filenameFunc(path string) string { _, localname := pathpkg.Split(path) return localname diff --git a/godoc/static/godoc.html b/godoc/static/godoc.html index c851c528f3..6d6d1b69d4 100644 --- a/godoc/static/godoc.html +++ b/godoc/static/godoc.html @@ -2,6 +2,8 @@ + + {{with .Tabtitle}} {{html .}} - The Go Programming Language {{else}} @@ -21,7 +23,9 @@
- + + +▽
-
diff --git a/godoc/static/godocs.js b/godoc/static/godocs.js index 9486d2c91c..f7dc7fa91a 100644 --- a/godoc/static/godocs.js +++ b/godoc/static/godocs.js @@ -14,6 +14,19 @@ (function() { 'use strict'; +// Mobile-friendly topbar menu +$(function() { + var menu = $('#menu'); + var menuButton = $('#menu-button'); + var menuButtonArrow = $('#menu-button-arrow'); + menuButton.click(function(event) { + menu.toggleClass('menu-visible'); + menuButtonArrow.toggleClass('vertical-flip'); + event.preventDefault(); + return false; + }); +}); + function bindSearchEvents() { var search = $('#search'); diff --git a/godoc/static/package.html b/godoc/static/package.html index cc69e61941..58dc1feed5 100644 --- a/godoc/static/package.html +++ b/godoc/static/package.html @@ -249,35 +249,47 @@

Standard library

{{end}} - - - - - - - {{if not (or (eq $.Dirname "/src") (eq $.Dirname "/src/cmd") $.DirFlat)}} - - - - {{end}} - {{range .List}} - {{if $.DirFlat}} - {{if .HasPkg}} - - - - - - {{end}} - {{else}} + + +
+
Name    Synopsis
..
{{html .Path}}    {{html .Synopsis}}
- - - + + - {{end}} - {{end}} -
{{repeat `     ` .Depth}}{{html .Name}}    {{html .Synopsis}}NameSynopsis
+ + {{if not (or (eq $.Dirname "/src") (eq $.Dirname "/src/cmd") $.DirFlat)}} + + .. + + {{end}} + + {{range .List}} + {{if $.DirFlat}} + {{if .HasPkg}} + + + {{html .Path}} + + + {{html .Synopsis}} + + + {{end}} + {{else}} + + + {{html .Name}} + + + {{html .Synopsis}} + + + {{end}} + {{end}} + + + {{if eq $.Dirname "/src"}}

Other packages

diff --git a/godoc/static/static.go b/godoc/static/static.go index b8b9ef5f58..4f5868fbb2 100644 --- a/godoc/static/static.go +++ b/godoc/static/static.go @@ -473,6 +473,8 @@ var Files = map[string]string{ + + {{with .Tabtitle}} {{html .}} - The Go Programming Language {{else}} @@ -492,7 +494,9 @@ var Files = map[string]string{
- + + +▽
-
@@ -589,6 +592,19 @@ and code is licensed under a BSD license.
(function() { 'use strict'; +// Mobile-friendly topbar menu +$(function() { + var menu = $('#menu'); + var menuButton = $('#menu-button'); + var menuButtonArrow = $('#menu-button-arrow'); + menuButton.click(function(event) { + menu.toggleClass('menu-visible'); + menuButtonArrow.toggleClass('vertical-flip'); + event.preventDefault(); + return false; + }); +}); + function bindSearchEvents() { var search = $('#search'); @@ -1762,35 +1778,47 @@ function cgAddChild(tree, ul, cgn) {

Standard library

{{end}} - - - - - - - {{if not (or (eq $.Dirname "/src") (eq $.Dirname "/src/cmd") $.DirFlat)}} - - - - {{end}} - {{range .List}} - {{if $.DirFlat}} - {{if .HasPkg}} - - - - - - {{end}} - {{else}} + + +
+
Name    Synopsis
..
{{html .Path}}    {{html .Synopsis}}
- - - + + - {{end}} - {{end}} -
{{repeat ` + "`" + `     ` + "`" + ` .Depth}}{{html .Name}}    {{html .Synopsis}}NameSynopsis
+ + {{if not (or (eq $.Dirname "/src") (eq $.Dirname "/src/cmd") $.DirFlat)}} + + .. + + {{end}} + + {{range .List}} + {{if $.DirFlat}} + {{if .HasPkg}} + + + {{html .Path}} + + + {{html .Synopsis}} + + + {{end}} + {{else}} + + + {{html .Name}} + + + {{html .Synopsis}} + + + {{end}} + {{end}} + + + {{if eq $.Dirname "/src"}}

Other packages

@@ -2696,9 +2724,10 @@ function PlaygroundOutput(el) { "style.css": `body { margin: 0; - font-family: Helvetica, Arial, sans-serif; + font-family: Arial, sans-serif; font-size: 16px; background-color: #fff; + line-height: 1.3em; } pre, code { @@ -2706,7 +2735,8 @@ code { font-size: 14px; } pre { - line-height: 18px; + line-height: 1.4em; + overflow-x: auto; } pre .comment { color: #006600; @@ -2736,6 +2766,10 @@ a:hover, .exampleHeading .text:hover { text-decoration: underline; } +p { + max-width: 800px; + word-wrap: break-word; +} p, pre, ul, @@ -2743,7 +2777,7 @@ ol { margin: 20px; } pre { - background: #e9e9e9; + background: #EFEFEF; padding: 10px; -webkit-border-radius: 5px; @@ -2756,18 +2790,24 @@ h2, h3, h4, .rootHeading { - margin: 20px 0; + margin: 40px 0 20px; padding: 0; color: #375EAB; font-weight: bold; } h1 { - font-size: 24px; + font-size: 28px; + line-height: 1; } h2 { font-size: 20px; background: #E0EBF5; - padding: 2px 5px; + padding: 8px; + line-height: 1.25; + font-weight: normal; +} +h2 a { + font-weight: bold; } h3 { font-size: 20px; @@ -2788,7 +2828,7 @@ dl { margin: 20px; } dd { - margin: 2px 20px; + margin: 0; } dl, dd { @@ -2798,28 +2838,28 @@ div#nav table td { vertical-align: top; } -table.dir th { - text-align: left; + +.pkg-dir { + padding: 0 10px; } -table.dir td { - word-wrap: break-word; - vertical-align: top; +.pkg-dir table { + border-collapse: collapse; + border-spacing: 0; } -div#page.wide table.dir td.name { - white-space: nowrap; +.pkg-name { + padding-right: 10px; } .alert { color: #AA0000; } -div#heading { +.top-heading { float: left; - margin: 0 0 10px 0; padding: 21px 0; font-size: 20px; font-weight: normal; } -div#heading a { +.top-heading a { color: #222; text-decoration: none; } @@ -2842,11 +2882,14 @@ div#topbar > .container { margin-left: auto; margin-right: auto; padding: 0 20px; - width: 900px; +} +div#topbar > .container, +div#page > .container { + max-width: 950px; } div#page.wide > .container, div#topbar.wide > .container { - width: auto; + max-width: none; } div#plusone { float: right; @@ -2865,7 +2908,8 @@ div#menu > a, div#menu > input, div#learn .buttons a, div.play .buttons a, -div#blog .read a { +div#blog .read a, +#menu-button { padding: 10px; text-decoration: none; @@ -2877,11 +2921,13 @@ div#blog .read a { } div#playground .buttons a, div#menu > a, -div#menu > input { +div#menu > input, +#menu-button { border: 1px solid #375EAB; } div#playground .buttons a, -div#menu > a { +div#menu > a, +#menu-button { color: white; background: #375EAB; } @@ -2902,39 +2948,61 @@ div#blog .read a { } div#menu { - float: right; - min-width: 590px; - padding: 10px 0; text-align: right; + padding: 10px; + white-space: nowrap; + max-height: 0; + -moz-transition: max-height .25s linear; + transition: max-height .25s linear; + width: 100%; } -div#menu > a { - margin-right: 5px; - margin-bottom: 10px; - +div#menu.menu-visible { + max-height: 500px; +} +div#menu > a, +#menu-button { + margin: 10px 2px; padding: 10px; } div#menu > input { position: relative; top: 1px; - width: 60px; + width: 140px; background: white; color: #222; + box-sizing: border-box; } div#menu > input.inactive { color: #999; } +#menu-button { + display: none; + position: absolute; + right: 5px; + top: 0; + margin-right: 5px; +} +#menu-button-arrow { + display: inline-block; +} +.vertical-flip { + transform: rotate(-180deg); +} + div.left { float: left; clear: left; + margin-right: 2.5%; } div.right { float: right; clear: right; + margin-left: 2.5%; } div.left, div.right { - width: 415px; + width: 45%; } div#learn, @@ -2947,10 +3015,7 @@ div#about { } div#about { font-size: 20px; -} - -div#about { - height: 96px; + margin: 0 auto 30px; } div#gopher { background: url(/doc/gopher/frontpage.png) no-repeat; @@ -3067,6 +3132,9 @@ div#learn .output .exit { display: none; } +div#video { + max-width: 100%; +} div#blog, div#video { margin-top: 40px; @@ -3290,5 +3358,134 @@ a.error { border-top-right-radius: 4px; padding: 2px 4px 2px 4px; /* TRBL */ } -`, + + +#heading-narrow { + display: none; +} + +@media (max-width: 930px) { + #heading-wide { + display: none; + } + #heading-narrow { + display: block; + } +} + + +@media (max-width: 760px) { + .container .left, + .container .right { + width: auto; + float: none; + } + + div#about { + max-width: 500px; + text-align: center; + } +} + +@media (min-width: 700px) and (max-width: 1000px) { + div#menu > a { + margin: 5px 0; + font-size: 14px; + } + + div#menu > input { + font-size: 14px; + } +} + +@media (max-width: 700px) { + body { + font-size: 15px; + } + + pre, + code { + font-size: 13px; + } + + div#page > .container { + padding: 0 10px; + } + + div#topbar { + height: auto; + padding: 10px; + } + + div#topbar > .container { + padding: 0; + } + + #heading-wide { + display: block; + } + #heading-narrow { + display: none; + } + + .top-heading { + float: none; + display: inline-block; + padding: 12px; + } + + div#menu { + padding: 0; + min-width: 0; + text-align: left; + float: left; + } + + div#menu > a, + div#menu > input { + display: block; + margin-left: 0; + margin-right: 0; + } + + div#menu > input { + width: 100%; + } + + #menu-button { + display: inline-block; + } + + p, + pre, + ul, + ol { + margin: 10px; + } + + .pkg-synopsis { + display: none; + } + + img.gopher { + display: none; + } +} + +@media (max-width: 480px) { + #heading-wide { + display: none; + } + #heading-narrow { + display: block; + } +} + +@media print { + pre { + background: #FFF; + border: 1px solid #BBB; + white-space: pre-wrap; + } +}`, } diff --git a/godoc/static/style.css b/godoc/static/style.css index ff4b70329b..8430d8303b 100644 --- a/godoc/static/style.css +++ b/godoc/static/style.css @@ -1,8 +1,9 @@ body { margin: 0; - font-family: Helvetica, Arial, sans-serif; + font-family: Arial, sans-serif; font-size: 16px; background-color: #fff; + line-height: 1.3em; } pre, code { @@ -10,7 +11,8 @@ code { font-size: 14px; } pre { - line-height: 18px; + line-height: 1.4em; + overflow-x: auto; } pre .comment { color: #006600; @@ -40,6 +42,10 @@ a:hover, .exampleHeading .text:hover { text-decoration: underline; } +p { + max-width: 800px; + word-wrap: break-word; +} p, pre, ul, @@ -47,7 +53,7 @@ ol { margin: 20px; } pre { - background: #e9e9e9; + background: #EFEFEF; padding: 10px; -webkit-border-radius: 5px; @@ -60,18 +66,24 @@ h2, h3, h4, .rootHeading { - margin: 20px 0; + margin: 40px 0 20px; padding: 0; color: #375EAB; font-weight: bold; } h1 { - font-size: 24px; + font-size: 28px; + line-height: 1; } h2 { font-size: 20px; background: #E0EBF5; - padding: 2px 5px; + padding: 8px; + line-height: 1.25; + font-weight: normal; +} +h2 a { + font-weight: bold; } h3 { font-size: 20px; @@ -92,7 +104,7 @@ dl { margin: 20px; } dd { - margin: 2px 20px; + margin: 0; } dl, dd { @@ -102,28 +114,28 @@ div#nav table td { vertical-align: top; } -table.dir th { - text-align: left; + +.pkg-dir { + padding: 0 10px; } -table.dir td { - word-wrap: break-word; - vertical-align: top; +.pkg-dir table { + border-collapse: collapse; + border-spacing: 0; } -div#page.wide table.dir td.name { - white-space: nowrap; +.pkg-name { + padding-right: 10px; } .alert { color: #AA0000; } -div#heading { +.top-heading { float: left; - margin: 0 0 10px 0; padding: 21px 0; font-size: 20px; font-weight: normal; } -div#heading a { +.top-heading a { color: #222; text-decoration: none; } @@ -146,11 +158,14 @@ div#topbar > .container { margin-left: auto; margin-right: auto; padding: 0 20px; - width: 900px; +} +div#topbar > .container, +div#page > .container { + max-width: 950px; } div#page.wide > .container, div#topbar.wide > .container { - width: auto; + max-width: none; } div#plusone { float: right; @@ -169,7 +184,8 @@ div#menu > a, div#menu > input, div#learn .buttons a, div.play .buttons a, -div#blog .read a { +div#blog .read a, +#menu-button { padding: 10px; text-decoration: none; @@ -181,11 +197,13 @@ div#blog .read a { } div#playground .buttons a, div#menu > a, -div#menu > input { +div#menu > input, +#menu-button { border: 1px solid #375EAB; } div#playground .buttons a, -div#menu > a { +div#menu > a, +#menu-button { color: white; background: #375EAB; } @@ -206,39 +224,61 @@ div#blog .read a { } div#menu { - float: right; - min-width: 590px; - padding: 10px 0; text-align: right; + padding: 10px; + white-space: nowrap; + max-height: 0; + -moz-transition: max-height .25s linear; + transition: max-height .25s linear; + width: 100%; } -div#menu > a { - margin-right: 5px; - margin-bottom: 10px; - +div#menu.menu-visible { + max-height: 500px; +} +div#menu > a, +#menu-button { + margin: 10px 2px; padding: 10px; } div#menu > input { position: relative; top: 1px; - width: 60px; + width: 140px; background: white; color: #222; + box-sizing: border-box; } div#menu > input.inactive { color: #999; } +#menu-button { + display: none; + position: absolute; + right: 5px; + top: 0; + margin-right: 5px; +} +#menu-button-arrow { + display: inline-block; +} +.vertical-flip { + transform: rotate(-180deg); +} + div.left { float: left; clear: left; + margin-right: 2.5%; } div.right { float: right; clear: right; + margin-left: 2.5%; } div.left, div.right { - width: 415px; + width: 45%; } div#learn, @@ -251,10 +291,7 @@ div#about { } div#about { font-size: 20px; -} - -div#about { - height: 96px; + margin: 0 auto 30px; } div#gopher { background: url(/doc/gopher/frontpage.png) no-repeat; @@ -371,6 +408,9 @@ div#learn .output .exit { display: none; } +div#video { + max-width: 100%; +} div#blog, div#video { margin-top: 40px; @@ -594,3 +634,133 @@ a.error { border-top-right-radius: 4px; padding: 2px 4px 2px 4px; /* TRBL */ } + + +#heading-narrow { + display: none; +} + +@media (max-width: 930px) { + #heading-wide { + display: none; + } + #heading-narrow { + display: block; + } +} + + +@media (max-width: 760px) { + .container .left, + .container .right { + width: auto; + float: none; + } + + div#about { + max-width: 500px; + text-align: center; + } +} + +@media (min-width: 700px) and (max-width: 1000px) { + div#menu > a { + margin: 5px 0; + font-size: 14px; + } + + div#menu > input { + font-size: 14px; + } +} + +@media (max-width: 700px) { + body { + font-size: 15px; + } + + pre, + code { + font-size: 13px; + } + + div#page > .container { + padding: 0 10px; + } + + div#topbar { + height: auto; + padding: 10px; + } + + div#topbar > .container { + padding: 0; + } + + #heading-wide { + display: block; + } + #heading-narrow { + display: none; + } + + .top-heading { + float: none; + display: inline-block; + padding: 12px; + } + + div#menu { + padding: 0; + min-width: 0; + text-align: left; + float: left; + } + + div#menu > a, + div#menu > input { + display: block; + margin-left: 0; + margin-right: 0; + } + + div#menu > input { + width: 100%; + } + + #menu-button { + display: inline-block; + } + + p, + pre, + ul, + ol { + margin: 10px; + } + + .pkg-synopsis { + display: none; + } + + img.gopher { + display: none; + } +} + +@media (max-width: 480px) { + #heading-wide { + display: none; + } + #heading-narrow { + display: block; + } +} + +@media print { + pre { + background: #FFF; + border: 1px solid #BBB; + white-space: pre-wrap; + } +} \ No newline at end of file