From 6d6382c1ddd4ca3fadb8ea78e12a9a0ac83c69b4 Mon Sep 17 00:00:00 2001 From: Jonah Aragon Date: Fri, 15 Jan 2021 01:36:48 -0600 Subject: [PATCH] Use npm for bootstrap and fontawesome-pro assets --- .gitignore | 1 + .gitmodules | 3 - .npmrc | 2 + Gemfile | 6 +- Gemfile.lock | 49 +- _config.yml | 19 +- _includes/head.html | 2 +- _sass/bootstrap | 1 + _sass/bootstrap.scss | 44 - _sass/bootstrap/_alert.scss | 51 - _sass/bootstrap/_badge.scss | 54 - _sass/bootstrap/_breadcrumb.scss | 42 - _sass/bootstrap/_button-group.scss | 163 - _sass/bootstrap/_buttons.scss | 139 - _sass/bootstrap/_card.scss | 278 - _sass/bootstrap/_carousel.scss | 197 - _sass/bootstrap/_close.scss | 41 - _sass/bootstrap/_code.scss | 48 - _sass/bootstrap/_custom-forms.scss | 521 - _sass/bootstrap/_dropdown.scss | 191 - _sass/bootstrap/_forms.scss | 338 - _sass/bootstrap/_functions.scss | 134 - _sass/bootstrap/_grid.scss | 69 - _sass/bootstrap/_images.scss | 42 - _sass/bootstrap/_input-group.scss | 191 - _sass/bootstrap/_jumbotron.scss | 17 - _sass/bootstrap/_list-group.scss | 158 - _sass/bootstrap/_media.scss | 8 - _sass/bootstrap/_mixins.scss | 47 - _sass/bootstrap/_modal.scss | 239 - _sass/bootstrap/_nav.scss | 120 - _sass/bootstrap/_navbar.scss | 324 - _sass/bootstrap/_pagination.scss | 73 - _sass/bootstrap/_popover.scss | 170 - _sass/bootstrap/_print.scss | 141 - _sass/bootstrap/_progress.scss | 46 - _sass/bootstrap/_reboot.scss | 482 - _sass/bootstrap/_root.scss | 20 - _sass/bootstrap/_spinners.scss | 55 - _sass/bootstrap/_tables.scss | 185 - _sass/bootstrap/_toasts.scss | 44 - _sass/bootstrap/_tooltip.scss | 115 - _sass/bootstrap/_transitions.scss | 20 - _sass/bootstrap/_type.scss | 125 - _sass/bootstrap/_utilities.scss | 17 - _sass/bootstrap/_variables.scss | 1143 -- _sass/bootstrap/bootstrap-grid.scss | 29 - _sass/bootstrap/bootstrap-reboot.scss | 12 - _sass/bootstrap/mixins/_alert.scss | 13 - .../bootstrap/mixins/_background-variant.scss | 22 - _sass/bootstrap/mixins/_badge.scss | 17 - _sass/bootstrap/mixins/_border-radius.scss | 63 - _sass/bootstrap/mixins/_box-shadow.scss | 20 - _sass/bootstrap/mixins/_breakpoints.scss | 123 - _sass/bootstrap/mixins/_buttons.scss | 110 - _sass/bootstrap/mixins/_caret.scss | 62 - _sass/bootstrap/mixins/_clearfix.scss | 7 - _sass/bootstrap/mixins/_deprecate.scss | 10 - _sass/bootstrap/mixins/_float.scss | 14 - _sass/bootstrap/mixins/_forms.scss | 177 - _sass/bootstrap/mixins/_gradients.scss | 45 - _sass/bootstrap/mixins/_grid-framework.scss | 71 - _sass/bootstrap/mixins/_grid.scss | 69 - _sass/bootstrap/mixins/_hover.scss | 37 - _sass/bootstrap/mixins/_image.scss | 36 - _sass/bootstrap/mixins/_list-group.scss | 21 - _sass/bootstrap/mixins/_lists.scss | 7 - _sass/bootstrap/mixins/_nav-divider.scss | 11 - _sass/bootstrap/mixins/_pagination.scss | 22 - _sass/bootstrap/mixins/_reset-text.scss | 17 - _sass/bootstrap/mixins/_resize.scss | 6 - _sass/bootstrap/mixins/_screen-reader.scss | 34 - _sass/bootstrap/mixins/_size.scss | 7 - _sass/bootstrap/mixins/_table-row.scss | 39 - _sass/bootstrap/mixins/_text-emphasis.scss | 17 - _sass/bootstrap/mixins/_text-hide.scss | 11 - _sass/bootstrap/mixins/_text-truncate.scss | 8 - _sass/bootstrap/mixins/_transition.scss | 16 - _sass/bootstrap/mixins/_visibility.scss | 8 - _sass/bootstrap/utilities/_align.scss | 8 - _sass/bootstrap/utilities/_background.scss | 19 - _sass/bootstrap/utilities/_borders.scss | 75 - _sass/bootstrap/utilities/_clearfix.scss | 3 - _sass/bootstrap/utilities/_display.scss | 26 - _sass/bootstrap/utilities/_embed.scss | 39 - _sass/bootstrap/utilities/_flex.scss | 51 - _sass/bootstrap/utilities/_float.scss | 11 - _sass/bootstrap/utilities/_overflow.scss | 5 - _sass/bootstrap/utilities/_position.scss | 32 - _sass/bootstrap/utilities/_screenreaders.scss | 11 - _sass/bootstrap/utilities/_shadows.scss | 6 - _sass/bootstrap/utilities/_sizing.scss | 20 - _sass/bootstrap/utilities/_spacing.scss | 73 - .../bootstrap/utilities/_stretched-link.scss | 19 - _sass/bootstrap/utilities/_text.scss | 72 - _sass/bootstrap/utilities/_visibility.scss | 13 - _sass/bootstrap/vendor/_rfs.scss | 204 - assets/css/app.scss | 2 +- assets/css/dark.scss | 2 +- assets/css/fa-all.css | 12731 ---------------- assets/fonts/fa-webfonts | 1 - assets/fonts/fontawesome | 1 + package-lock.json | 81 + package.json | 24 + 104 files changed, 152 insertions(+), 20713 deletions(-) delete mode 100644 .gitmodules create mode 100644 .npmrc create mode 120000 _sass/bootstrap delete mode 100755 _sass/bootstrap.scss delete mode 100644 _sass/bootstrap/_alert.scss delete mode 100644 _sass/bootstrap/_badge.scss delete mode 100644 _sass/bootstrap/_breadcrumb.scss delete mode 100644 _sass/bootstrap/_button-group.scss delete mode 100644 _sass/bootstrap/_buttons.scss delete mode 100644 _sass/bootstrap/_card.scss delete mode 100644 _sass/bootstrap/_carousel.scss delete mode 100644 _sass/bootstrap/_close.scss delete mode 100644 _sass/bootstrap/_code.scss delete mode 100644 _sass/bootstrap/_custom-forms.scss delete mode 100644 _sass/bootstrap/_dropdown.scss delete mode 100644 _sass/bootstrap/_forms.scss delete mode 100644 _sass/bootstrap/_functions.scss delete mode 100644 _sass/bootstrap/_grid.scss delete mode 100644 _sass/bootstrap/_images.scss delete mode 100644 _sass/bootstrap/_input-group.scss delete mode 100644 _sass/bootstrap/_jumbotron.scss delete mode 100644 _sass/bootstrap/_list-group.scss delete mode 100644 _sass/bootstrap/_media.scss delete mode 100644 _sass/bootstrap/_mixins.scss delete mode 100644 _sass/bootstrap/_modal.scss delete mode 100644 _sass/bootstrap/_nav.scss delete mode 100644 _sass/bootstrap/_navbar.scss delete mode 100644 _sass/bootstrap/_pagination.scss delete mode 100644 _sass/bootstrap/_popover.scss delete mode 100644 _sass/bootstrap/_print.scss delete mode 100644 _sass/bootstrap/_progress.scss delete mode 100644 _sass/bootstrap/_reboot.scss delete mode 100644 _sass/bootstrap/_root.scss delete mode 100644 _sass/bootstrap/_spinners.scss delete mode 100644 _sass/bootstrap/_tables.scss delete mode 100644 _sass/bootstrap/_toasts.scss delete mode 100644 _sass/bootstrap/_tooltip.scss delete mode 100644 _sass/bootstrap/_transitions.scss delete mode 100644 _sass/bootstrap/_type.scss delete mode 100644 _sass/bootstrap/_utilities.scss delete mode 100644 _sass/bootstrap/_variables.scss delete mode 100644 _sass/bootstrap/bootstrap-grid.scss delete mode 100644 _sass/bootstrap/bootstrap-reboot.scss delete mode 100644 _sass/bootstrap/mixins/_alert.scss delete mode 100644 _sass/bootstrap/mixins/_background-variant.scss delete mode 100644 _sass/bootstrap/mixins/_badge.scss delete mode 100644 _sass/bootstrap/mixins/_border-radius.scss delete mode 100644 _sass/bootstrap/mixins/_box-shadow.scss delete mode 100644 _sass/bootstrap/mixins/_breakpoints.scss delete mode 100644 _sass/bootstrap/mixins/_buttons.scss delete mode 100644 _sass/bootstrap/mixins/_caret.scss delete mode 100644 _sass/bootstrap/mixins/_clearfix.scss delete mode 100644 _sass/bootstrap/mixins/_deprecate.scss delete mode 100644 _sass/bootstrap/mixins/_float.scss delete mode 100644 _sass/bootstrap/mixins/_forms.scss delete mode 100644 _sass/bootstrap/mixins/_gradients.scss delete mode 100644 _sass/bootstrap/mixins/_grid-framework.scss delete mode 100644 _sass/bootstrap/mixins/_grid.scss delete mode 100644 _sass/bootstrap/mixins/_hover.scss delete mode 100644 _sass/bootstrap/mixins/_image.scss delete mode 100644 _sass/bootstrap/mixins/_list-group.scss delete mode 100644 _sass/bootstrap/mixins/_lists.scss delete mode 100644 _sass/bootstrap/mixins/_nav-divider.scss delete mode 100644 _sass/bootstrap/mixins/_pagination.scss delete mode 100644 _sass/bootstrap/mixins/_reset-text.scss delete mode 100644 _sass/bootstrap/mixins/_resize.scss delete mode 100644 _sass/bootstrap/mixins/_screen-reader.scss delete mode 100644 _sass/bootstrap/mixins/_size.scss delete mode 100644 _sass/bootstrap/mixins/_table-row.scss delete mode 100644 _sass/bootstrap/mixins/_text-emphasis.scss delete mode 100644 _sass/bootstrap/mixins/_text-hide.scss delete mode 100644 _sass/bootstrap/mixins/_text-truncate.scss delete mode 100644 _sass/bootstrap/mixins/_transition.scss delete mode 100644 _sass/bootstrap/mixins/_visibility.scss delete mode 100644 _sass/bootstrap/utilities/_align.scss delete mode 100644 _sass/bootstrap/utilities/_background.scss delete mode 100644 _sass/bootstrap/utilities/_borders.scss delete mode 100644 _sass/bootstrap/utilities/_clearfix.scss delete mode 100644 _sass/bootstrap/utilities/_display.scss delete mode 100644 _sass/bootstrap/utilities/_embed.scss delete mode 100644 _sass/bootstrap/utilities/_flex.scss delete mode 100644 _sass/bootstrap/utilities/_float.scss delete mode 100644 _sass/bootstrap/utilities/_overflow.scss delete mode 100644 _sass/bootstrap/utilities/_position.scss delete mode 100644 _sass/bootstrap/utilities/_screenreaders.scss delete mode 100644 _sass/bootstrap/utilities/_shadows.scss delete mode 100644 _sass/bootstrap/utilities/_sizing.scss delete mode 100644 _sass/bootstrap/utilities/_spacing.scss delete mode 100644 _sass/bootstrap/utilities/_stretched-link.scss delete mode 100644 _sass/bootstrap/utilities/_text.scss delete mode 100644 _sass/bootstrap/utilities/_visibility.scss delete mode 100644 _sass/bootstrap/vendor/_rfs.scss delete mode 100644 assets/css/fa-all.css delete mode 160000 assets/fonts/fa-webfonts create mode 120000 assets/fonts/fontawesome create mode 100644 package-lock.json create mode 100644 package.json 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 `