Skip to content

Commit

Permalink
Merge branch 'main' into privacy
Browse files Browse the repository at this point in the history
  • Loading branch information
DaveSkender authored May 9, 2024
2 parents 0d5832d + 1940d93 commit 2b2f666
Show file tree
Hide file tree
Showing 17 changed files with 224 additions and 114 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.1' # Not needed with a .ruby-version file
ruby-version: '3.3' # Not needed with a .ruby-version file
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
cache-version: 1 # Increment this number if you need to re-download cached gems

Expand All @@ -40,7 +40,7 @@ jobs:
find: "YYYY.MM.DD"
replace: "${{ steps.tag.outputs.version }}"
regex: false

- name: Build site (production)
if: github.ref == 'refs/heads/main'
env:
Expand Down
24 changes: 24 additions & 0 deletions .github/workflows/lock.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Lock closed threads
# https://github.com/marketplace/actions/lock-threads

on:
schedule:
- cron: "0 6 * * 2"
workflow_dispatch:

permissions:
issues: write
pull-requests: write

concurrency:
group: lock

jobs:
lock:
runs-on: ubuntu-latest
steps:
- uses: dessant/lock-threads@v5
with:
process-only: issues, prs
issue-inactive-days: "90"
pr-inactive-days: "30"
70 changes: 70 additions & 0 deletions .github/workflows/semantic-pr-linter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
name: "Lint PR"

on:
pull_request_target:
types:
- opened
- edited
- synchronize

permissions:
pull-requests: write

jobs:
main:
name: validate PR title
runs-on: ubuntu-latest
steps:
- uses: amannn/action-semantic-pull-request@v5
id: lint_pr_title
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:

# Configure additional validation for the subject based on a regex.
# We enforce that the subject starts with an uppercase character.
subjectPattern: ^([A-Z]).+$

# If `subjectPattern` is configured, you can use this property to override
# the default error message that is shown when the pattern doesn't match.
# The variables `subject` and `title` can be used within the message.
subjectPatternError: >
The subject "**{subject}**" found in the pull request title "*{title}*"
didn't match the configured pattern. Please ensure that the subject
starts with an uppercase character.
# If the PR contains one of these newline-delimited labels, the
# validation is skipped. If you want to rerun the validation when
# labels change, you might want to use the `labeled` and `unlabeled`
# event triggers in your workflow.
ignoreLabels: |
bot
ignore-semantic-pull-request
- uses: marocchino/sticky-pull-request-comment@v2
# When the previous steps fails, the workflow would stop. By adding this
# condition you can continue the execution with the populated error message.
if: always() && (steps.lint_pr_title.outputs.error_message != null)
with:
header: pr-title-lint-error
message: >
### Hey there and thank you for opening this pull request! 👋🏼
It looks like your proposed **_Pull request title_** needs to be adjusted.
>🚩 **Error** » ${{ steps.lint_pr_title.outputs.error_message }}
#### Pull request title naming convention
Our PR title name taxonomy is `type: Subject`, where **type** is typically
*feat*, *fix*, or *chore*, and **subject** is a phrase (proper noun) that starts with a capitalized letter.
The *chore* type usually has a subject that starts with an action verb like *Add* or *Update*.
Examples: `feat: Admin portal login`, `fix: Divide by zero bug in SMA`, and `chore: Update user docs`.
See the [Conventional Commits specification](https://www.conventionalcommits.org) for more information.
# Delete a previous comment when the issue has been resolved
- if: ${{ steps.lint_pr_title.outputs.error_message == null }}
uses: marocchino/sticky-pull-request-comment@v2
with:
header: pr-title-lint-error
delete: true
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ GEM
rake (>= 13)
htmlcompressor (0.4.0)
http_parser.rb (0.8.0)
i18n (1.14.4)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
jekyll (4.3.3)
addressable (~> 2.4)
Expand Down Expand Up @@ -78,9 +78,9 @@ GEM
rexml (3.2.6)
rouge (4.2.1)
safe_yaml (1.0.5)
sass-embedded (1.75.0-x64-mingw-ucrt)
sass-embedded (1.77.0-x64-mingw-ucrt)
google-protobuf (>= 3.25, < 5.0)
sass-embedded (1.75.0-x86_64-linux-gnu)
sass-embedded (1.77.0-x86_64-linux-gnu)
google-protobuf (>= 3.25, < 5.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
Expand Down
52 changes: 39 additions & 13 deletions _includes/head-base-styles.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,50 @@
display: flex;
flex-direction: column;
overflow-wrap: break-word;
overflow-y: scroll;

margin: 0;
padding: 2rem 1rem;
min-height: calc(100dvh - 4rem);
}

.background-stripes {
z-index: -1;
position: fixed;
top: 0;
left: 0;
/* stripes | portrait, tall */
@media (orientation: portrait) {
body {
background-image:
repeating-linear-gradient(-230deg,
hsl(24, 42%, 12%) 0 45.575dvw,
hsl(218, 26%, 12%) 45.575dvw 102.054dvw,
hsl(45, 50%, 12%) 102.054dvw 126.099dvw,
hsl(0, 1%, 12%) 126.099dvw 139.520dvw,
hsl(96, 21%, 12%) 139.520dvw 201.312dvw);
}
}

aspect-ratio: 1;
min-height: 100dvh;
min-width: 100dvw;
/* stripes | portrait, squarish */
@media (orientation: portrait) and (min-aspect-ratio: 0.8) {
body {
background-image:
repeating-linear-gradient(-230deg,
hsl(24, 42%, 12%) 0 37.979dvw,
hsl(218, 26%, 12%) 37.979dvw 85.045dvw,
hsl(45, 50%, 12%) 85.045dvw 105.083dvw,
hsl(0, 1%, 12%) 105.083dvw 116.267dvw,
hsl(96, 21%, 12%) 116.267dvw 167.760dvw);
}
}

background-image: url('assets/background.svg');
background-repeat: no-repeat;
background-size: cover;
/* stripes | landscape */
@media (orientation: landscape) {
body {
background-image:
repeating-linear-gradient(-230deg,
hsl(24, 42%, 12%) 0 30.383dvw,
hsl(218, 26%, 12%) 30.383dvw 68.036dvw,
hsl(45, 50%, 12%) 68.036dvw 84.066dvw,
hsl(0, 1%, 12%) 84.066dvw 93.013dvw,
hsl(96, 21%, 12%) 93.013dvw 134.208dvw);
}
}

main,
Expand Down Expand Up @@ -175,7 +200,6 @@

h2 {
font-size: 1.8rem;
font-weight: 500;
}
}

Expand All @@ -196,8 +220,10 @@
/* BUTTONS */
button {
min-height: 3.2em;
}

@media screen and (max-width: 480px) {
@media screen and (max-width: 480px) {
button {
width: 100%;
}
}
Expand Down
56 changes: 56 additions & 0 deletions _includes/head-home-script.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<script defer>

document.addEventListener("DOMContentLoaded", startup);

function startup() {

document.addEventListener(
"touchmove", removeSplashNav, { passive: true, once: true });

document.addEventListener(
"wheel", removeSplashNav, { passive: true, once: true });
}

// homepage: remove navigation, fixed splash size
function removeSplashNav() {

// hide obsolete arrow navigation
var arrowElement = document.getElementById('splash-nav');
arrowElement.style.visibility = 'hidden';

// fixed splash size to avoid resizing with iOS menu
var splashElement = document.getElementById('splash');
splashElement.style.height = splashElement.offsetHeight + 'px';

// show the rest of the page
var aboutElement = document.getElementById('about-us');
aboutElement.style.display = "block";

// do the scroll if directed
if (event != null && event.type == "wheel") {
window.scrollBy(0, event.deltaY);
}

if (event != null && event.type == "touchmove") {
window.scrollBy(0, event.changedTouches[0].deltaY);
}

// remove obsolete event listeners
document.removeEventListener("touchstart", removeSplashNav);
document.removeEventListener("wheel", removeSplashNav);
}

// homepage: scroll to about
function handleSplashNavClick() {

// scroll to about section
setTimeout(function () {

removeSplashNav();

// scroll to about information
var aboutElement = document.getElementById('about-us');
aboutElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'nearest' });
}, 200);
}
</script>
21 changes: 18 additions & 3 deletions _includes/head-home-styles.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@

