diff --git a/.gitignore b/.gitignore index bb836e13..c13ad8d8 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ font/.fontcustom-manifest.json assets/webfonts/ptio-font-preview.html vendor .bundle +node_modules diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 84b650d2..00000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "assets/fonts/fa-webfonts"] - path = assets/fonts/fa-webfonts - url = git@github.com:jonaharagon/fa-webfonts.git diff --git a/.npmrc b/.npmrc new file mode 100644 index 00000000..52d5ff04 --- /dev/null +++ b/.npmrc @@ -0,0 +1,2 @@ +@fortawesome:registry=https://npm.fontawesome.com/ +//npm.fontawesome.com/:_authToken=${FONTAWESOME_NPM_AUTH_TOKEN} diff --git a/Gemfile b/Gemfile index 2bf1ac75..005148a3 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ source "https://rubygems.org" # # This will help ensure the proper Jekyll version is running. # Happy Jekylling! -gem "jekyll", "~> 3.8.5" +gem "jekyll", "~> 3.9.0" # This is the default theme for new Jekyll sites. You may change this to anything you like. gem "minima", "~> 2.0" @@ -22,9 +22,11 @@ group :jekyll_plugins do gem "jekyll-feed", "~> 0.6" end +# Jekyll 3.9.0 now requires this explicitly installs, apparently +gem "kramdown-parser-gfm", "~> 1.1.0" + # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby] # Performance-booster for watching directories on Windows gem "wdm", "~> 0.1.0" if Gem.win_platform? - diff --git a/Gemfile.lock b/Gemfile.lock index 883fdc40..9895f4b4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,59 +1,61 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.6.0) - public_suffix (>= 2.0.2, < 4.0) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) colorator (1.1.0) - concurrent-ruby (1.1.5) - em-websocket (0.5.1) + concurrent-ruby (1.1.7) + em-websocket (0.5.2) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) eventmachine (1.2.7) - ffi (1.10.0) + ffi (1.14.2) forwardable-extended (2.6.0) http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.8.5) + jekyll (3.9.0) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) i18n (~> 0.7) jekyll-sass-converter (~> 1.0) jekyll-watch (~> 2.0) - kramdown (~> 1.14) + kramdown (>= 1.17, < 3) liquid (~> 4.0) mercenary (~> 0.3.3) pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-feed (0.12.1) + jekyll-feed (0.15.1) jekyll (>= 3.7, < 5.0) jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-seo-tag (2.6.0) - jekyll (~> 3.3) + jekyll-seo-tag (2.7.1) + jekyll (>= 3.8, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - kramdown (1.17.0) + kramdown (2.3.0) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) liquid (4.0.3) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) + listen (3.4.1) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) - minima (2.5.0) - jekyll (~> 3.5) + minima (2.5.1) + jekyll (>= 3.5, < 5.0) jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (3.0.3) - rb-fsevent (0.10.3) - rb-inotify (0.10.0) + public_suffix (4.0.6) + rb-fsevent (0.10.4) + rb-inotify (0.10.1) ffi (~> 1.0) - rouge (3.3.0) - ruby_dep (1.5.0) + rexml (3.2.4) + rouge (3.26.0) safe_yaml (1.0.5) sass (3.7.4) sass-listen (~> 4.0.0) @@ -65,8 +67,9 @@ PLATFORMS ruby DEPENDENCIES - jekyll (~> 3.8.5) + jekyll (~> 3.9.0) jekyll-feed (~> 0.6) + kramdown-parser-gfm (~> 1.1.0) minima (~> 2.0) tzinfo-data diff --git a/_config.yml b/_config.yml index 710d4b84..f7348b75 100644 --- a/_config.yml +++ b/_config.yml @@ -22,36 +22,36 @@ description: >- # this means to ignore newlines until "baseurl:" baseurl: "" # the subpath of your site, e.g. /blog url: "https://www.privacyguides.org" # the base hostname & protocol for your site, e.g. http://example.com sass: - sass_dir: _sass + sass_dir: ./_sass excerpt_separator: collections_dir: collections collections: posts: - permalink: /blog/:year/:month/:day/:title + permalink: /blog/:year/:month/:day/:title/ evergreen: output: true - permalink: /:name + permalink: /:name/ authors: - permalink: /blog/authors/:name + permalink: /blog/authors/:name/ devices: output: true - permalink: /devices/:name + permalink: /devices/:name/ sort_by: order browsers: output: true - permalink: /browsers/:name + permalink: /browsers/:name/ sort_by: order software: output: true - permalink: /software/:name + permalink: /software/:name/ sort_by: order os: output: true - permalink: /os/:name + permalink: /os/:name/ sort_by: order providers: output: true - permalink: /providers/:name + permalink: /providers/:name/ sort_by: order defaults: @@ -82,7 +82,6 @@ defaults: layout: recommendation # Build settings -markdown: kramdown plugins: - jekyll-feed exclude: [privacytools.io/] diff --git a/_includes/head.html b/_includes/head.html index 9f78819a..0abb8de9 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -35,6 +35,6 @@ - + diff --git a/_sass/bootstrap b/_sass/bootstrap new file mode 120000 index 00000000..4d9c69e9 --- /dev/null +++ b/_sass/bootstrap @@ -0,0 +1 @@ +../node_modules/bootstrap/scss \ No newline at end of file diff --git a/_sass/bootstrap.scss b/_sass/bootstrap.scss deleted file mode 100755 index 077d186c..00000000 --- a/_sass/bootstrap.scss +++ /dev/null @@ -1,44 +0,0 @@ -/*! - * Bootstrap v4.3.1 (https://getbootstrap.com/) - * Copyright 2011-2019 The Bootstrap Authors - * Copyright 2011-2019 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - */ - -@import "bootstrap/functions"; -@import "bootstrap/variables"; -@import "bootstrap/mixins"; -@import "bootstrap/root"; -@import "bootstrap/reboot"; -@import "bootstrap/type"; -@import "bootstrap/images"; -@import "bootstrap/code"; -@import "bootstrap/grid"; -@import "bootstrap/tables"; -@import "bootstrap/forms"; -@import "bootstrap/buttons"; -@import "bootstrap/transitions"; -@import "bootstrap/dropdown"; -@import "bootstrap/button-group"; -@import "bootstrap/input-group"; -@import "bootstrap/custom-forms"; -@import "bootstrap/nav"; -@import "bootstrap/navbar"; -@import "bootstrap/card"; -@import "bootstrap/breadcrumb"; -@import "bootstrap/pagination"; -@import "bootstrap/badge"; -@import "bootstrap/jumbotron"; -@import "bootstrap/alert"; -@import "bootstrap/progress"; -@import "bootstrap/media"; -@import "bootstrap/list-group"; -@import "bootstrap/close"; -@import "bootstrap/toasts"; -@import "bootstrap/modal"; -@import "bootstrap/tooltip"; -@import "bootstrap/popover"; -@import "bootstrap/carousel"; -@import "bootstrap/spinners"; -@import "bootstrap/utilities"; -@import "bootstrap/print"; diff --git a/_sass/bootstrap/_alert.scss b/_sass/bootstrap/_alert.scss deleted file mode 100644 index da2a98af..00000000 --- a/_sass/bootstrap/_alert.scss +++ /dev/null @@ -1,51 +0,0 @@ -// -// Base styles -// - -.alert { - position: relative; - padding: $alert-padding-y $alert-padding-x; - margin-bottom: $alert-margin-bottom; - border: $alert-border-width solid transparent; - @include border-radius($alert-border-radius); -} - -// Headings for larger alerts -.alert-heading { - // Specified to prevent conflicts of changing $headings-color - color: inherit; -} - -// Provide class for links that match alerts -.alert-link { - font-weight: $alert-link-font-weight; -} - - -// Dismissible alerts -// -// Expand the right padding and account for the close button's positioning. - -.alert-dismissible { - padding-right: $close-font-size + $alert-padding-x * 2; - - // Adjust close link position - .close { - position: absolute; - top: 0; - right: 0; - padding: $alert-padding-y $alert-padding-x; - color: inherit; - } -} - - -// Alternate styles -// -// Generate contextual modifier classes for colorizing the alert. - -@each $color, $value in $theme-colors { - .alert-#{$color} { - @include alert-variant(theme-color-level($color, $alert-bg-level), theme-color-level($color, $alert-border-level), theme-color-level($color, $alert-color-level)); - } -} diff --git a/_sass/bootstrap/_badge.scss b/_sass/bootstrap/_badge.scss deleted file mode 100644 index 42c5d08d..00000000 --- a/_sass/bootstrap/_badge.scss +++ /dev/null @@ -1,54 +0,0 @@ -// Base class -// -// Requires one of the contextual, color modifier classes for `color` and -// `background-color`. - -.badge { - display: inline-block; - padding: $badge-padding-y $badge-padding-x; - @include font-size($badge-font-size); - font-weight: $badge-font-weight; - line-height: 1; - text-align: center; - white-space: nowrap; - vertical-align: baseline; - @include border-radius($badge-border-radius); - @include transition($badge-transition); - - @at-root a#{&} { - @include hover-focus() { - text-decoration: none; - } - } - - // Empty badges collapse automatically - &:empty { - display: none; - } -} - -// Quick fix for badges in buttons -.btn .badge { - position: relative; - top: -1px; -} - -// Pill badges -// -// Make them extra rounded with a modifier to replace v3's badges. - -.badge-pill { - padding-right: $badge-pill-padding-x; - padding-left: $badge-pill-padding-x; - @include border-radius($badge-pill-border-radius); -} - -// Colors -// -// Contextual variations (linked badges get darker on :hover). - -@each $color, $value in $theme-colors { - .badge-#{$color} { - @include badge-variant($value); - } -} diff --git a/_sass/bootstrap/_breadcrumb.scss b/_sass/bootstrap/_breadcrumb.scss deleted file mode 100644 index d748894f..00000000 --- a/_sass/bootstrap/_breadcrumb.scss +++ /dev/null @@ -1,42 +0,0 @@ -.breadcrumb { - display: flex; - flex-wrap: wrap; - padding: $breadcrumb-padding-y $breadcrumb-padding-x; - margin-bottom: $breadcrumb-margin-bottom; - @include font-size($breadcrumb-font-size); - list-style: none; - background-color: $breadcrumb-bg; - @include border-radius($breadcrumb-border-radius); -} - -.breadcrumb-item { - // The separator between breadcrumbs (by default, a forward-slash: "/") - + .breadcrumb-item { - padding-left: $breadcrumb-item-padding; - - &::before { - display: inline-block; // Suppress underlining of the separator in modern browsers - padding-right: $breadcrumb-item-padding; - color: $breadcrumb-divider-color; - content: escape-svg($breadcrumb-divider); - } - } - - // IE9-11 hack to properly handle hyperlink underlines for breadcrumbs built - // without `