diff --git a/.github/main.workflow b/.github/main.workflow index 49a5c99..0092597 100644 --- a/.github/main.workflow +++ b/.github/main.workflow @@ -1,16 +1,26 @@ workflow "Publish to RubyGems" { on = "release" - resolves = ["scarhand/actions-ruby@master"] + resolves = [ + "Publish to GPR", + "Publish to Ruby Gems", + ] } action "Build from Gemspec" { uses = "scarhand/actions-ruby@master" - runs = "build *.gemspec" + runs = "gem build just-the-docs.gemspec" } -action "scarhand/actions-ruby@master" { +action "Publish to Ruby Gems" { uses = "scarhand/actions-ruby@master" needs = ["Build from Gemspec"] - runs = "push *.gem" + runs = "gem push *.gem" secrets = ["RUBYGEMS_AUTH_TOKEN"] } + +action "Publish to GPR" { + uses = "scarhand/actions-ruby@master" + needs = ["Build from Gemspec"] + secrets = ["GPR_AUTH_TOKEN"] + runs = " gem push --key [\"GPR_AUTH_TOKEN\"] --host https://rubygems.pkg.github.com/pmarsceill *.gem" +} diff --git a/_includes/head.html b/_includes/head.html index 026c68f..13cdbaf 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -1,11 +1,17 @@ - {% if page.description %} - + + {% if site.plugins.jekyll-seo == nil %} + {{ page.title }} - {{ site.title }} + + {% if page.description %} + + {% endif %} {% endif %} - {{ page.title }} - {{ site.title }} + + {% if site.ga_tracking != nil %} diff --git a/_sass/typography.scss b/_sass/typography.scss index ac1eed9..ccf1604 100644 --- a/_sass/typography.scss +++ b/_sass/typography.scss @@ -1,7 +1,7 @@ // // Typography // -// stylelint-disable primer/selector-no-utility, selector-no-type, selector-max-type +// stylelint-disable primer/selector-no-utility, primer/no-override, selector-no-type, selector-max-type h1, .text-alpha { diff --git a/_sass/utilities/_layout.scss b/_sass/utilities/_layout.scss index d16ed5a..7f17a4d 100644 --- a/_sass/utilities/_layout.scss +++ b/_sass/utilities/_layout.scss @@ -1,4 +1,4 @@ -// stylelint-disable primer/selector-no-utility +// stylelint-disable primer/selector-no-utility, primer/no-override // // Utility classes for layout // diff --git a/_sass/utilities/_lists.scss b/_sass/utilities/_lists.scss index 0c5bcad..3c76dcf 100644 --- a/_sass/utilities/_lists.scss +++ b/_sass/utilities/_lists.scss @@ -2,7 +2,7 @@ // Utility classes for lists // -// stylelint-disable primer/selector-no-utility +// stylelint-disable primer/selector-no-utility, primer/no-override .list-style-none { padding: 0 !important; diff --git a/_sass/utilities/_spacing.scss b/_sass/utilities/_spacing.scss index 9b42816..a1d8a95 100644 --- a/_sass/utilities/_spacing.scss +++ b/_sass/utilities/_spacing.scss @@ -3,7 +3,7 @@ // // scss-lint:disable SpaceAfterPropertyName -// stylelint-disable block-opening-brace-space-after, block-opening-brace-space-before, primer/selector-no-utility +// stylelint-disable block-opening-brace-space-after, block-opening-brace-space-before, primer/selector-no-utility, primer/no-override // Margin spacer utilities diff --git a/_sass/utilities/_typography.scss b/_sass/utilities/_typography.scss index 7206def..2397acb 100644 --- a/_sass/utilities/_typography.scss +++ b/_sass/utilities/_typography.scss @@ -2,7 +2,7 @@ // Utility classes for typography // -// stylelint-disable primer/selector-no-utility +// stylelint-disable primer/selector-no-utility, primer/no-override .fs-1 { @include fs-1; diff --git a/favicon.ico b/favicon.ico new file mode 100644 index 0000000..9d06e64 Binary files /dev/null and b/favicon.ico differ diff --git a/just-the-docs.gemspec b/just-the-docs.gemspec index 27dfa9b..9e92961 100644 --- a/just-the-docs.gemspec +++ b/just-the-docs.gemspec @@ -2,7 +2,7 @@ Gem::Specification.new do |spec| spec.name = "just-the-docs" - spec.version = "0.2.4" + spec.version = "0.2.5" spec.authors = ["Patrick Marsceill"] spec.email = ["patrick.marsceill@gmail.com"] diff --git a/package-lock.json b/package-lock.json index a27c097..c7a9485 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "just-the-docs", - "version": "0.2.4", + "version": "0.2.5", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -177,9 +177,9 @@ "dev": true }, "@primer/css": { - "version": "12.2.3", - "resolved": "https://registry.npmjs.org/@primer/css/-/css-12.2.3.tgz", - "integrity": "sha512-IhQHkxYiHBt0erXoPADWqgjcnM73NVK3I9tJX112JofwErhWsrJZbtvlpgIQ9WXDEsq74FEh1umSMQm5QuhYug==" + "version": "12.3.1", + "resolved": "https://registry.npmjs.org/@primer/css/-/css-12.3.1.tgz", + "integrity": "sha512-W9khweOSS0VwjGcw/p9t2L4N+uzMHpelsp/lihgQ+g2An54IYuTEUX3RT42Wp++3DQTPGapEMmXFnLI9cTBL4w==" }, "@types/events": { "version": "3.0.0", @@ -4193,9 +4193,9 @@ } }, "stylelint-config-primer": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/stylelint-config-primer/-/stylelint-config-primer-6.0.0.tgz", - "integrity": "sha512-sHTgPYNGWMDMq7BMEFLM+6K3M7f1la5saJEdQNPrhjWxhzvWt+r2OaHuKklkgeM6X6yK8+2+UWKKcuIGBCNjOA==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/stylelint-config-primer/-/stylelint-config-primer-7.0.0.tgz", + "integrity": "sha512-PpQTJK9WYEoPRIpQtshKeslcloxLwRWTrF+lLgWKxRNsD/J0xuW+ucykqHYeO5+fJALWgFS06MdKQD/eg0Iycw==", "dev": true, "requires": { "stylelint-no-unsupported-browser-features": "^1.0.0", diff --git a/package.json b/package.json index 35742f5..4130c23 100644 --- a/package.json +++ b/package.json @@ -1,17 +1,17 @@ { "name": "just-the-docs", - "version": "0.2.4", + "version": "0.2.5", "description": "A modern Jekyll theme for documentation", "repository": "pmarsceill/just-the-docs", "license": "MIT", "bugs": "https://github.com/pmarsceill/just-the-docs/issues", "devDependencies": { "stylelint": "^10.0.1", - "stylelint-config-primer": "^6.0.0", + "stylelint-config-primer": "^7.0.0", "stylelint-selector-no-utility": "^4.0.0" }, "dependencies": { - "@primer/css": "^12.2.3" + "@primer/css": "^12.3.1" }, "scripts": { "test": "stylelint '**/*.scss'"