Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

services/pkg/man-cgi: update navbar, styles, fix gz bugs #190

Closed
wants to merge 1 commit into from
Closed

services/pkg/man-cgi: update navbar, styles, fix gz bugs #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion services/pkg/man-cgi/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/void-linux/infra-nginx:20221230RC01
FROM ghcr.io/void-linux/infra-nginx:20230812

RUN xbps-install -Suy xbps && xbps-install -y void-man-cgi fcgiwrap spawn-fcgi && \
rm -rf /var/cache/xbps && \
Expand All @@ -13,8 +13,10 @@ RUN xbps-install -Suy xbps && xbps-install -y void-man-cgi fcgiwrap spawn-fcgi &
COPY run.fcgi /etc/runit/runsvdir/container/fcgi/run
COPY nginx.conf /etc/nginx/sites.d/00-default.conf
COPY manpath.conf /var/lib/man-cgi/manpath.conf
COPY head.html /var/lib/man-cgi/head.html
COPY header.html /var/lib/man-cgi/header.html
COPY footer.html /var/lib/man-cgi/footer.html
COPY void.css /var/lib/man-cgi/void.css

ENTRYPOINT ["/usr/bin/tini", "--"]
CMD ["/usr/bin/runsvdir", "/etc/runit/runsvdir/container"]
5 changes: 5 additions & 0 deletions services/pkg/man-cgi/head.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<link rel="stylesheet" href="/void.css" type="text/css" media="all">
<meta property="og:title" content="Void Linux manpages">
<meta property="og:site_name" content="Void Linux">
<meta name="theme-color" content="#478061">
<link rel="icon" type="image/png" href="https://voidlinux.org/assets/img/favicon.png" />
38 changes: 25 additions & 13 deletions services/pkg/man-cgi/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,25 @@
<nav id="void-nav" class="noprint">
<div class="wrap">
<ul>
<li><a href="http://www.voidlinux.org">Home</a></li>
<li><a href="http://www.voidlinux.org/news/">News</a></li>
<li><a href="http://www.voidlinux.org/download/">Download</a></li>
<li><a href="http://www.voidlinux.org/packages/">Packages</a></li>
<li><a href="https://docs.voidlinux.org">Documentation</a></li>
<li><a href="https://reddit.com/r/voidlinux">Forum</a></li>
<li><a href="https://github.com/void-linux">GitHub</a></li>
</ul>
</div>
</nav>
<header class="navbar">
<div class="container">
<div class="menu-spacer"></div>
<input type="checkbox" id="menu-toggle-cb">
<label id="menu-toggle" for="menu-toggle-cb" aria-label="Toggle Navigation" onclick>
<s class="bar"></s><s class="bar"></s><s class="bar"></s>
</label>
<div class="menu-wrapper">
<nav class="menu-left">
<div><a href="https://voidlinux.org/">Home</a></div>
<div><a href="https://voidlinux.org/news/">News</a></div>
<div><a href="https://voidlinux.org/acknowledgments/">Acknowledgments</a></div>
<div><a href="https://voidlinux.org/download/">Download</a></div>
<div><a href="https://voidlinux.org/packages/">Packages</a></div>
</nav>
<nav class="menu-right">
<div><a href="https://docs.voidlinux.org/">Documentation</a></div>
<div><a href="https://man.voidlinux.org/">Manual Pages</a></div>
<div><a href="https://xmirror.voidlinux.org/">Mirrors</a></div>
<div><a href="https://github.com/void-linux">GitHub</a></div>
</nav>
</div>
</div>
</header>
<div class="container">
8 changes: 5 additions & 3 deletions services/pkg/man-cgi/nginx.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
server {
server_name man-cgi;
listen 0.0.0.0:80 default_server;
add_header Content-Security-Policy "default-src 'none'; style-src 'self' voidlinux.org *.voidlinux.org 'unsafe-inline'; img-src 'self' voidlinux.org *.voidlinux.org; font-src 'self' voidlinux.org *.voidlinux.org fonts.gstatic.com;" always;

location / {
fastcgi_split_path_info ^(/)(.*)$;

fastcgi_hide_header Content-Security-Policy;

fastcgi_param QUERY_STRING $query_string;
fastcgi_param REQUEST_METHOD $request_method;
fastcgi_param PATH_INFO $fastcgi_path_info;
Expand All @@ -17,8 +20,7 @@ server {
alias /usr/share/examples/void-man-cgi/mandoc.css;
}

# workaround .gz being added to links
location ~* (.*)\.gz$ {
return 301 $1;
location /void.css {
alias /var/lib/man-cgi/void.css;
}
}
310 changes: 310 additions & 0 deletions services/pkg/man-cgi/void.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,310 @@
:root {
--void-green: #478061;
--void-dark-green: #62b086;
--void-light: #fafafa;
--void-dark: #252525;
}

@media (prefers-color-scheme: light) {
:root {
--bg: #ffffff;
--fg: #333;

--nav-bg: var(--void-green);
--nav-fg: var(--bg);
--nav-bg-hover: var(--bg);
--nav-fg-hover: var(--fg);

--links: var(--void-green);
--links-hover: var(--fg);

--inline-code-color: #fdf6e3;
--code-border: #ccc;

--quote-bg: #ebf4ef;
--quote-border: #d1e6da;
--quote-code-bg: var(--inline-code-color);

--table-border-color: var(--void-green);
--table-header-bg: var(--void-green);
--table-header-fg: #fff;
--table-alternate-bg: var(--void-light);

--hr-color: #888;
}
}

@media (prefers-color-scheme: dark) {
:root {
--bg: #222;
--fg: #eee;

--nav-bg: #295340;
--nav-fg: var(--fg);
--nav-bg-hover: var(--bg);
--nav-fg-hover: var(--fg);

--links: var(--void-dark-green);
--links-hover: var(--fg);

--inline-code-color: #353535;
--code-border: #111;

--quote-bg: #293d35;
--quote-border: #22362e;
--quote-code-bg: #2a2a2a;

--table-border-color: var(--void-green);
--table-header-bg: var(--void-green);
--table-header-fg: #fff;
--table-alternate-bg: #2c2c2c;

--hr-color: #888;
}
}

@font-face {
font-family: 'Ubuntu';
font-style: normal;
font-weight: 300;
src: local('Ubuntu Light'), local('Ubuntu-Light'), url(https://fonts.gstatic.com/s/ubuntu/v11/4iCv6KVjbNBYlgoC1CzjsGyI.ttf) format('truetype');
}

html {
max-width: 100%;
}

body {
color: var(--fg);
background-color: var(--bg);
margin: 0;
}

a, :link, :visited {
color: var(--links);
}

a:hover {
text-decoration: none;
color: var(--links-hover);
}

.manual-text {
max-width: 65em;
padding: 0 1em;
}

/* Hide architecture selector */
select[name="arch"] {
display: none;
}

/* navigation */
.container {
padding-left: 15px;
padding-right: 15px;
margin-left: auto;
margin-right: auto;
}

@media screen and (min-width: 768px) {
.container {
width: 750px;
}
}

@media screen and (min-width: 992px) {
.container {
width: 970px;
}
}

@media screen and (min-width: 1200px) {
.container {
width: 1170px;
}
}

@media screen and (min-width: 1400px) {
.container {
width: 1320px;
}
}

.container:before {
display: table;
content: " ";
}

.container:after {
clear: both;
}

.navbar {
font-family: 'Ubuntu', sans-serif;
font-size: 16px;
font-weight: 300;
background-color: var(--nav-bg);
color: var(--nav-fg);
border: 0;
border-radius: 0;
z-index: 1;
position: sticky;
top: 0;
min-height: 50px;
}

.navbar .container {
min-height: 50px;
}

.navbar .menu-spacer {
display: none;
min-height: 50px;
}

.menu-wrapper {
display: flex;
align-items: stretch;
justify-content: space-between;
min-height: 50px;
}

nav {
display: flex;
justify-content: space-between;
min-height: 50px;
}

nav.menu-local {
align-self: flex-start;
}

nav.menu-external {
align-self: flex-end;
}

nav div {
display: flex;
align-items: center;
}

nav div a, nav div a:link, nav div a:visited {
display: block;
text-decoration: none;
white-space: nowrap;
color: inherit;
padding: 0.5em 0.69em;
font-size: 1.1em;
}

nav div a:hover {
color: inherit;
}

nav div:hover {
background-color: var(--nav-bg-hover);
color: var(--nav-fg-hover);
}

#menu-toggle-cb {
position: absolute;
top: -9999px;
left: -9999px;
}

#menu-toggle {
cursor: pointer;
user-select: none;
width: 38px;
height: 36px;
display: block;
position: absolute;
top: 0;
right: 0;
display: none;
margin-top: 6px;
margin-right: 6px;
}

#menu-toggle .bar {
background-color: var(--nav-fg);
display: block;
width: 24px;
height: 4px;
position: absolute;
top: 16px;
right: 7px;
}