.splash h1,
.splash h2,
.splash h3,
.splash p {
color: #bbbbbb;
.splash h3 {
text-wrap: nowrap;
overflow: hidden;
}

.splash h1 {
Expand All @@ -37,6 +37,21 @@
font-size: 2.9em;
font-weight: 500;
}

.splash h2 {
font-size: 1.3em;
}
}

@media screen and (max-width: 380px) {

.splash h1 {
font-size: 2.8em;
}

.splash h2 {
font-size: 1.2em;
}
}

.splash p {
Expand Down
11 changes: 5 additions & 6 deletions _includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@
<meta name="robots" content="noindex, nofollow">
{%- endif -%}
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
<meta name="msapplication-config" content="assets/icons/browserconfig.xml">
<meta name="msapplication-TileColor" content="#1b1b1b">
<meta name="theme-color" content="#1b1b1b">
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
{%- seo -%}

<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preload" as="style" href="https://fonts.googleapis.com/css2?family=Rubik:wght@400..600&display=swap" />
<link defer rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Rubik:wght@400..600&display=swap" />

{%- include head-base-styles.html -%}
Expand All @@ -28,12 +26,13 @@
{
"@context": "https://schema.org",
"@type": "Organization",
"image": "https://facioquo.com/assets/social-banner.png",
"name": "FacioQuo",
"url": "https://facioquo.com/",
"url": "https://facioquo.com",
"logo": "https://facioquo.com/assets/logo.svg"
}
</script>
{%- include utilities.script.html -%}
{%- include head-home-script.html -%}

{%- else -%}
<link defer rel="stylesheet" href="{{ '/assets/css/style.css?v=YYYY.MM.DD' | relative_url }}">
Expand Down
42 changes: 0 additions & 42 deletions _includes/utilities.script.html

This file was deleted.

1 change: 0 additions & 1 deletion _layouts/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
{%- include head.html -%}

<body>
<div class="background-stripes"></div>
<main aria-label="Content" id="main-content">
{{ content }}
</main>
Expand Down
Loading

0 comments on commit 2b2f666

Please sign in to comment.