Skip to content

Commit built html #1163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
19 changes: 0 additions & 19 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,6 @@ task:

build_and_test_script: make all

task:
name: debian only
container:
image: debian:bookworm
install_script:
- apt update
- >
apt install -y
curl
jekyll
make
ruby
ruby-jekyll-redirect-from
ruby-kramdown-parser-gfm
ruby-html-proofer
build_and_test_script:
- rm Gemfile.lock
- make all

task:
name: verify commits
only_if: $CIRRUS_BRANCH == 'master'
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
_site
.sass-cache
.jekyll-metadata
8 changes: 8 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,11 @@ test-fast:
! find _site/ -name '*.html' | xargs grep ']\[' | grep -v skip-test | grep .
## Ensure that no template strings leak through liquid rendering
! find _site/ -name '*.html' | xargs grep '\$$(.*)'

## Check if the generated site differs
@if [ -n "$(shell git status --porcelain -- _site)" ]; then \
echo "FAILED: Built site differs from committed"; \
false; \
else \
echo "SUCCESS"; \
fi
2 changes: 2 additions & 0 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@ highlighter: rouge
sass:
sass_dir: _sass
style: compressed
sourcemap: never
plugins:
- jekyll-redirect-from
timezone: "UTC"

kramdown:
auto_ids: true
Expand Down
8 changes: 4 additions & 4 deletions _layouts/feed.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<title type="text">{{ site.title }}</title>
<link rel="self" type="application/atom+xml" href="{{ site.url }}/{{ page.lang }}/feed.xml" />
<link rel="alternate" type="text/html" href="{{ site.url }}" />
<updated>{{ site.time | date_to_xmlschema }}</updated>
{% assign posts=site.posts | where:"lang", page.lang | where:"type", 'posts' %}
{% assign advisories=site.posts | where:"lang", 'en' | where:"type", 'advisory' %}
{% assign all=advisories | concat: posts | sort: "date" | reverse %}
<updated>{{ all.first.git-last-modified-date | date_to_xmlschema }}</updated>
<id>{{ post.id }}</id>
<author>
<name>{{ site.owner.name }}</name>
<uri>{{ site.url }}{{ post.url }}</uri>
</author>
{% assign posts=site.posts | where:"lang", page.lang | where:"type", 'posts' %}
{% assign advisories=site.posts | where:"lang", 'en' | where:"type", 'advisory' %}
{% assign all=advisories | concat: posts | sort: "date" | reverse %}
{% for post in all limit:20 %}
{% if post.author %}
{% assign author = site.data.authors[post.author] %}
Expand Down
9 changes: 9 additions & 0 deletions _plugins/git-last-modified-date.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Jekyll::Hooks.register :documents, :post_init do |post|

# get the current post last modified time
modification_time = `git log -1 --format="%ci" #{post.path}`

# inject modification_time in post's datas.
post.data['git-last-modified-date'] = modification_time

end
12 changes: 7 additions & 5 deletions _sass/grid.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
Grid mixins
========================================================================== */

@use "sass:math";

/*
Define number of columns in the grid
Common values would be 12, 16 or 24
Expand All @@ -24,7 +26,7 @@ $margin: 0;
@mixin grid($grid:$def_grid,$cols:'',$float:left,$display:inline){
display:$display;
float:$float;
width:(100%/$grid * $cols) - ($margin * 2);
width:(math.div(100%, $grid) * $cols) - ($margin * 2);
}

/*
Expand All @@ -33,7 +35,7 @@ $margin: 0;
========================================================================== */

@mixin prefix($grid:$def_grid,$cols:''){
margin-left:(100%/$grid * $cols);
margin-left:(math.div(100%, $grid) * $cols);
}

/*
Expand All @@ -42,7 +44,7 @@ $margin: 0;
========================================================================== */

@mixin suffix($grid:$def_grid,$cols:''){
margin-right:(100%/$grid * $cols);
margin-right:(math.div(100%, $grid) * $cols);
}

