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

refactor: Make the website a bit darker. #270

Merged
merged 1 commit into from
Feb 11, 2025
Merged

refactor: Make the website a bit darker. #270

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
3 changes: 0 additions & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
/hs-toxcore
/toktok-site
_site

# Local Netlify folder
.netlify
3 changes: 3 additions & 0 deletions .netlify/state.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"siteId": "8eefd413-e33c-4d4e-87b9-6f792f7b7b17"
}
12 changes: 6 additions & 6 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@ RUN . /path/to/venv/bin/activate \
RUN ["gem", "install", "--no-document", "guard-livereload", "mdl"]

RUN addgroup -S builder && adduser -SDH -G builder builder
USER builder

WORKDIR /home/builder/build
COPY toktok /home/builder/build/toktok/
COPY Makefile /home/builder/build/
COPY entrypoint.sh /home/builder/
COPY --chown=builder:builder Makefile /home/builder/build/
COPY --chown=builder:builder entrypoint.sh /home/builder/

RUN ["chown", "-R", "builder:builder", "/home/builder"]
USER builder
COPY --chown=builder:builder toktok/spec.md.dist /home/builder/build/toktok/
RUN ["make", "toktok/spec.md"]

RUN ["make", "hs-toxcore"]
COPY --chown=builder:builder toktok/ /home/builder/build/toktok/
RUN ["make", "toktok-site"]

COPY .md-style.rb /home/builder/build/
Expand Down
2 changes: 1 addition & 1 deletion toktok/_layouts/default.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% include head.html %}
<body>
{% include nav.html %}
<section id="content">
<section id="content" class="dark">
<div class="container-fluid limit-width lead">
{{ content }}
</div>
Expand Down
8 changes: 4 additions & 4 deletions toktok/static/css/bootstrap.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 28 additions & 9 deletions toktok/static/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* Body and core element styling */
body {
font-family: "Fira Sans", "Helvetica Neue", Helvetica, Arial, sans-serif !important;
font-family: "Lato", "Fira Sans", "Helvetica Neue", Helvetica, Arial, sans-serif !important;
font-style: normal;
text-rendering: optimizelegibility;
font-weight: 300;
Expand Down Expand Up @@ -48,8 +48,8 @@ table a:hover {
}

table th {
background-color: #eee;
border-bottom: 1px solid #ddd;
background-color: #666;
border-bottom: 1px solid #333;
padding: 8px 12px;
text-align: left;
font-weight: bold;
Expand All @@ -62,11 +62,11 @@ table td {
/*border-bottom: 1px solid #ccc;*/
}
table tr:hover td {
background-color: rgba(0, 0, 0, 0.12);
background-color: rgba(0, 0, 0, 0.3);
}

table tr:nth-child(odd) {
background-color: rgba(0,0,0,.04);
background-color: rgba(0, 0, 0, 0.15);
}

/* ID */
Expand Down Expand Up @@ -112,8 +112,8 @@ table tr:nth-child(odd) {
.pr-table .tooltiptext {
display: none;
position: absolute;
background-color: #fff;
border: 1px solid #ccc;
background-color: #333;
border: 1px solid #111;
padding: 4px 8px;
z-index: 99999;
}
Expand Down Expand Up @@ -467,7 +467,7 @@ tbody th:first-child, thead th {
display: block;
margin: auto;
/* Fixes carousel breaking at certain resolutions */
min-width: 240px;
min-width: 240px;
}
.sliderinner > ul > li > div > img { max-height: 500px; }
}
Expand Down Expand Up @@ -806,7 +806,7 @@ input[type=checkbox]:checked ~ #hamlabel:before {
white-space: pre-wrap;
}

/* woff for most browsers (not IE8) and ttf for Android older than v4.4 */
/* FiraSans woff for most browsers (not IE8) and ttf for Android older than v4.4 */
@font-face{
font-family: "Fira Sans";
src: local("Fira Sans UltraLight"),
Expand Down Expand Up @@ -834,6 +834,25 @@ input[type=checkbox]:checked ~ #hamlabel:before {
font-style: normal;
}

/* Lato */
@font-face{
font-family: "Lato";
src: local("Lato Regular"),
url("../fonts/Lato-Regular.woff") format("woff"),
url("../fonts/Lato-Regular.ttf") format("truetype");
font-weight: 400;
font-style: normal;
}

@font-face{
font-family: "Lato";
src: local("Lato Bold"),
url("../fonts/Lato-Bold.woff") format("woff"),
url("../fonts/Lato-Bold.ttf") format("truetype");
font-weight: 700;
font-style: normal;
}

/* Leaving in support for IE8 and older here since it wouldn't degrade gracefully */
@font-face {
font-family: "Glyphter";
Expand Down
Binary file added toktok/static/fonts/Lato-Bold.ttf
View file
Open in desktop
Binary file not shown.
Binary file added toktok/static/fonts/Lato-Bold.woff
View file
Open in desktop
Binary file not shown.
Binary file added toktok/static/fonts/Lato-Regular.ttf
View file
Open in desktop
Binary file not shown.
Binary file added toktok/static/fonts/Lato-Regular.woff
View file
Open in desktop
Binary file not shown.
Loading