Browse Source

Résolution de conflits

master
Albakham 8 months ago
parent
commit
94085a5996
Signed by: albakham <dev@geber.ga> GPG Key ID: 6CE390277A579221
17 changed files with 390 additions and 59 deletions
  1. +3
    -0
      .github/FUNDING.yml
  2. +25
    -0
      .github/workflows/push.yml
  3. +1
    -1
      SECURITY.md
  4. +101
    -0
      amp.hbs
  5. +1
    -1
      assets/built/custom.css
  6. +1
    -1
      assets/built/custom.css.map
  7. +1
    -1
      assets/built/screen.css
  8. +1
    -1
      assets/built/screen.css.map
  9. +50
    -18
      assets/css/custom.css
  10. +125
    -0
      assets/css/screen.css
  11. +0
    -2
      default.hbs
  12. +2
    -2
      gulpfile.js
  13. +4
    -4
      package.json
  14. +1
    -0
      partials/icons/instagram.hbs
  15. +1
    -0
      partials/icons/linkedin.hbs
  16. +5
    -0
      post.hbs
  17. +68
    -28
      yarn.lock

+ 3
- 0
.github/FUNDING.yml View File

@@ -0,0 +1,3 @@
patreon: angristan
liberapay: angristan
ko_fi: angristan

+ 25
- 0
.github/workflows/push.yml View File

@@ -0,0 +1,25 @@
name: Node CI

on: [push]

jobs:
build:

runs-on: ubuntu-latest

strategy:
matrix:
node-version: [10.x, 12.x]

steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: yarn install and test
run: |
yarn install
yarn test
env:
CI: true

+ 1
- 1
SECURITY.md View File

