diff --git a/assets/css/style.scss b/assets/css/style.scss deleted file mode 100644 index 900e906..0000000 --- a/assets/css/style.scss +++ /dev/null @@ -1,304 +0,0 @@ ---- ---- - -// -// IMPORTS -// - -@import "reset"; -@import "variables"; -// Syntax highlighting @import is at the bottom of this file - -/**************/ -/* BASE RULES */ -/**************/ - -html { - font-size: 100%; -} - -body { - background: $white; - font: 18px/1.4 $helvetica; - color: $darkGray; -} - -.container { - margin: 0 auto; - max-width: 740px; - padding: 0 10px; - width: 100%; -} - -h1, h2, h3, h4, h5, h6 { - font-family: $helveticaNeue; - color: $darkerGray; - font-weight: bold; - - line-height: 1.7; - margin: 1em 0 15px; - padding: 0; - - @include mobile { - line-height: 1.4; - } -} - -h1 { - font-size: 30px; - a { - color: inherit; - } -} - -h2 { - font-size: 24px; -} - -h3 { - font-size: 20px; -} - -h4 { - font-size: 18px; - color: $gray; -} - -p { - margin: 15px 0; -} - -a { - color: $blue; - text-decoration: none; - cursor: pointer; - &:hover, &:active { - color: $blue; - } -} - -ul, ol { - margin: 15px 0; - padding-left: 30px; -} - -ul { - list-style-type: disc; -} - -ol { - list-style-type: decimal; -} - -ol ul, ul ol, ul ul, ol ol { - margin: 0; -} - -ul ul, ol ul { - list-style-type: circle; -} - -em, i { - font-style: italic; -} - -strong, b { - font-weight: bold; -} - -img { - max-width: 100%; -} - -// Fixes images in popup boxes from Google Translate -.gmnoprint img { - max-width: none; -} - -.date { - font-style: italic; - color: $gray; -} - -// Specify the color of the selection -::-moz-selection { - color: $black; - background: $lightGray; -} -::selection { - color: $black; - background: $lightGray; -} - -// Nicolas Gallagher's micro clearfix hack -// http://nicolasgallagher.com/micro-clearfix-hack/ -.clearfix:before, -.clearfix:after { - content: " "; - display: table; -} - -.clearfix:after { - clear: both; -} - -/*********************/ -/* LAYOUT / SECTIONS */ -/*********************/ - -// -// .masthead -// - -.wrapper-masthead { - margin-bottom: 50px; -} - -.masthead { - padding: 20px 0; - border-bottom: 1px solid $lightGray; - - @include mobile { - text-align: center; - } -} - -.site-avatar { - float: left; - width: 70px; - height: 70px; - margin-right: 15px; - - @include mobile { - float: none; - display: block; - margin: 0 auto; - } - - img { - border-radius: 5px; - } -} - -.site-info { - float: left; - - @include mobile { - float: none; - display: block; - margin: 0 auto; - } -} - -.site-name { - margin: 0; - color: $darkGray; - cursor: pointer; - font-family: $helveticaNeue; - font-weight: 300; - font-size: 28px; - letter-spacing: 1px; -} - -.site-description { - margin: -5px 0 0 0; - color: $gray; - font-size: 16px; - - @include mobile { - margin: 3px 0; - } -} - -nav { - float: right; - margin-top: 23px; // @TODO: Vertically middle align - font-family: $helveticaNeue; - font-size: 18px; - - @include mobile { - float: none; - margin-top: 9px; - display: block; - font-size: 16px; - } - - a { - margin-left: 20px; - color: $darkGray; - text-align: right; - font-weight: 300; - letter-spacing: 1px; - - @include mobile { - margin: 0 10px; - color: $blue; - } - } -} - -// -// .main -// - -.posts > .post { - padding-bottom: 2em; - border-bottom: 1px solid $lightGray; -} - -.posts > .post:last-child { - padding-bottom: 1em; - border-bottom: none; -} - -.post { - blockquote { - margin: 1.8em .8em; - border-left: 2px solid $gray; - padding: 0.1em 1em; - color: $gray; - font-size: 22px; - font-style: italic; - } - - .comments { - margin-top: 10px; - } - - .read-more { - text-transform: uppercase; - font-size: 15px; - } -} - -.wrapper-footer { - margin-top: 50px; - border-top: 1px solid #ddd; - border-bottom: 1px solid #ddd; - background-color: $lightGray; -} - -footer { - padding: 20px 0; - text-align: center; - font-size: 12px; -} - -table th -{ - text-align: left; - font-weight: bold; -} - -table td, -table th -{ - padding: 5px; - border: 1px solid #ccc; -} - -// Settled on moving the import of syntax highlighting to the bottom of the CSS -// ... Otherwise it really bloats up the top of the CSS file and makes it difficult to find the start -@import "highlights"; -@import "svg-icons"; -@import "datacoop"; diff --git a/content/_index.da.md b/content/_index.da.md index ca72c09..5884004 100644 --- a/content/_index.da.md +++ b/content/_index.da.md @@ -2,4 +2,23 @@ title: "Start" --- -# Hej +## Velkommen til data.coop + +Vi er en forening som har formålet, at passe på medlemmernes data. Vores kerneprincipper er + +- Privatlivsbeskyttelse +- Kryptering +- Decentralisering +- Zero-knowledge + +Ud fra de kerneprincipper vil vi med tiden udbyde onlinetjenester til medlemmerne. Hovedtanken er, +at vi som udgangspunkt stoler mere på hinanden end på "de store" som f.eks. Google, Microsoft eller Facebook. + +Foreningen holdt stiftende generalforsamling i 2014 og blev genstartet i 2016. +Foreningen arbejder nu på, at få gang i aktiviteterne. Inden længe vil du her på siden kunne læse om, +hvad du kan få ud af et medlemsskab samt detaljer om, hvordan du kan melde dig ind og være med til at opbygge noget fedt. + +| Næste arrangement | Bliv medlem | +|---------------------------------------------------------------------------------------------------------|-----------------------------------------------------| +| Vi har umiddelbart ikke nogen arbejdsdag, men find os til næste [Cryptohagen](https://cryptohagen.dk/). | Vi har brug for medlemmer. [Læs mere her](/medlem). | + diff --git a/content/_index.en.md b/content/_index.en.md index c5961ae..b84c064 100644 --- a/content/_index.en.md +++ b/content/_index.en.md @@ -2,4 +2,22 @@ title: "Start" --- -# Start +# data.coop welcomes you! + +We are an association whose purpose is to look after the members' data. Our core principles are + +- Privacy +- Encryption +- Decentralization +- Zero-knowledge + +Based on the core principles, over time we will provide online services to members. The main idea is, +that we basically rely more on each other than on the "big ones" such as Google, Microsoft or Facebook. + +The association held a founding general meeting in 2014 and was restarted in 2016. +The association is now working to get the activities going. Soon you will be able to read about this on the site, +what you can get out of a membership as well as details on how to sign up and help build some fat. + +| Next Event | Join | +| --- | --- | +| We do not have any working day right now, but we will find ourselves at the next [Cryptohagen](https://cryptohagen.dk/). | We need members. [Read more here](/member). | diff --git a/i18n/da-DK.toml b/i18n/da-DK.toml deleted file mode 100644 index 9a68413..0000000 --- a/i18n/da-DK.toml +++ /dev/null @@ -1,3 +0,0 @@ -[home] -other = "Home" - diff --git a/i18n/da.toml b/i18n/da.toml new file mode 100644 index 0000000..ec4fdb5 --- /dev/null +++ b/i18n/da.toml @@ -0,0 +1,11 @@ +[home] +other = "Home" + +[generated_date] +other = "Generateret med Hugo d. {{ .Count }}" + +[services_status] +other = "Tjeneste Status" + +[tagline] +other = "vores data i vores hænder" diff --git a/i18n/en.toml b/i18n/en.toml new file mode 100644 index 0000000..0d4c50d --- /dev/null +++ b/i18n/en.toml @@ -0,0 +1,11 @@ +[home] +other = "Home" + +[generated_date] +other = "Generated by Hugo on {{ .Count }}" + +[services_status] +other = "Services Status" + +[tagline] +other = "our data in our hands" diff --git a/static/android-chrome-192x192.png b/static/android-chrome-192x192.png deleted file mode 100644 index 05a0ca9..0000000 Binary files a/static/android-chrome-192x192.png and /dev/null differ diff --git a/static/apple-touch-icon.png b/static/apple-touch-icon.png deleted file mode 100644 index e79b1a8..0000000 Binary files a/static/apple-touch-icon.png and /dev/null differ diff --git a/static/browserconfig.xml b/static/browserconfig.xml index b3930d0..3f5ae09 100644 --- a/static/browserconfig.xml +++ b/static/browserconfig.xml @@ -2,8 +2,8 @@ - - #da532c + + #4b3aba diff --git a/static/favicon-16x16.png b/static/favicon-16x16.png deleted file mode 100644 index 6b4ced4..0000000 Binary files a/static/favicon-16x16.png and /dev/null differ diff --git a/static/favicon-32x32.png b/static/favicon-32x32.png deleted file mode 100644 index 43455d6..0000000 Binary files a/static/favicon-32x32.png and /dev/null differ diff --git a/static/favicon.ico b/static/favicon.ico index 0688696..1a38bbf 100644 Binary files a/static/favicon.ico and b/static/favicon.ico differ diff --git a/static/mstile-150x150.png b/static/mstile-150x150.png deleted file mode 100644 index e375754..0000000 Binary files a/static/mstile-150x150.png and /dev/null differ diff --git a/static/safari-pinned-tab.svg b/static/safari-pinned-tab.svg deleted file mode 100644 index b346a8a..0000000 --- a/static/safari-pinned-tab.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - -Created by potrace 1.11, written by Peter Selinger 2001-2013 - - - - - - diff --git a/static/site.webmanifest b/static/site.webmanifest index de65106..7f4893e 100644 --- a/static/site.webmanifest +++ b/static/site.webmanifest @@ -3,17 +3,17 @@ "short_name": "", "icons": [ { - "src": "/android-chrome-192x192.png", + "src": "/static/img/android-chrome-192x192.png", "sizes": "192x192", "type": "image/png" }, { - "src": "/android-chrome-256x256.png", - "sizes": "256x256", + "src": "/static/img/android-chrome-512x512.png", + "sizes": "512x512", "type": "image/png" } ], - "theme_color": "#ffffff", - "background_color": "#ffffff", + "theme_color": "#4b3aba", + "background_color": "#4b3aba", "display": "standalone" } diff --git a/static/static/img/android-chrome-192x192.png b/static/static/img/android-chrome-192x192.png new file mode 100644 index 0000000..a5abcd2 Binary files /dev/null and b/static/static/img/android-chrome-192x192.png differ diff --git a/static/android-chrome-256x256.png b/static/static/img/android-chrome-256x256.png similarity index 100% rename from static/android-chrome-256x256.png rename to static/static/img/android-chrome-256x256.png diff --git a/static/static/img/android-chrome-512x512.png b/static/static/img/android-chrome-512x512.png new file mode 100644 index 0000000..dc366a2 Binary files /dev/null and b/static/static/img/android-chrome-512x512.png differ diff --git a/static/static/img/apple-touch-icon.png b/static/static/img/apple-touch-icon.png new file mode 100644 index 0000000..1da7065 Binary files /dev/null and b/static/static/img/apple-touch-icon.png differ diff --git a/static/static/img/favicon-16x16.png b/static/static/img/favicon-16x16.png new file mode 100644 index 0000000..b13e9bc Binary files /dev/null and b/static/static/img/favicon-16x16.png differ diff --git a/static/static/img/favicon-32x32.png b/static/static/img/favicon-32x32.png new file mode 100644 index 0000000..ecadc63 Binary files /dev/null and b/static/static/img/favicon-32x32.png differ diff --git a/static/static/img/icons/close.svg b/static/static/img/icons/close.svg new file mode 100644 index 0000000..c66da4e --- /dev/null +++ b/static/static/img/icons/close.svg @@ -0,0 +1 @@ +DataCoop_Cross_Purple \ No newline at end of file diff --git a/static/static/img/icons/expand.svg b/static/static/img/icons/expand.svg new file mode 100644 index 0000000..502f331 --- /dev/null +++ b/static/static/img/icons/expand.svg @@ -0,0 +1 @@ +DataCoop_Plus_Purple \ No newline at end of file diff --git a/static/static/img/logo.svg b/static/static/img/logo.svg new file mode 100644 index 0000000..9a31d77 --- /dev/null +++ b/static/static/img/logo.svg @@ -0,0 +1,672 @@ + + + + + + image/svg+xml + + + + + + + + + DataCoop_Logo + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/static/img/mark.svg b/static/static/img/mark.svg new file mode 100644 index 0000000..6e693d8 --- /dev/null +++ b/static/static/img/mark.svg @@ -0,0 +1,625 @@ + + + + + + image/svg+xml + + DataCoop_Mark + + + + + + + + DataCoop_Mark + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/static/img/mstile-144x144.png b/static/static/img/mstile-144x144.png new file mode 100644 index 0000000..c10bd5f Binary files /dev/null and b/static/static/img/mstile-144x144.png differ diff --git a/static/static/img/mstile-150x150.png b/static/static/img/mstile-150x150.png new file mode 100644 index 0000000..6228eaa Binary files /dev/null and b/static/static/img/mstile-150x150.png differ diff --git a/static/static/img/mstile-310x150.png b/static/static/img/mstile-310x150.png new file mode 100644 index 0000000..59b6e7f Binary files /dev/null and b/static/static/img/mstile-310x150.png differ diff --git a/static/static/img/mstile-310x310.png b/static/static/img/mstile-310x310.png new file mode 100644 index 0000000..ccdd285 Binary files /dev/null and b/static/static/img/mstile-310x310.png differ diff --git a/static/static/img/mstile-70x70.png b/static/static/img/mstile-70x70.png new file mode 100644 index 0000000..4135320 Binary files /dev/null and b/static/static/img/mstile-70x70.png differ diff --git a/static/static/img/safari-pinned-tab.svg b/static/static/img/safari-pinned-tab.svg new file mode 100644 index 0000000..885da71 --- /dev/null +++ b/static/static/img/safari-pinned-tab.svg @@ -0,0 +1,106 @@ + + + + +Created by potrace 1.11, written by Peter Selinger 2001-2013 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/themes/datacoop2020/README.md b/themes/datacoop2020/README.md deleted file mode 100644 index 043a36b..0000000 --- a/themes/datacoop2020/README.md +++ /dev/null @@ -1,174 +0,0 @@ -# Minimal Bootstrap Hugo Theme - -[![Netlify Status](https://api.netlify.com/api/v1/badges/e3929c16-50cc-4e8f-a8f2-e63acc35c83d/deploy-status)](https://app.netlify.com/sites/minimal-bootstrap-hugo-theme/deploys) - -A minimal hugo theme made with bootstrap that focuses on content readability. - -## Table of contents - -- [Demo](#demo) -- [Minimum Hugo version](#minimum-hugo-version) -- [Installation](#installation) -- [Updating](#updating) -- [Run example site](#run-example-site) -- [Configuration](#configuration) -- [Favicons](#favicons) -- [Override](#override) - - [Homepage example](#homepage-example) - - [Configure cookie consent](#configure-cookie-consent) -- [Syntax highlighting](#syntax-highlighting) -- [Shortcodes](#shortcodes) - - [`blockquote`](#blockquote) - - [`imgAbs`](#imgabs) - - [`imgRel`](#imgrel) - - [`imgProc`](#imgproc) - - [`mastodon`](#mastodon) -- [Getting help](#getting-help) -- [Stackbit Deploy](#stackbit-deploy) - -## Demo - -https://minimal-bootstrap-hugo-theme.netlify.com/ - -## Minimum Hugo version - -Hugo version `0.60.1` or higher is required. View the [Hugo releases](https://github.com/gohugoio/hugo/releases) and download the binary for your OS. - -## Installation - -From the root of your site: - -``` -git submodule add https://github.com/zwbetz-gh/minimal-bootstrap-hugo-theme.git themes/minimal-bootstrap-hugo-theme -``` - -## Updating - -From the root of your site: - -``` -git submodule update --remote --merge -``` - -## Run example site - -From the root of `themes/minimal-bootstrap-hugo-theme/exampleSite`: - -``` -hugo server --themesDir ../.. -``` - -## Configuration - -Copy the `config.toml` from the [`exampleSite`](https://github.com/zwbetz-gh/minimal-bootstrap-hugo-theme/tree/master/exampleSite), then edit as desired. - -## Favicons - -Upload your image to [RealFaviconGenerator](https://realfavicongenerator.net/) then copy-paste the generated favicon files under `static`. - -## Override - -### Homepage example - -As an example, let's say you didn't like the default homepage, and wanted to design one of your own. To do this, you would: - -1. Copy file `YOUR_SITE/themes/minimal-bootstrap-hugo-theme/layouts/index.html` -1. Paste that file to `YOUR_SITE/layouts/index.html` -1. Edit `index.html` as desired - -### Configure cookie consent - -You can change the position, layout, color palette, "Learn more" link, compliance type, and custom text of the cookie consent popup. To do this, you would: - -1. Copy file `YOUR_SITE/themes/minimal-bootstrap-hugo-theme/layouts/partials/cookie-consent.html` -1. Paste that file to `YOUR_SITE/layouts/partials/cookie-consent.html` -1. Complete the [cookie consent wizard](https://cookieconsent.insites.com/download/) -1. Paste the generated code from the wizard into `cookie-consent.html` - -## Syntax highlighting - -Hugo has built-in syntax highlighting, provided by Chroma. It is currently enabled in the `config.toml` file from the [`exampleSite`](https://github.com/zwbetz-gh/minimal-bootstrap-hugo-theme/tree/master/exampleSite). - -Checkout the [Chroma style gallery](https://xyproto.github.io/splash/docs/all.html) and choose the style you like. - -## Shortcodes - -### `blockquote` - -This will format your blockquotes nicely. To use it, put the quote within the shortcode. The `author` argument is optional. - -``` -{{< blockquote author="Laura Ingalls" >}} -I am beginning to learn that it is the sweet, **simple** things of life which are the real ones after all. -{{< /blockquote >}} -``` - -### `imgAbs` - -This will insert an image into your content by absolute path. To use it, pass the `pathURL` of your image. - -These arguments are optional: `alt`, `class`, `style`. - -``` -{{< imgAbs -pathURL="img/some-img.png" -alt="Some description" -class="some-class" -style="some-style" >}} -``` - -### `imgRel` - -This will insert an image into your content by relative path. To use it, pass the `pathURL` of your image. - -These arguments are optional: `alt`, `class`, `style`. - -``` -{{< imgRel -pathURL="img/some-img.png" -alt="Some description" -class="some-class" -style="some-style" >}} -``` - -### `imgProc` - -This will process an image from a [page bundle](https://gohugo.io/content-management/page-bundles/), then provide a link to the original image. To use it, pass the image name, command, and command options. - -The `command` argument will be one of: `Resize`, `Fit`, `Fill`. For a deeper dive see the [hugo docs for image processing](https://gohugo.io/content-management/image-processing/). - -These arguments are optional: `alt`, `class`, `style`. - -The below example resizes an image to 800px width, while keeping the aspect ratio. - -``` -{{< imgProc -img="some-img.png" -command="Resize" -options="800x" -alt="Some description" -class="some-class" -style="some-style" >}} -``` - -### `mastodon` - -This will embed a toot in an `iframe`. - -These arguments are optional: `width`, `height`. - -``` -{{% mastodon -status="https://mastodon.social/@kevingimbel/100700713283716694" -width="1000" height="500" %}} -``` - -## Getting help - -If you run into an issue that isn't answered by this documentation or the [`exampleSite`](https://github.com/zwbetz-gh/minimal-bootstrap-hugo-theme/tree/master/exampleSite), then visit the [Hugo forum](https://discourse.gohugo.io/). The folks there are helpful and friendly. **Before** asking your question, be sure to read the [requesting help guidelines](https://discourse.gohugo.io/t/requesting-help/9132). Feel free to tag me in your question, my forum username is [@zwbetz](https://discourse.gohugo.io/u/zwbetz/summary). - -## Stackbit Deploy - -This theme is ready to import into Stackbit. This theme can be deployed to Netlify and you can connect any headless CMS including Forestry, NetlifyCMS, DatoCMS, or Contentful. - -[![Create with Stackbit](https://assets.stackbit.com/badge/create-with-stackbit.svg)](https://app.stackbit.com/create?theme=https://github.com/zwbetz-gh/minimal-bootstrap-hugo-theme) diff --git a/themes/datacoop2020/assets/static/css/style.scss b/themes/datacoop2020/assets/static/css/style.scss index 201b565..270ed35 100644 --- a/themes/datacoop2020/assets/static/css/style.scss +++ b/themes/datacoop2020/assets/static/css/style.scss @@ -39,66 +39,175 @@ $font-family-base: "Space Grotesk"; $font-family-monospace: "Space Mono"; $datacoop-purple: #4B3ABA; -$data-coop-light-blue: #A8F3F4; -$data-coop-curry: #BA8D21; -$data-coop-grey: #BCB8B3; +$datacoop-light-blue: #A8F3F4; +$datacoop-curry: #BA8D21; +$datacoop-grey: #BCB8B3; -$fair-light-bluegreen: rgb(226, 243, 245); -$fair-light-green: rgb(165, 206, 190); -$fair-light-red: rgb(253, 210, 188); -$fair-light-yellow: rgb(255, 249, 184); -$fair-light-blue: rgb(181, 201, 232); + +$datacoop-curry-light: lighten($datacoop-curry, 12%); +$datacoop-curry-lighter: lighten($datacoop-curry, 38%); + +$datacoop-grey: #BCB8B3; $primary: $datacoop-purple; -$secondary: $data-coop-light-blue; +$secondary: $datacoop-light-blue; $success: $datacoop-purple; -$info: $data-coop-grey; -$warning: $data-coop-curry; -$danger: $data-coop-curry; - +$info: $datacoop-grey; +$warning: $datacoop-curry; +$danger: $datacoop-curry; +$body-color: $datacoop-purple; @import "bootstrap/bootstrap"; +html +{ + height: 100%; +} + body { min-width: 300px; + padding: 0; + height: 100%; } -.custom-navbar { - margin-bottom: 1em; - height: 60px; -} +.everything-container { + height: 100%; + max-width: 1200px; + padding: 0; // Overwrites .container-fluid + margin: 0; // Overwrites .container-fluid -.custom-navbar a { - display: inline-block; - padding: 18px 0; - margin-right: 1em; - font-weight: bold; -} - -.custom-navbar a:hover, -.custom-navbar a:focus { - text-decoration: none; -} - -@media print { - .custom-navbar { - display: none; + > .row + { + max-width: 1200px; + margin: 0; // Overwrites .row + height: 100%; } + +} + +.datacoop-sidebar { + background-color: $datacoop-light-blue; +} + +.datacoop-navbar { + + background-color: $datacoop-light-blue; + color: $datacoop-purple; + height: 100%; + padding: 40px; + + a { + color: $datacoop-purple; + } + + .datacoop-menulists + { + position: absolute; + bottom: 20px; + } + + .data-coop-sidebar-logo + { + display: block; + width: 100%; + img { + display: block; + width: 100%; + } + font-size: 20px; + } + + ul + { + list-style-type: none; + padding: 0; + margin: 0; + } + + + ul > li + { + list-style-type: none; + display: block; + } + + ul > li > a + { + font-size: 40px; + } + + ul.datacoop-langchooser + { + margin-top: 20px; + li { + display: inline-block; + margin-right: 20px; + a { + font-size: 18px; + text-transform: uppercase; + } + } + } + + margin-bottom: 1em; +} + +.datacoop-sidebar-gutter +{ + writing-mode: vertical-lr; + transform: rotate(180deg); + max-width: auto !important; // overwrites col-md + flex: 0 0 0; // overwrites col-md + width: auto; + padding: 20px 10px; + background-color: $datacoop-curry-lighter; + color: $datacoop-purple; + font-family: $font-family-monospace; + font-size: 12px; + +} + +.datacoop-sidebar-gutter-right +{ + writing-mode: horizontal-lr; + transform: rotate(0); + + padding: 0; + min-width: 33px; + + .sidebar-rotated + { + transform: rotate(180deg); + writing-mode: vertical-lr; + width: 500px; + font-size: 16px; + white-space: nowrap; + img { + width: 100%; + background-color: $datacoop-light-blue; + } + } + +} + + +.datacoop-container-content +{ + padding: 30px 50px; } article { - padding-bottom: 1em; + padding: 1em 0; } img { max-width: 100%; } - pre { display: block; padding: 9.5px; @@ -136,4 +245,9 @@ blockquote, border-left: 5px solid #6c757d; } +h1, h2, h3, h4 +{ + text-align: center; + font-weight: bold; +} diff --git a/themes/datacoop2020/gh-md-toc b/themes/datacoop2020/gh-md-toc deleted file mode 100755 index 3bfe3e4..0000000 --- a/themes/datacoop2020/gh-md-toc +++ /dev/null @@ -1,256 +0,0 @@ -#!/usr/bin/env bash - -# -# Steps: -# -# 1. Download corresponding html file for some README.md: -# curl -s $1 -# -# 2. Discard rows where no substring 'user-content-' (github's markup): -# awk '/user-content-/ { ... -# -# 3.1 Get last number in each row like ' ... sitemap.js.*<\/h/)+2, RLENGTH-5) -# -# 5. Find anchor and insert it inside "(...)": -# substr($0, match($0, "href=\"[^\"]+?\" ")+6, RLENGTH-8) -# - -gh_toc_version="0.5.0" - -gh_user_agent="gh-md-toc v$gh_toc_version" - -# -# Download rendered into html README.md by its url. -# -# -gh_toc_load() { - local gh_url=$1 - - if type curl &>/dev/null; then - curl --user-agent "$gh_user_agent" -s "$gh_url" - elif type wget &>/dev/null; then - wget --user-agent="$gh_user_agent" -qO- "$gh_url" - else - echo "Please, install 'curl' or 'wget' and try again." - exit 1 - fi -} - -# -# Converts local md file into html by GitHub -# -# ➥ curl -X POST --data '{"text": "Hello world github/linguist#1 **cool**, and #1!"}' https://api.github.com/markdown -#