/*
Expand Down Expand Up @@ -70,7 +72,7 @@ $margin: 0;

@mixin push($grid:$def_grid,$move:'') {
position:relative;
left:(100%/$grid * $move);
left:(math.div(100%, $grid) * $move);
}

/*
Expand All @@ -80,5 +82,5 @@ $margin: 0;

@mixin pull($grid:$def_grid,$move:''){
position:relative;
left:(100%/$grid * $move) * -1;
left:(math.div(100%, $grid) * $move) * -1;
}
16 changes: 9 additions & 7 deletions _sass/mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
Utility mixins
========================================================================== */

@use "sass:math";

/*
Clearfix
For clearing floats like a boss h5bp.com/q
Expand Down Expand Up @@ -56,10 +58,10 @@

@mixin font-size($size) {
font-size: 0px + $size;
font-size: 0rem + $size / $doc-font-size;
line-height: 0 + round($doc-line-height / $size*10000) / 10000;
font-size: 0rem + math.div($size, $doc-font-size);
line-height: 0 + math.div(round(math.div($doc-line-height, $size) * 10000), 10000);
margin-bottom: 0px + $doc-line-height;
margin-bottom: 0rem + ($doc-line-height / $doc-font-size);
margin-bottom: 0rem + math.div($doc-line-height, $doc-font-size);
}

/*
Expand All @@ -69,7 +71,7 @@

@mixin font-rem($size) {
font-size: 0px + $size;
font-size: 0rem + $size / $doc-font-size;
font-size: 0rem + math.div($size, $doc-font-size);
}

/*
Expand All @@ -79,8 +81,8 @@

@mixin font($size) {
font-size: 0px + $size;
font-size: 0rem + $size / $doc-font-size;
line-height: 0 + round($doc-line-height / $size*10000) / 10000;
font-size: 0rem + math.div($size, $doc-font-size);
line-height: 0 + math.div(round(math.div($doc-line-height, $size) * 10000), 10000);
}

/*
Expand All @@ -95,7 +97,7 @@

/* Indentation variable */

$indent-var: 0rem + ($doc-line-height / $doc-font-size);
$indent-var: 0rem + math.div($doc-line-height, $doc-font-size);

/* ==========================================================================
Gradient mixins
Expand Down
26 changes: 14 additions & 12 deletions _sass/page.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
Page layout
========================================================================== */

@use "sass:math";