#menu-toggle .bar:first-child {
top: 8px;
}

#menu-toggle .bar:last-child {
top: 24px;
}

#menu-toggle-cb:checked ~ #menu-toggle .bar:first-child {
-webkit-transform: rotate(-45deg);
-moz-transform: rotate(-45deg);
-ms-transform: rotate(-45deg);
transform: rotate(-45deg);
}

#menu-toggle-cb:checked ~ #menu-toggle .bar:last-child {
-webkit-transform: rotate(45deg);
-moz-transform: rotate(45deg);
-ms-transform: rotate(45deg);
transform: rotate(45deg);
}

#menu-toggle-cb:checked ~ #menu-toggle .bar:nth-child(odd) {
top: 16px;
}

#menu-toggle-cb:checked ~ #menu-toggle .bar:nth-child(even) {
display: none;
}

@media (max-width: 69em) {
.menu-spacer {
display: block;
height: 50px;
}

.menu-wrapper {
margin-top: 50px;
flex-direction: column;
justify-content: center;
}

nav {
flex-direction: column;
align-self: stretch !important;
}

#menu-toggle {
display: block;
}

#menu-toggle-cb ~ .menu-wrapper {
max-height: 0;
overflow: hidden;
display: none;
}

#menu-toggle-cb:checked ~ .menu-wrapper {
max-height: 100vh;
display: flex;
}

#menu-toggle-cb ~ .menu-wrapper,
#menu-toggle-cb:checked ~ .menu-wrapper {
-webkit-transition: all 0.5s;
-moz-transition: all 0.5s;
-ms-transition: all 0.5s;
-o-transition: all 0.5s;
transition: all 0.5s;
}
}
Loading