diff --git a/.gitignore b/.gitignore index b08c305..aa020aa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -bin/ +#bin/ pkg/ # Compiled Object files, Static and Dynamic libs (Shared Objects) diff --git a/Makefile b/Makefile index 523e053..1c4ffd5 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ export GOPATH := ${GOPATH}:$(shell pwd) +#export GOPATH := /home/chenbin/bazel-gopath:$(shell pwd) export VERSION := "0.1.0" all: @@ -26,4 +27,4 @@ docular: go install -ldflags "-s -w" docular/cmd/docular deb: - debmaker -version ${VERSION} -spec-file deb-docular.spec + debmaker -version ${VERSION} -spec-file deb-docular.spec -output-dir ./binaries diff --git a/bin/docular b/bin/docular new file mode 100755 index 0000000..72fcb9a Binary files /dev/null and b/bin/docular differ diff --git a/bin/os/docular b/bin/os/docular new file mode 100755 index 0000000..00a09f3 Binary files /dev/null and b/bin/os/docular differ diff --git a/binaries/docular_0.1.0_amd64.deb b/binaries/docular_0.1.0_amd64.deb index 2450290..43e039e 100644 Binary files a/binaries/docular_0.1.0_amd64.deb and b/binaries/docular_0.1.0_amd64.deb differ diff --git a/webstatic/styles/default.css b/webstatic/styles/default.css index f7dabfa..4dc36bf 100644 --- a/webstatic/styles/default.css +++ b/webstatic/styles/default.css @@ -109,37 +109,52 @@ h1 { font-family: Aleo; font-weight: bolder; text-shadow: 0 1px 0 #fff; - text-align: center; + text-align: center; + border-bottom: 2px solid #ddd; + line-height: 40px; } h2 { color: #419eda; font-family: Aleo; font-weight: bold; - text-shadow: 0 1px 0 #fff; + text-shadow: 0 1px 0 #fff; + border-bottom: 2px solid #ddd; + line-height: 40px; } h3 { color: #f04c5c; font-family: Aleo; font-weight: bold; - text-shadow: 0 1px 0 #fff; + text-shadow: 0 1px 0 #fff; } h4 { font-family: Aleo; font-weight: bold; text-shadow: 0 1px 0 #fff; - margin: 20px 0 15px 0 + margin: 20px 0 15px 0; } h5 { font-family: Aleo; font-size: bold; - margin-bottom: 2px + margin-bottom: 2px; } blockquote { - border-left: 3px solid lightgray; - color: #666; - line-height: 1.7em; - margin: 5px 40px; - padding-left: 8px; + border-left: 4px solid #e67e22; + color: rgb(0, 0, 0); + line-height: inherit; + padding: 15px 15px 15px 1rem; + border-left: 3px solid #dbdbdb; + border-left-width: 5px; + border-left-color: rgb(239, 112, 96); + background: rgb(239, 235, 233); + overflow: auto; + word-break: normal; + margin-inline-start: auto; + margin-inline-end: auto; +} +blockquote p { + margin: 0; + padding: 0; } svg { font-family: Aleo, sans-serif; @@ -167,35 +182,40 @@ b, strong { font-weight: 600; } -pre, -code { - background: rgba(0, 0, 0, 0.03); +pre,code { + color: rgb(214, 37, 37); + background: #F0F0F0; border-radius: 3px; - box-shadow: inset 0 0 8px rgba(0, 0, 0, 0.075); - color: rgba(0, 0, 0, 0.75); - display: inline-block; font-family: monospace; - font-size: 12px; + font-size: 13px; font-weight: 400; - padding: 0px 4px; - width: 100%; + word-wrap:break-word !important; /* Internet Explorer 5.5+ */ + white-space: pre-wrap !important; /* Firefox */ } pre { - background: rgba(0, 0, 0, 0.05); - border: none; - box-shadow: inset 0 0 8px rgba(0, 0, 0, 0.075); - padding: 15px; + color: #333; + width: 98%; + padding: 10px 5px 10px 10px; + margin: 15px 0; + display: block; + line-height: 20px; + background: #F0F0F0; + border-radius: 3px; + border: 1px solid #ddd; + border-left-width: 4px; + overflow-x: auto; } pre code { - background: none; + color: rgb(165, 55, 55); box-shadow: none; - padding: 2px 4px; + padding: 0px 5px 10px 0px; overflow: auto; } a { color: #419eda; } table { + width: 100%; border-spacing: 0; box-sizing: border-box; -moz-box-sizing: border-box; @@ -205,7 +225,8 @@ table thead th { text-transform: uppercase; font-size: 13px; line-height: 20px; - border-bottom: 1px solid #ddd; + border-bottom: 1px solid #ddd; + border-right: 1px solid #ddd; padding-top: 0px; padding-right: 10px; padding-bottom: 0px; @@ -214,18 +235,27 @@ table thead th { } table tbody td { line-height: 18px; - border-bottom: 1px solid #ddd; + border-bottom: 1px solid #ddd; + border-right: 1px solid #ddd; padding-top: 6px; padding-right: 10px; padding-bottom: 6px; - padding-left: 0px; + padding-left: 10px; vertical-align: text-top; } +table thead tr th { + background: #e9e9e9; + border-top: 1px solid #ddd; + line-height: 40px; + vertical-align: middle; +} + table thead td:first-child, table thead th:first-child, table tbody td:first-child, table tfoot td:first-child { - padding-left: 10px; + padding-left: 10px; + border-left: 1px solid #ddd; } table thead td:last-child, thead th:last-child,