@@ -4,6 +4,6 @@ Potential security vulnerabilities can be reported directly us at `security@ghos

The full, up-to-date details of our security policy and procedure can always be found in our documentation:

https://docs.ghost.org/security/
https://ghost.org/docs/concepts/security/

Please refer to this before emailing us. Thanks for helping make Ghost safe for everyone 🙏.

+ 101
- 0
amp.hbs
File diff suppressed because it is too large
View File


+ 1
- 1
assets/built/custom.css View File

@@ -1,2 +1,2 @@
@font-face{font-family:Source Sans Pro;font-style:normal;font-weight:400;src:url(../fonts/source-sans-pro-v11-latin-regular.eot);src:local("Source Sans Pro Regular"),local("SourceSansPro-Regular"),url(../fonts/source-sans-pro-v11-latin-regular.eot?#iefix) format("embedded-opentype"),url(../fonts/source-sans-pro-v11-latin-regular.woff2) format("woff2"),url(../fonts/source-sans-pro-v11-latin-regular.woff) format("woff"),url(../fonts/source-sans-pro-v11-latin-regular.ttf) format("truetype"),url(../fonts/source-sans-pro-v11-latin-regular.svg#SourceSansPro) format("svg")}.post-card-excerpt,.post-full-content,.post-full-content h5,.site-header-content .author-meta,.subscribe-overlay-description{font-family:Source Sans Pro,Georgia,serif}.post-full-content{font-size:1.9rem}.post-full-content h2{margin:.5em 0;font-size:3rem}#isso-thread{padding:0 100px!important}@media (max-width:1170px){#isso-thread{padding:5vw 7vw 0!important}}@media (max-width:500px){#isso-thread{padding:0!important}}.post-full-footer{padding:3vw 0}@media (min-width:900px){.floating-header{height:50px}}.post-template .post-content>p:first-child{font-size:inherit;line-height:inherit}.site-footer{padding-bottom:20px}.author-card-name{padding:0 0 5px}.post-full-content img,.post-full-content video{margin:.5em auto}.post-full-content pre{margin:0 0 2em}.post-full-header{padding:3vw}@media (max-width:500px){.post-full-header{padding:10vw 3vw 8vw}}.post-full-image{display:block;margin:auto}.post-full-image img{height:100%!important}@media (max-width:500px){.post-full-image{height:100%!important}}.post-full-content:after,.post-full-content:before{display:none}@media (max-width:500px){.post-full-content{padding:30px 0 0}}.floating-header-blog-title{margin-right:1px}.isso-comment-footer svg{-webkit-transform:translateY(-5px);transform:translateY(-5px)}.isso-comment-footer .downvote svg{-webkit-transform:translateY(-5px) translateX(3px);transform:translateY(-5px) translateX(3px)}.isso-comment-footer .reply{display:inline-block;-webkit-transform:translateY(-2px);transform:translateY(-2px)}.isso-comment-footer .votes{display:inline-block;-webkit-transform:translateY(2px);transform:translateY(2px)}.kg-image-card figcaption{margin:0}code,kbd,pre,samp{font-family:Menlo,DejaVu Sans Mono,Liberation Mono,Consolas,Ubuntu Mono,Courier New,andale mono,lucida console,monospace}.post-full-content h4{font-size:2.4rem}
@font-face{font-family:Source Sans Pro;font-style:normal;font-weight:400;src:url(../fonts/source-sans-pro-v11-latin-regular.eot);src:local("Source Sans Pro Regular"),local("SourceSansPro-Regular"),url(../fonts/source-sans-pro-v11-latin-regular.eot?#iefix) format("embedded-opentype"),url(../fonts/source-sans-pro-v11-latin-regular.woff2) format("woff2"),url(../fonts/source-sans-pro-v11-latin-regular.woff) format("woff"),url(../fonts/source-sans-pro-v11-latin-regular.ttf) format("truetype"),url(../fonts/source-sans-pro-v11-latin-regular.svg#SourceSansPro) format("svg")}.post-card-excerpt,.post-full-content,.post-full-content h5,.site-header-content .author-meta,.subscribe-overlay-description{font-family:Source Sans Pro,Georgia,serif}.post-full-content{font-size:1.9rem}.post-full-content h2{margin:.5em 0;font-size:3rem}#isso-thread{padding:0 100px!important}@media (max-width:1170px){#isso-thread{padding:5vw 7vw 0!important}}@media (max-width:500px){#isso-thread{padding:0!important}}.post-full-footer{padding:3vw 0}@media (min-width:900px){.floating-header{height:50px}}.post-template .post-content>p:first-child{font-size:inherit;line-height:inherit}.site-footer{padding-bottom:20px}.author-card-name{padding:0 0 5px}.post-full-content img,.post-full-content video{margin:.5em auto}.post-full-content pre{margin:0 0 2em}.post-full-header{padding:3vw}@media (max-width:500px){.post-full-header{padding:10vw 3vw 8vw}}.post-full-image{display:block;margin:auto}.post-full-image img{height:100%!important}@media (max-width:500px){.post-full-image{height:100%!important}}.post-full-content:after,.post-full-content:before{display:none}@media (max-width:500px){.post-full-content{padding:30px 0 0}}.floating-header-blog-title{margin-right:1px}.isso-comment-footer svg{-webkit-transform:translateY(-5px);transform:translateY(-5px)}.isso-comment-footer .downvote svg{-webkit-transform:translateY(-5px) translateX(3px);transform:translateY(-5px) translateX(3px)}.isso-comment-footer .reply{display:inline-block;-webkit-transform:translateY(-2px);transform:translateY(-2px)}.isso-comment-footer .votes{display:inline-block;-webkit-transform:translateY(2px);transform:translateY(2px)}.kg-image-card figcaption{margin:0}code,kbd,pre,samp{font-family:Menlo,DejaVu Sans Mono,Liberation Mono,Consolas,Ubuntu Mono,Courier New,andale mono,lucida console,monospace}.post-full-content h4{font-size:2.4rem}.avatar img{border-radius:10px}.kg-image-card figcaption{margin-top:10px}.post-full-content p code{word-break:inherit}
/*# sourceMappingURL=custom.css.map */

+ 1
- 1
assets/built/custom.css.map
File diff suppressed because it is too large
View File


+ 1
- 1
assets/built/screen.css
File diff suppressed because it is too large
View File


+ 1
- 1
assets/built/screen.css.map
File diff suppressed because it is too large
View File


+ 50
- 18
assets/css/custom.css View File

@@ -1,32 +1,40 @@
/* source-sans-pro-regular - latin */
@font-face {
font-family: 'Source Sans Pro';
font-family: "Source Sans Pro";
font-style: normal;
font-weight: 400;
src: url('../fonts/source-sans-pro-v11-latin-regular.eot'); /* IE9 Compat Modes */
src: local('Source Sans Pro Regular'), local('SourceSansPro-Regular'),
url('../fonts/source-sans-pro-v11-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('../fonts/source-sans-pro-v11-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
url('../fonts/source-sans-pro-v11-latin-regular.woff') format('woff'), /* Modern Browsers */
url('../fonts/source-sans-pro-v11-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
url('../fonts/source-sans-pro-v11-latin-regular.svg#SourceSansPro') format('svg'); /* Legacy iOS */
src: url("../fonts/source-sans-pro-v11-latin-regular.eot"); /* IE9 Compat Modes */
src: local("Source Sans Pro Regular"), local("SourceSansPro-Regular"),
url("../fonts/source-sans-pro-v11-latin-regular.eot?#iefix")
format("embedded-opentype"),
/* IE6-IE8 */ url("../fonts/source-sans-pro-v11-latin-regular.woff2")
format("woff2"),
/* Super Modern Browsers */
url("../fonts/source-sans-pro-v11-latin-regular.woff")
format("woff"),
/* Modern Browsers */
url("../fonts/source-sans-pro-v11-latin-regular.ttf")
format("truetype"),
/* Safari, Android, iOS */
url("../fonts/source-sans-pro-v11-latin-regular.svg#SourceSansPro")
format("svg"); /* Legacy iOS */
}

/* Use Source Sans Pro font */
.post-full-content {
font-family: 'Source Sans Pro',Georgia,serif;
font-family: "Source Sans Pro", Georgia, serif;
}
.post-full-content h5 {
font-family: 'Source Sans Pro',Georgia,serif;
font-family: "Source Sans Pro", Georgia, serif;
}
.post-card-excerpt {
font-family: 'Source Sans Pro',Georgia,serif;
font-family: "Source Sans Pro", Georgia, serif;
}
.site-header-content .author-meta {
font-family: 'Source Sans Pro',Georgia,serif;
font-family: "Source Sans Pro", Georgia, serif;
}
.subscribe-overlay-description {
font-family: 'Source Sans Pro',Georgia,serif;
font-family: "Source Sans Pro", Georgia, serif;
}

/* Make the post content font size 0.3rem tinier */
@@ -69,7 +77,7 @@
}

/* Make the first paragraph the same size as the post */
.post-template .post-content>p:first-child {
.post-template .post-content > p:first-child {
font-size: inherit;
line-height: inherit;
}
@@ -85,7 +93,8 @@
}

/* Reduce top and bottom margins for pictures and videos by 1em */
.post-full-content img, .post-full-content video {
.post-full-content img,
.post-full-content video {
margin: 0.5em auto;
}

@@ -124,7 +133,8 @@
}

/* Remove the shadows as we move up the image */
.post-full-content::before, .post-full-content::after {
.post-full-content::before,
.post-full-content::after {
display: none;
}

@@ -168,8 +178,12 @@

/* Use GitLab-like font for code blocks instead of ugly monospace */

code, kbd, pre, samp {
font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace;
code,
kbd,
pre,
samp {
font-family: "Menlo", "DejaVu Sans Mono", "Liberation Mono", "Consolas",
"Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace;
}

/* h3 and h4 have the same size */
@@ -177,3 +191,21 @@ code, kbd, pre, samp {
.post-full-content h4 {
font-size: 2.4rem;
}

/* Round isso's gravatar avatars */

.avatar img {
border-radius: 10px;
}

/* Add some margin to images captions */

.kg-image-card figcaption {
margin-top: 10px;
}

/* Don't break words in code lines */

.post-full-content p code {
word-break: inherit;
}

+ 125
- 0
assets/css/screen.css View File

@@ -941,6 +941,10 @@ Usage (In Ghost editor):
border-radius: 5px;
}

.post-full-content pre ::selection {
color: color(var(--midgrey) l(-25%));
}

.post-full-content pre code {
padding: 0;
font-size: inherit;
@@ -1945,6 +1949,127 @@ Usage (In Ghost editor):
margin: 0;
}

.kg-bookmark-card {
background: var(--white);
width: 100%;
}

.kg-card + .kg-bookmark-card {
margin-top: 0;
}

.post-full-content .kg-bookmark-container {
display: flex;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif;
color: var(--darkgrey);
text-decoration: none;
min-height: 148px;
box-shadow: 0px 2px 5px -1px rgba(0, 0, 0, 0.15), 0 0 1px rgba(0, 0, 0, 0.09);
border-radius: 3px;
}

.kg-bookmark-content {
display: flex;
flex-direction: column;
flex-grow: 1;
align-items: flex-start;
justify-content: start;
padding: 20px;
}

.kg-bookmark-title {
font-size: 1.6rem;
line-height: 1.5em;
font-weight: 600;
color: color(var(--midgrey) l(-30%));
}

.post-full-content .kg-bookmark-container:hover .kg-bookmark-title {
color: var(--blue);
}

.kg-bookmark-description {
display: -webkit-box;
font-size: 1.5rem;
line-height: 1.5em;
color: color(var(--midgrey) l(-10%));
font-weight: 400;
margin-top: 12px;
max-height: 48px;
overflow-y: hidden;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}

.kg-bookmark-thumbnail {
position: relative;
min-width: 33%;
max-height: 100%;
}

.kg-bookmark-thumbnail img {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
object-fit: cover;
border-radius: 0 3px 3px 0;
}

.kg-bookmark-metadata {
display: flex;
align-items: center;
font-size: 1.5rem;
font-weight: 400;
color: color(var(--midgrey) l(-10%));
margin-top: 14px;
flex-wrap: wrap;
}

.post-full-content .kg-bookmark-icon {
width: 22px;
height: 22px;
margin-right: 8px;
}

.kg-bookmark-author {
line-height: 1.5em;
}

.kg-bookmark-author:after {
content: "•";
margin: 0 6px;
}

.kg-bookmark-publisher {
overflow: hidden;
line-height: 1.5em;
text-overflow: ellipsis;
white-space: nowrap;
max-width: 240px;
}

@media (max-width: 500px) {
.post-full-content .kg-bookmark-container {
flex-direction: column;
}

.kg-bookmark-thumbnail {
order: 1;
width: 100%;
min-height: 160px;
}

.kg-bookmark-thumbnail img {
border-radius: 3px 3px 0 0;
}

.kg-bookmark-content {
order: 2
}
}

/* 8. Author Template
/* ---------------------------------------------------------- */



+ 0
- 2
default.hbs View File

@@ -71,9 +71,7 @@
<script src="{{asset "js/jquery-3.2.1.min.js"}}"></script>
<script type="text/javascript" src="{{asset "built/jquery.fitvids.js"}}"></script>

{{#if pagination.pages}}
<script src="{{asset "built/infinitescroll.js"}}"></script>
{{/if}}

{{!-- The #block helper will pull in data from the #contentFor other template files. In this case, there's some JavaScript which we only want to use in post.hbs, but it needs to be included down here, after jQuery has already loaded. --}}
{{{block "scripts"}}}


+ 2
- 2
gulpfile.js View File

@@ -31,7 +31,7 @@ const handleError = (done) => {

function hbs(done) {
pump([
src(['*.hbs', 'partials/**/*.hbs', '!node_modules/**/*.hbs']),
src(['*.hbs', 'partials/**/*.hbs']),
livereload()
], handleError(done));
}
@@ -79,7 +79,7 @@ function zipper(done) {
}

const cssWatcher = () => watch('assets/css/**', css);
const hbsWatcher = () => watch(['*.hbs', 'partials/**/*.hbs', '!node_modules/**/*.hbs'], hbs);
const hbsWatcher = () => watch(['*.hbs', 'partials/**/*.hbs'], hbs);
const watcher = parallel(cssWatcher, hbsWatcher);
const build = series(css, js);
const dev = series(build, serve, watcher);


+ 4
- 4
package.json View File

@@ -2,7 +2,7 @@
"name": "casper-geber",
"description": "This is the Ghost theme of www.geber.ga, based on Casper.",
"demo": "https://www.geber.ga",
"version": "2.10.2",
"version": "2.11.1",
"engines": {
"ghost": ">=2.0.0",
"ghost-api": "v2"
@@ -46,17 +46,17 @@
"contributors": "https://github.com/Angristan/Casper/graphs/contributors",
"devDependencies": {
"@tryghost/release-utils": "0.3.2",
"autoprefixer": "9.5.1",
"autoprefixer": "9.6.1",
"beeper": "1.1.1",
"cssnano": "4.1.10",
"gscan": "2.6.0",
"gscan": "2.7.0",
"gulp": "4.0.2",
"gulp-livereload": "4.0.1",
"gulp-postcss": "8.0.0",
"gulp-uglify": "3.0.2",
"gulp-zip": "4.2.0",
"postcss-color-function": "4.1.0",
"postcss-custom-properties": "8.0.10",
"postcss-custom-properties": "8.0.11",
"postcss-easy-import": "3.0.0",
"pump": "3.0.0"
},


+ 1
- 0
partials/icons/instagram.hbs View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 2.163c3.204 0 3.584.012 4.85.07 3.252.148 4.771 1.691 4.919 4.919.058 1.265.069 1.645.069 4.849 0 3.205-.012 3.584-.069 4.849-.149 3.225-1.664 4.771-4.919 4.919-1.266.058-1.644.07-4.85.07-3.204 0-3.584-.012-4.849-.07-3.26-.149-4.771-1.699-4.919-4.92-.058-1.265-.07-1.644-.07-4.849 0-3.204.013-3.583.07-4.849.149-3.227 1.664-4.771 4.919-4.919 1.266-.057 1.645-.069 4.849-.069zm0-2.163c-3.259 0-3.667.014-4.947.072-4.358.2-6.78 2.618-6.98 6.98-.059 1.281-.073 1.689-.073 4.948 0 3.259.014 3.668.072 4.948.2 4.358 2.618 6.78 6.98 6.98 1.281.058 1.689.072 4.948.072 3.259 0 3.668-.014 4.948-.072 4.354-.2 6.782-2.618 6.979-6.98.059-1.28.073-1.689.073-4.948 0-3.259-.014-3.667-.072-4.947-.196-4.354-2.617-6.78-6.979-6.98-1.281-.059-1.69-.073-4.949-.073zm0 5.838c-3.403 0-6.162 2.759-6.162 6.162s2.759 6.163 6.162 6.163 6.162-2.759 6.162-6.163c0-3.403-2.759-6.162-6.162-6.162zm0 10.162c-2.209 0-4-1.79-4-4 0-2.209 1.791-4 4-4s4 1.791 4 4c0 2.21-1.791 4-4 4zm6.406-11.845c-.796 0-1.441.645-1.441 1.44s.645 1.44 1.441 1.44c.795 0 1.439-.645 1.439-1.44s-.644-1.44-1.439-1.44z"/></svg>

+ 1
- 0
partials/icons/linkedin.hbs View File

@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M19 0h-14c-2.761 0-5 2.239-5 5v14c0 2.761 2.239 5 5 5h14c2.762 0 5-2.239 5-5v-14c0-2.761-2.238-5-5-5zm-11 19h-3v-11h3v11zm-1.5-12.268c-.966 0-1.75-.79-1.75-1.764s.784-1.764 1.75-1.764 1.75.79 1.75 1.764-.783 1.764-1.75 1.764zm13.5 12.268h-3v-5.604c0-3.368-4-3.113-4 0v5.604h-3v-11h3v1.765c1.396-2.586 7-2.777 7 2.476v6.759z"/></svg>

+ 5
- 0
post.hbs View File

@@ -76,7 +76,12 @@ into the {body} of the default.hbs template --}}
</footer>

{{!-- Isso (hardcoded) --}}
<<<<<<< HEAD
<script data-isso="https://isso.geber.ga/" src="https://isso.geber.ga/js/embed.min.js"></script>
=======
<script data-isso="https://isso.angristan.xyz/" data-isso-gravatar="true" data-isso-avatar="false"
src="https://isso.angristan.xyz/js/embed.min.js"></script>
>>>>>>> upstream/master
<section id="isso-thread"></section>

</article>


+ 68
- 28
yarn.lock View File

@@ -294,16 +294,17 @@ atob@^2.1.1:
version "2.1.2"
resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"

autoprefixer@9.5.1:
version "9.5.1"
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.5.1.tgz#243b1267b67e7e947f28919d786b50d3bb0fb357"
autoprefixer@9.6.1:
version "9.6.1"
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.1.tgz#51967a02d2d2300bb01866c1611ec8348d355a47"
dependencies:
browserslist "^4.5.4"
caniuse-lite "^1.0.30000957"
browserslist "^4.6.3"
caniuse-lite "^1.0.30000980"
chalk "^2.4.2"
normalize-range "^0.1.2"
num2fraction "^1.2.2"
postcss "^7.0.14"
postcss-value-parser "^3.3.1"
postcss "^7.0.17"
postcss-value-parser "^4.0.0"

aws-sign2@~0.7.0:
version "0.7.0"
@@ -423,7 +424,7 @@ braces@^2.3.1, braces@^2.3.2:
split-string "^3.0.2"
to-regex "^3.0.1"

browserslist@^4.0.0, browserslist@^4.5.4:
browserslist@^4.0.0:
version "4.5.6"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.5.6.tgz#ea42e8581ca2513fa7f371d4dd66da763938163d"
dependencies:
@@ -431,6 +432,14 @@ browserslist@^4.0.0, browserslist@^4.5.4:
electron-to-chromium "^1.3.127"
node-releases "^1.1.17"

browserslist@^4.6.3:
version "4.6.6"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.6.tgz#6e4bf467cde520bc9dbdf3747dafa03531cec453"
dependencies:
caniuse-lite "^1.0.30000984"
electron-to-chromium "^1.3.191"
node-releases "^1.1.25"

buffer-crc32@~0.2.3:
version "0.2.13"
resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
@@ -533,10 +542,14 @@ caniuse-api@^3.0.0:
lodash.memoize "^4.1.2"
lodash.uniq "^4.5.0"

caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000957, caniuse-lite@^1.0.30000963:
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000963:
version "1.0.30000963"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000963.tgz#5be481d5292f22aff5ee0db4a6c049b65b5798b1"

caniuse-lite@^1.0.30000980, caniuse-lite@^1.0.30000984:
version "1.0.30000988"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000988.tgz#742f35ec1b8b75b9628d705d7652eea1fef983db"

caseless@~0.12.0:
version "0.12.0"
resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@@ -1162,6 +1175,10 @@ electron-to-chromium@^1.3.127:
version "1.3.128"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.128.tgz#1f9ffa31397da2f220d583dbb2b763e365dfbbc5"

electron-to-chromium@^1.3.191:
version "1.3.208"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.208.tgz#6df90b89e8b9af139db3c8d7a6b935db0801e61c"

emoji-regex@^8.0.0:
version "8.0.0"
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
@@ -1572,11 +1589,11 @@ fs-extra@^3.0.1:
jsonfile "^3.0.0"
universalify "^0.1.0"

fs-extra@^7.0.0:
version "7.0.1"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
fs-extra@^8.0.0:
version "8.1.0"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
dependencies:
graceful-fs "^4.1.2"
graceful-fs "^4.2.0"
jsonfile "^4.0.0"
universalify "^0.1.0"

@@ -1773,9 +1790,13 @@ graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
version "4.1.15"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"

gscan@2.6.0:
version "2.6.0"
resolved "https://registry.yarnpkg.com/gscan/-/gscan-2.6.0.tgz#3fbbcefa9fcdb386cc1bf6fcc93e3f86d07fbd2c"
graceful-fs@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.0.tgz#8d8fdc73977cb04104721cb53666c1ca64cd328b"

gscan@2.7.0:
version "2.7.0"
resolved "https://registry.yarnpkg.com/gscan/-/gscan-2.7.0.tgz#c4ae05a4ca4ac9f178b060622b3531b39024bee4"
dependencies:
"@tryghost/extract-zip" "1.6.6"
"@tryghost/pretty-cli" "1.2.1"
@@ -1784,12 +1805,12 @@ gscan@2.6.0:
common-tags "^1.8.0"
express "^4.16.2"
express-hbs "1.1.1"
fs-extra "^7.0.0"
fs-extra "^8.0.0"
ghost-ignition "3.1.0"
glob "^7.0.5"
lodash "^4.17.11"
multer "^1.1.0"
pluralize "^7.0.0"
pluralize "^8.0.0"
require-dir "^1.0.0"
semver "^6.0.0"
upath "^1.1.0"
@@ -2654,8 +2675,9 @@ minizlib@^1.1.1:
minipass "^2.2.1"

mixin-deep@^1.2.0:
version "1.3.1"
resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
version "1.3.2"
resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
dependencies:
for-in "^1.0.2"
is-extendable "^1.0.1"
@@ -2803,6 +2825,12 @@ node-releases@^1.1.17:
dependencies:
semver "^5.3.0"

node-releases@^1.1.25:
version "1.1.26"
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.26.tgz#f30563edc5c7dc20cf524cc8652ffa7be0762937"
dependencies:
semver "^5.3.0"

nopt@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
@@ -3187,9 +3215,9 @@ plugin-error@^1.0.1:
arr-union "^3.1.0"
extend-shallow "^3.0.2"

pluralize@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
pluralize@^8.0.0:
version "8.0.0"
resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz#1a6fa16a38d12a1901e0320fa017051c539ce3b1"

posix-character-classes@^0.1.0:
version "0.1.1"
@@ -3231,11 +3259,11 @@ postcss-convert-values@^4.0.1:
postcss "^7.0.0"
postcss-value-parser "^3.0.0"

postcss-custom-properties@8.0.10:
version "8.0.10"
resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-8.0.10.tgz#e8dc969e1e15c555f0b836b7f278ef47e3cdeaff"
postcss-custom-properties@8.0.11:
version "8.0.11"
resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-8.0.11.tgz#2d61772d6e92f22f5e0d52602df8fae46fa30d97"
dependencies:
postcss "^7.0.14"
postcss "^7.0.17"
postcss-values-parser "^2.0.1"

postcss-discard-comments@^4.0.2:
@@ -3488,6 +3516,10 @@ postcss-value-parser@^3.0.0, postcss-value-parser@^3.2.3, postcss-value-parser@^
version "3.3.1"
resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"

postcss-value-parser@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.0.tgz#99a983d365f7b2ad8d0f9b8c3094926eab4b936d"

postcss-values-parser@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/postcss-values-parser/-/postcss-values-parser-2.0.1.tgz#da8b472d901da1e205b47bdc98637b9e9e550e5f"
@@ -3504,7 +3536,7 @@ postcss@^6.0.1, postcss@^6.0.11, postcss@^6.0.23:
source-map "^0.6.1"
supports-color "^5.4.0"

postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.5:
postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2, postcss@^7.0.5:
version "7.0.14"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.14.tgz#4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5"
dependencies:
@@ -3512,6 +3544,14 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.5:
source-map "^0.6.1"
supports-color "^6.1.0"

postcss@^7.0.17:
version "7.0.17"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.17.tgz#4da1bdff5322d4a0acaab4d87f3e782436bad31f"
dependencies:
chalk "^2.4.2"
source-map "^0.6.1"
supports-color "^6.1.0"

pretty-hrtime@^1.0.0:
version "1.0.3"
resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"


Loading…
Cancel
Save