Hello world github/linguist#1 cool, and #1!

'" -gh_toc_md2html() { - local gh_file_md=$1 - URL=https://api.github.com/markdown/raw - TOKEN="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/token.txt" - if [ -f "$TOKEN" ]; then - URL="$URL?access_token=$(cat $TOKEN)" - fi - OUTPUT="$(curl -s --user-agent "$gh_user_agent" \ - --data-binary @"$gh_file_md" -H "Content-Type:text/plain" \ - $URL)" - - if [ "$?" != "0" ]; then - echo "XXNetworkErrorXX" - fi - if [ "$(echo "${OUTPUT}" | awk '/API rate limit exceeded/')" != "" ]; then - echo "XXRateLimitXX" - else - echo "${OUTPUT}" - fi -} - - -# -# Is passed string url -# -gh_is_url() { - case $1 in - https* | http*) - echo "yes";; - *) - echo "no";; - esac -} - -# -# TOC generator -# -gh_toc(){ - local gh_src=$1 - local gh_src_copy=$1 - local gh_ttl_docs=$2 - local need_replace=$3 - - if [ "$gh_src" = "" ]; then - echo "Please, enter URL or local path for a README.md" - exit 1 - fi - - - # Show "TOC" string only if working with one document - if [ "$gh_ttl_docs" = "1" ]; then - - echo "Table of Contents" - echo "=================" - echo "" - gh_src_copy="" - - fi - - if [ "$(gh_is_url "$gh_src")" == "yes" ]; then - gh_toc_load "$gh_src" | gh_toc_grab "$gh_src_copy" - if [ "${PIPESTATUS[0]}" != "0" ]; then - echo "Could not load remote document." - echo "Please check your url or network connectivity" - exit 1 - fi - if [ "$need_replace" = "yes" ]; then - echo - echo "!! '$gh_src' is not a local file" - echo "!! Can't insert the TOC into it." - echo - fi - else - local rawhtml=$(gh_toc_md2html "$gh_src") - if [ "$rawhtml" == "XXNetworkErrorXX" ]; then - echo "Parsing local markdown file requires access to github API" - echo "Please make sure curl is installed and check your network connectivity" - exit 1 - fi - if [ "$rawhtml" == "XXRateLimitXX" ]; then - echo "Parsing local markdown file requires access to github API" - echo "Error: You exceeded the hourly limit. See: https://developer.github.com/v3/#rate-limiting" - TOKEN="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/token.txt" - echo "or place github auth token here: $TOKEN" - exit 1 - fi - local toc=`echo "$rawhtml" | gh_toc_grab "$gh_src_copy"` - echo "$toc" - if [ "$need_replace" = "yes" ]; then - local ts="<\!--ts-->" - local te="<\!--te-->" - local dt=`date +'%F_%H%M%S'` - local ext=".orig.${dt}" - local toc_path="${gh_src}.toc.${dt}" - local toc_footer="" - # http://fahdshariff.blogspot.ru/2012/12/sed-mutli-line-replacement-between-two.html - # clear old TOC - sed -i${ext} "/${ts}/,/${te}/{//!d;}" "$gh_src" - # create toc file - echo "${toc}" > "${toc_path}" - echo -e "\n${toc_footer}\n" >> "$toc_path" - # insert toc file - if [[ "`uname`" == "Darwin" ]]; then - sed -i "" "/${ts}/r ${toc_path}" "$gh_src" - else - sed -i "/${ts}/r ${toc_path}" "$gh_src" - fi - echo - echo "!! TOC was added into: '$gh_src'" - echo "!! Origin version of the file: '${gh_src}${ext}'" - echo "!! TOC added into a separate file: '${toc_path}'" - echo - fi - fi -} - -# -# Grabber of the TOC from rendered html -# -# $1 — a source url of document. -# It's need if TOC is generated for multiple documents. -# -gh_toc_grab() { - # if closed is on the new line, then move it on the prev line - # for example: - # was: The command foo1 - # - # became: The command foo1 - sed -e ':a' -e 'N' -e '$!ba' -e 's/\n<\/h/<\/h/g' | - # find strings that corresponds to template - grep -E -o '//' | sed 's/<\/code>//' | - # now all rows are like: - # ... .*<\/h/)+2, RLENGTH-5)"](" gh_url substr($0, match($0, "href=\"[^\"]+?\" ")+6, RLENGTH-8) ")"}' | sed 'y/+/ /; s/%/\\x/g')" -} - -# -# Returns filename only from full path or url -# -gh_toc_get_filename() { - echo "${1##*/}" -} - -# -# Options hendlers -# -gh_toc_app() { - local app_name=$(basename $0) - local need_replace="no" - - if [ "$1" = '--help' ] || [ $# -eq 0 ] ; then - echo "GitHub TOC generator ($app_name): $gh_toc_version" - echo "" - echo "Usage:" - echo " $app_name [--insert] src [src] Create TOC for a README file (url or local path)" - echo " $app_name - Create TOC for markdown from STDIN" - echo " $app_name --help Show help" - echo " $app_name --version Show version" - return - fi - - if [ "$1" = '--version' ]; then - echo "$gh_toc_version" - return - fi - - if [ "$1" = "-" ]; then - if [ -z "$TMPDIR" ]; then - TMPDIR="/tmp" - elif [ -n "$TMPDIR" -a ! -d "$TMPDIR" ]; then - mkdir -p "$TMPDIR" - fi - local gh_tmp_md - gh_tmp_md=$(mktemp $TMPDIR/tmp.XXXXXX) - while read input; do - echo "$input" >> "$gh_tmp_md" - done - gh_toc_md2html "$gh_tmp_md" | gh_toc_grab "" - return - fi - - if [ "$1" = '--insert' ]; then - need_replace="yes" - shift - fi - - for md in "$@" - do - echo "" - gh_toc "$md" "$#" "$need_replace" - done - - echo "" - echo "Created by [gh-md-toc](https://github.com/ekalinin/github-markdown-toc)" -} - -# -# Entry point -# -gh_toc_app "$@" \ No newline at end of file diff --git a/themes/datacoop2020/layouts/_default/baseof.html b/themes/datacoop2020/layouts/_default/baseof.html index 98fa79e..5f3e284 100644 --- a/themes/datacoop2020/layouts/_default/baseof.html +++ b/themes/datacoop2020/layouts/_default/baseof.html @@ -4,23 +4,53 @@ {{ partial "head.html" . }} - {{ partial "nav.html" . }} - -
-
- {{ block "main" . }}{{ end }} -
+ +
+ +
+ +
+
+ {{ partial "nav.html" . }} +
+
+ +
+
+ {{ with (now) | printf "%s" }} + {{ i18n "generated_date" . }} + {{ end }} +
+
+ +
+
+
+ {{ block "main" . }}{{ end }} +
+
+
+ +
+ +
+ + + open + {{ i18n "services_status" }} + + +
+
+
- {{ partial "bootstrap-js.html" . }} - {{ partial "mastodon-js.html" . }} +
+ +{{ partial "mastodon-js.html" . }} - +{{ partial "bootstrap-js.html" . }} diff --git a/themes/datacoop2020/layouts/partials/head.html b/themes/datacoop2020/layouts/partials/head.html index 104f978..3718c3e 100644 --- a/themes/datacoop2020/layouts/partials/head.html +++ b/themes/datacoop2020/layouts/partials/head.html @@ -8,26 +8,13 @@ {{ end }} - {{ $appleTouchIcon := "apple-touch-icon.png" }} - - - {{ $favicon32x32 := "favicon-32x32.png" }} - - - {{ $favicon16x16 := "favicon-16x16.png" }} - - - {{ $siteWebmanifest := "site.webmanifest" }} - - - - - {{ $safariPinnedTab := "safari-pinned-tab.svg" }} - - - - - + + + + + + + {{ $style := resources.Get "static/css/style.scss" | resources.ToCSS | resources.Minify }} diff --git a/themes/datacoop2020/layouts/partials/nav.html b/themes/datacoop2020/layouts/partials/nav.html index 6a8c4a6..a93322c 100644 --- a/themes/datacoop2020/layouts/partials/nav.html +++ b/themes/datacoop2020/layouts/partials/nav.html @@ -1,7 +1,23 @@ -