diff --git a/.gitignore b/.gitignore index e962c8d1..37f371cb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,3 @@ /hs-toxcore /toktok-site _site - -# Local Netlify folder -.netlify diff --git a/.netlify/state.json b/.netlify/state.json new file mode 100644 index 00000000..e4cb4d77 --- /dev/null +++ b/.netlify/state.json @@ -0,0 +1,3 @@ +{ + "siteId": "8eefd413-e33c-4d4e-87b9-6f792f7b7b17" +} diff --git a/Dockerfile b/Dockerfile index f7224907..a3f594fd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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/ diff --git a/toktok/_layouts/default.html b/toktok/_layouts/default.html index e931d085..90d7059c 100644 --- a/toktok/_layouts/default.html +++ b/toktok/_layouts/default.html @@ -3,7 +3,7 @@ {% include head.html %} {% include nav.html %} -
+
{{ content }}
diff --git a/toktok/static/css/bootstrap.css b/toktok/static/css/bootstrap.css index f9ce1f99..ab3d5282 100644 --- a/toktok/static/css/bootstrap.css +++ b/toktok/static/css/bootstrap.css @@ -5,8 +5,8 @@ */ /*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */ -/*! - * I removed most of bootstrap. Ctrl+F and if you can't find it, copy it over from bootstrap.big.css +/*! + * I removed most of bootstrap. Ctrl+F and if you can't find it, copy it over from bootstrap.big.css */ html { @@ -616,8 +616,8 @@ samp { code { padding: 2px 4px; font-size: 90%; - color: #c7254e; - background-color: #f9f2f4; + color: #6e96d4; + font-weight: 700; border-radius: 4px; } kbd { diff --git a/toktok/static/css/style.css b/toktok/static/css/style.css index 4df43949..415af422 100644 --- a/toktok/static/css/style.css +++ b/toktok/static/css/style.css @@ -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; @@ -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; @@ -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 */ @@ -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; } @@ -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; } } @@ -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"), @@ -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"; diff --git a/toktok/static/fonts/Lato-Bold.ttf b/toktok/static/fonts/Lato-Bold.ttf new file mode 100644 index 00000000..74343694 Binary files /dev/null and b/toktok/static/fonts/Lato-Bold.ttf differ diff --git a/toktok/static/fonts/Lato-Bold.woff b/toktok/static/fonts/Lato-Bold.woff new file mode 100644 index 00000000..66c8242c Binary files /dev/null and b/toktok/static/fonts/Lato-Bold.woff differ diff --git a/toktok/static/fonts/Lato-Regular.ttf b/toktok/static/fonts/Lato-Regular.ttf new file mode 100644 index 00000000..04ea8efb Binary files /dev/null and b/toktok/static/fonts/Lato-Regular.ttf differ diff --git a/toktok/static/fonts/Lato-Regular.woff b/toktok/static/fonts/Lato-Regular.woff new file mode 100644 index 00000000..fe27504d Binary files /dev/null and b/toktok/static/fonts/Lato-Regular.woff differ