body {
background-color: $bodycolor;
font-family: $base-font;
Expand Down Expand Up @@ -131,18 +133,18 @@ $button-size: 1.5rem;
@mixin navicon-line() {
display: inline-block;
width: $button-size;
height: $button-size/7;
height: math.div($button-size, 7);
// line color
background: $white;
border-radius: $button-size/14;
border-radius: math.div($button-size, 14);
transition: .3s;
}
.navicon-lines-button {
padding: $button-size/4 $button-size/2;
padding: math.div($button-size, 4) math.div($button-size, 2);
transition: .3s;
cursor: pointer;
user-select: none;
border-radius: $button-size/7;
border-radius: math.div($button-size, 7);
}
.navicon-lines-button:hover {
opacity: 1;
Expand All @@ -152,7 +154,7 @@ $button-size: 1.5rem;
}
.navicon-lines {
margin-right: 10px;
margin-bottom: $button-size/5;
margin-bottom: math.div($button-size, 5);
// create middle line
@include navicon-line;
position: relative;
Expand All @@ -163,17 +165,17 @@ $button-size: 1.5rem;
position: absolute;
left: 0;
content: '';
-webkit-transform-origin: $button-size/14 center;
transform-origin: $button-size/14 center;
-webkit-transform-origin: math.div($button-size, 14) center;
transform-origin: math.div($button-size, 14) center;
}
&:before { top: $button-size/4; }
&:after { top: -$button-size/4; }
&:before { top: math.div($button-size, 4); }
&:after { top: - math.div($button-size, 4); }
}
.navicon-lines-button:hover {
opacity: 1;
.navicon-lines {
&:before { top: $button-size/3.5; }
&:after { top: -$button-size/3.5; }
&:before { top: math.div($button-size, 3.5); }
&:after { top: - math.div($button-size, 3.5); }
}
}
.navicon-lines-button.x.active .navicon-lines {
Expand Down Expand Up @@ -491,7 +493,7 @@ li.lang:hover {
@include font-rem(20);
&.link-post {
margin-bottom: 0px + $doc-line-height;
margin-bottom: 0rem + ($doc-line-height / $doc-font-size);
margin-bottom: 0rem + math.div($doc-line-height, $doc-font-size);
}
}
p {
Expand Down
5 changes: 4 additions & 1 deletion _sass/vendor/font-awesome/_fixed-width.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// Fixed Width Icons
// -------------------------

@use "sass:math";

.#{$fa-css-prefix}-fw {
width: (18em / 14);
width: math.div(18em, 14);
text-align: center;
}
6 changes: 4 additions & 2 deletions _sass/vendor/font-awesome/_larger.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
// Icon Sizes
// -------------------------

@use "sass:math";

/* makes the font 33% larger relative to the icon container */
.#{$fa-css-prefix}-lg {
font-size: (4em / 3);
line-height: (3em / 4);
font-size: math.div(4em, 3);
line-height: math.div(3em, 4);
vertical-align: -15%;
}
.#{$fa-css-prefix}-2x { font-size: 2em; }
Expand Down
6 changes: 4 additions & 2 deletions _sass/vendor/font-awesome/_list.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// List Icons
// -------------------------

@use "sass:math";

.#{$fa-css-prefix}-ul {
padding-left: 0;
margin-left: $fa-li-width;
Expand All @@ -11,9 +13,9 @@
position: absolute;
left: -$fa-li-width;
width: $fa-li-width;
top: (2em / 14);
top: math.div(2em, 14);
text-align: center;
&.#{$fa-css-prefix}-lg {
left: -$fa-li-width + (4em / 14);
left: -$fa-li-width + math.div(4em, 14);
}
}
4 changes: 3 additions & 1 deletion _sass/vendor/font-awesome/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Variables
// --------------------------

@use "sass:math";

$fa-font-path: "../fonts" !default;
$fa-font-size-base: 14px !default;
$fa-line-height-base: 1 !default;
Expand All @@ -9,7 +11,7 @@ $fa-css-prefix: fa !default;
$fa-version: "4.5.0" !default;
$fa-border-color: #eee !default;
$fa-inverse: #fff !default;
$fa-li-width: (30em / 14) !default;
$fa-li-width: math.div(30em, 14) !default;

$fa-var-500px: "\f26e";
$fa-var-adjust: "\f042";
Expand Down
4 changes: 3 additions & 1 deletion _sass/vendor/magnific-popup/_settings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
// Settings //
////////////////////////

@use "sass:math";

// overlay
$mfp-overlay-color: $black; // Color of overlay screen
$mfp-overlay-opacity: 0.8; // Opacity of overlay screen
Expand All @@ -28,7 +30,7 @@ $mfp-include-iframe-type: true; // Enable Ifra
$mfp-iframe-padding-top: 40px; // Iframe padding top
$mfp-iframe-background: #000; // Background color of iframes
$mfp-iframe-max-width: 900px; // Maximum width of iframes
$mfp-iframe-ratio: 9/16; // Ratio of iframe (9/16 = widescreen, 3/4 = standard, etc.)
$mfp-iframe-ratio: math.div(9, 16); // Ratio of iframe (9/16 = widescreen, 3/4 = standard, etc.)

// Image-type options
$mfp-include-image-type: true; // Enable Image-type popups
Expand Down
1 change: 1 addition & 0 deletions _site/.well-known/org.flathub.VerifiedApps.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ee5fdbb1-f509-427a-abf7-812f247d883b
Loading