Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 8a67ce8
Author: iBug <git@ibugone.com>
Date:   Fri Jul 8 23:38:44 2022 +0800

    Improve PR close auto-comment message (mmistakes#3713)

    * Improve auto-comment message

    * Lock these PRs after closing

commit 18e8966
Author: Michael Rose <est.michael@gmail.com>
Date:   Mon May 30 12:18:57 2022 -0400

    Update CHANGELOG and history

commit 5946bd4
Author: iBug <git@ibugone.com>
Date:   Tue May 31 00:13:22 2022 +0800

    Fix mmistakes#3668 breaking "disable per-page when globally enabled" (mmistakes#3669)

    * Fix mmistakes#3668 breaking "disable per-page when globally enabled"

    * `default:` filter doesn't fit here

    https://shopify.github.io/liquid/filters/default/

commit 3d65710
Author: Michael Rose <est.michael@gmail.com>
Date:   Sun May 29 14:35:04 2022 -0400

    Update CHANGELOG and history

commit c940a73
Author: iBug <git@ibugone.com>
Date:   Mon May 30 02:34:11 2022 +0800

    Remove IE9 upgrade notice (mmistakes#3666)

commit e44403e
Author: iBug <git@ibugone.com>
Date:   Mon May 30 02:33:50 2022 +0800

    Fix mmistakes#3096 enabling breadcrumb on all pages (mmistakes#3668)

commit 6f0ba5e
Author: Michael Rose <est.michael@gmail.com>
Date:   Fri May 27 14:08:00 2022 -0400

    Update CHANGELOG and history

commit 955a19b
Author: Michael Rose <est.michael@gmail.com>
Date:   Fri May 27 14:07:03 2022 -0400

    Replace with public YouTube video embeds

commit de1e2b7
Author: Michael Rose <est.michael@gmail.com>
Date:   Fri May 27 14:04:06 2022 -0400

    Replace with public YouTube video

    Close mmistakes#3649

commit 1433887
Merge: 2f5af90 03a26a1
Author: Michael Rose <est.michael@gmail.com>
Date:   Fri May 27 12:25:22 2022 -0400

    Merge branch 'master' of https://github.com/mmistakes/minimal-mistakes

commit 2f5af90
Author: Michael Rose <est.michael@gmail.com>
Date:   Fri May 27 12:25:20 2022 -0400

    Update CHANGELOG and history

commit 03a26a1
Author: FavorMylikes <FavorMylikes@users.noreply.github.com>
Date:   Sat May 28 00:22:43 2022 +0800

    Update algolia-search-scripts.html (mmistakes#3102)

    Fix issue mmistakes#3101

commit 65237df
Author: Lars Olesen <lars@intraface.dk>
Date:   Fri May 27 18:04:56 2022 +0200

    Make it possible to enable breadcrumbs per page (mmistakes#3096)

    * Make it possible to disable breadcrumbs per page

    * Update single.html

    * Update single.html

commit f926704
Author: Michael Rose <est.michael@gmail.com>
Date:   Fri May 27 12:03:17 2022 -0400

    Update CHANGELOG and history

commit cee4c86
Author: iBug <git@ibugone.com>
Date:   Sat May 28 00:02:21 2022 +0800

    Update link to Font Awesome gallery (mmistakes#3599)

commit 58d1ba8
Author: Michael Rose <est.michael@gmail.com>
Date:   Fri May 27 12:01:06 2022 -0400

    Update CHANGELOG and history

commit 8dc2997
Author: Benson Muite <bkmgit@users.noreply.github.com>
Date:   Fri May 27 19:00:08 2022 +0300

    Update attribution link (mmistakes#3553)

commit daf5117
Author: Michael Rose <est.michael@gmail.com>
Date:   Fri May 27 11:59:38 2022 -0400

    Update

commit 416933d
Author: Benson Muite <bkmgit@users.noreply.github.com>
Date:   Fri May 27 18:58:09 2022 +0300

    Add Kiswahili translation (mmistakes#3489)

    * Add Kiswahili translation

    * Add Kiswahli to README

    * Add Kiswahili to documentation

commit 55f6e8f
Author: Michael Rose <est.michael@gmail.com>
Date:   Fri May 27 11:48:46 2022 -0400

    Exclude `main.scss` from Lunr search index

commit bcb15f8
Author: Michael Rose <est.michael@gmail.com>
Date:   Fri May 27 11:41:13 2022 -0400

    Update CHANGELOG and history

commit 00b86b1
Author: Nicholas Perry <ape.inago@gmail.com>
Date:   Fri May 27 11:39:47 2022 -0400

    add optinal lunr searching of pages (mmistakes#3352)

commit a66bf7e
Author: Michael Rose <est.michael@gmail.com>
Date:   Fri May 27 10:38:07 2022 -0400

    Update CHANGELOG and history

commit 3f36d17
Author: Nicholas Perry <ape.inago@gmail.com>
Date:   Fri May 27 10:34:47 2022 -0400

    fix typo about loading javascript in footer (mmistakes#3350)

commit 4ef57be
Author: Michael Rose <est.michael@gmail.com>
Date:   Fri May 27 10:18:51 2022 -0400

    Update CHANGELOG and history

commit df97788
Author: Lars Olesen <lars@intraface.dk>
Date:   Fri May 27 16:12:25 2022 +0200

    Update to Jquery 3.6.0 (mmistakes#3254)

commit a499b0d
Author: Michael Rose <est.michael@gmail.com>
Date:   Fri May 27 10:07:45 2022 -0400

    Update CHANGELOG and history

commit 3051fcd
Author: iBug <git@ibugone.com>
Date:   Fri May 27 22:06:37 2022 +0800

    Fix inline code style not applied to stylized text (mmistakes#3253)

    * bug: inline code style not applied to stylized text

    * Use double colons for pseudoelements

commit 4e19f46
Merge: 7aa8c7b 23e7ad2
Author: Michael Rose <est.michael@gmail.com>
Date:   Fri May 27 10:03:05 2022 -0400

    Merge branch 'master' of https://github.com/mmistakes/minimal-mistakes

commit 7aa8c7b
Author: Michael Rose <est.michael@gmail.com>
Date:   Fri May 27 10:03:02 2022 -0400

    Update CHANGELOG and history

commit 23e7ad2
Author: iBug <git@ibugone.com>
Date:   Fri May 27 21:59:38 2022 +0800

    Use <a> color for blockquote.notice border (mmistakes#3140)

    Close mmistakes#3068

commit a19dbdb
Author: Michael Rose <est.michael@gmail.com>
Date:   Fri May 27 09:50:20 2022 -0400

    Update CHANGELOG and history

commit 8b67db3
Author: Lars Olesen <lars@intraface.dk>
Date:   Fri May 27 15:49:00 2022 +0200

    Added sameAs (mmistakes#3087)
  • Loading branch information
canaytore committed Oct 14, 2022
1 parent 848fed1 commit f04fb4c
Show file tree
Hide file tree
Showing 18 changed files with 1,117 additions and 149 deletions.
2 changes: 2 additions & 0 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ atom_feed:
search : true # true, false (default)
search_full_content : true # true, false (default)
search_provider : google # lunr (default), algolia, google
lunr:
search_within_pages : # true, false (default)
algolia:
application_id : # YOUR_APPLICATION_ID
index_name : # YOUR_INDEX_NAME
Expand Down
55 changes: 55 additions & 0 deletions _data/ui-text.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1964,6 +1964,61 @@ ar-AE:
ar-EG:
<<: *DEFAULT_AR

# Kiswahili
# -----------------
sw: &DEFAULT_SW
skip_links : "Ruka viungo"
skip_primary_nav : "Ruka orodha kuu"
skip_content : "Ruka maandiko maakuu"
skip_footer : "Ruka chini"
page : "Ukurasa"
pagination_previous : "Rudi"
pagination_next : "Endelea"
breadcrumb_home_label : "Ukurasa wa kwanza"
breadcrumb_separator : "/"
menu_label : "Wezesha/Zima orodha"
search_label : "Wezesha/Zima kutafuta"
toc_label : "Kwa ukurasa huu"
ext_link_label : "Kiungo mbio"
less_than : "Soma kwa dakikia ndogo kuliko"
minute_read : "Soma kwa dakika"
share_on_label : "Tangaza"
meta_label :
tags_label : "Alama:"
categories_label : "Aina:"
date_label : "Geuzi ya mwisho:"
comments_label : "Wacha maoni"
comments_title : "Maoni"
more_label : "Jifunze zaidi"
related_label : "Pia, utapenda"
follow_label : "Fuata:"
feed_label : "Feed"
powered_by : "Inatumia"
website_label : "Tovuti"
email_label : "Barua pepe"
recent_posts : "Makala juzi"
undefined_wpm : "Ingizo words_per_minute kwa _config.yml haijawekwa"
comment_form_info : "Barua pepe yako haitaonekana. Kuna alama kwa ingizo tunahitaji."
comment_form_comment_label : "Maoni"
comment_form_md_info : "Unaweza kutumia `Markdown`."
comment_form_name_label : "Jina"
comment_form_email_label : "Barua pepe"
comment_form_website_label : "Tovuti (hiari)"
comment_btn_submit : "Tuma maoni"
comment_btn_submitted : "Umetuma"
comment_success_msg : "Asante kwa maoni yako! Itaonekana ikiridhiwa."
comment_error_msg : "Pole, kuna makosa kwa ingizo yako. Tafadhali angalia umeandika kwa ingizo zote zinahitaji, na jaribu tena."
loading_label : "Inapakiwa..."
search_label_text : "Ingiza neno unatafuta..."
search_placeholder_text : "Ingiza neno unatafuta..."
search_algolia_no_results : "Hakuna matokeo"
results_found : "Tumepata"
back_to_top : "Rudi juu"
sw-KE:
<<: *DEFAULT_SW
sw-TZ:
<<: *DEFAULT_SW

# Another locale
# --------------
#
4 changes: 2 additions & 2 deletions _includes/author-profile.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ <h3 class="author__name p-name" itemprop="name">
{% if author.links %}
{% for link in author.links %}
{% if link.label and link.url %}
<li><a href="{{ link.url }}" target="_blank" rel="nofollow noopener noreferrer me"><i class="{{ link.icon | default: 'fas fa-link' }}" aria-hidden="true"></i><span class="label">{{ link.label }}</span></a></li>
<li><a href="{{ link.url }}" target="_blank" rel="nofollow noopener noreferrer me"{% if link.url contains 'http' %} itemprop="sameAs"{% endif %}><i class="{{ link.icon | default: 'fas fa-link' }}" aria-hidden="true"></i><span class="label">{{ link.label }}</span></a></li>
{% endif %}
{% endfor %}
{% endif %}
Expand Down Expand Up @@ -278,4 +278,4 @@ <h3 class="author__name p-name" itemprop="name">

</ul>
</div>
</div>
</div>
3 changes: 0 additions & 3 deletions _includes/browser-upgrade.html

This file was deleted.

5 changes: 3 additions & 2 deletions _includes/search/algolia-search-scripts.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@

const hitTemplate = function(hit) {
const url = hit.url;
const title = hit._highlightResult.title.value;
const content = hit._highlightResult.html.value;
const hightlight = hit._highlightResult;
const title = hightlight.title && hightlight.title.value || "";
const content = hightlight.html && hightlight.html.value || "";

return `
<div class="list__item">
Expand Down
1 change: 0 additions & 1 deletion _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

<body class="layout--{{ page.layout | default: layout.layout }}{% if page.classes or layout.classes %}{{ page.classes | default: layout.classes | join: ' ' | prepend: ' ' }}{% endif %}">
{% include_cached skip-links.html %}
{% include_cached browser-upgrade.html %}
{% include_cached masthead.html %}

<div class="initial-content">
Expand Down
6 changes: 5 additions & 1 deletion _layouts/single.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@
{% include page__hero_video.html %}
{% endif %}

{% if page.url != "/" and site.breadcrumbs %}
{% assign breadcrumbs_enabled = site.breadcrumbs %}
{% if page.breadcrumbs != null %}
{% assign breadcrumbs_enabled = page.breadcrumbs %}
{% endif %}
{% if page.url != "/" and breadcrumbs_enabled %}
{% unless paginator %}
{% include breadcrumbs.html %}
{% endunless %}
Expand Down
18 changes: 0 additions & 18 deletions _sass/minimal-mistakes/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -160,24 +160,6 @@ pre {
overflow-x: auto; /* add scrollbars to wide code blocks*/
}

p > code,
a > code,
li > code,
figcaption > code,
td > code {
padding-top: 0.1rem;
padding-bottom: 0.1rem;
font-size: 0.8em;
background: $code-background-color;
border-radius: $border-radius;

&:before,
&:after {
letter-spacing: -0.2em;
content: "\00a0"; /* non-breaking space*/
}
}

/* horizontal rule */

hr {
Expand Down
4 changes: 4 additions & 0 deletions _sass/minimal-mistakes/_notices.scss
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@
}
}

@at-root #{selector-unify(&, "blockquote")} {
border-left-color: mix(#000, $notice-color, 10%);
}

code {
background-color: mix($background-color, $notice-color, $code-notice-background-mix)
}
Expand Down
16 changes: 15 additions & 1 deletion _sass/minimal-mistakes/_page.scss
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,20 @@ body {
}
}

:not(pre) > code {
padding-top: 0.1rem;
padding-bottom: 0.1rem;
font-size: 0.8em;
background: $code-background-color;
border-radius: $border-radius;

&::before,
&::after {
letter-spacing: -0.2em;
content: "\00a0"; /* non-breaking space*/
}
}

dt {
margin-top: 1em;
font-family: $sans-serif;
Expand Down Expand Up @@ -561,4 +575,4 @@ body {
padding-right: 0;
}
}
}
}
1 change: 1 addition & 0 deletions assets/css/main.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
# Only the main Sass file needs front matter (the dashes are enough)
search: false
---

@charset "utf-8";
Expand Down
12 changes: 6 additions & 6 deletions assets/js/_main.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
jQuery plugin settings and other scripts
========================================================================== */

$(document).ready(function() {
$(function() {
// FitVids init
$("#main").fitVids();

// Sticky sidebar
var stickySideBar = function() {
var show =
$(".author__urls-wrapper button").length === 0
$(".author__urls-wrapper").find("button").length === 0
? $(window).width() > 1024 // width should match $large Sass variable
: !$(".author__urls-wrapper button").is(":visible");
: !$(".author__urls-wrapper").find("button").is(":visible");
if (show) {
// fix
$(".sidebar").addClass("sticky");
Expand All @@ -28,9 +28,9 @@ $(document).ready(function() {
});

// Follow menu drop down
$(".author__urls-wrapper button").on("click", function() {
$(".author__urls-wrapper").find("button").on("click", function() {
$(".author__urls").toggleClass("is--visible");
$(".author__urls-wrapper button").toggleClass("open");
$(".author__urls-wrapper").find("button").toggleClass("open");
});

// Close search screen with Esc key
Expand All @@ -49,7 +49,7 @@ $(document).ready(function() {
$(".initial-content").toggleClass("is--hidden");
// set focus on input
setTimeout(function() {
$(".search-content input").focus();
$(".search-content").find("input").focus();
}, 400);
});

Expand Down
37 changes: 36 additions & 1 deletion assets/js/lunr/lunr-store.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,39 @@ var store = [
"teaser": {{ teaser | relative_url | jsonify }}
}{%- unless forloop.last and l -%},{%- endunless -%}
{%- endfor -%}
{%- endfor -%}]
{%- endfor -%}{%- if site.lunr.search_within_pages -%},
{%- assign pages = site.pages | where_exp:'doc','doc.search != false' -%}
{%- for doc in pages -%}
{%- if forloop.last -%}
{%- assign l = true -%}
{%- endif -%}
{
"title": {{ doc.title | jsonify }},
"excerpt":
{%- if site.search_full_content == true -%}
{{ doc.content | newline_to_br |
replace:"<br />", " " |
replace:"</p>", " " |
replace:"</h1>", " " |
replace:"</h2>", " " |
replace:"</h3>", " " |
replace:"</h4>", " " |
replace:"</h5>", " " |
replace:"</h6>", " "|
strip_html | strip_newlines | jsonify }},
{%- else -%}
{{ doc.content | newline_to_br |
replace:"<br />", " " |
replace:"</p>", " " |
replace:"</h1>", " " |
replace:"</h2>", " " |
replace:"</h3>", " " |
replace:"</h4>", " " |
replace:"</h5>", " " |
replace:"</h6>", " "|
strip_html | strip_newlines | truncatewords: 50 | jsonify }},
{%- endif -%}
"url": {{ doc.url | absolute_url | jsonify }}
}{%- unless forloop.last and l -%},{%- endunless -%}
{%- endfor -%}
{%- endif -%}]
2 changes: 1 addition & 1 deletion assets/js/main.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions assets/js/plugins/jquery.greedy-navigation.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
GreedyNav.js - http://lukejacksonn.com/actuate
GreedyNav.js - https://github.com/lukejacksonn/GreedyNav
Licensed under the MIT license - http://opensource.org/licenses/MIT
Copyright (c) 2015 Luke Jackson
Copyright (c) 2015 Luke Jackson http://lukejacksonn.com
*/

$(function() {
Expand Down
Loading

1 comment on commit f04fb4c

@canaytore
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merged with upstream master branch (minimal-mistakes)

Please sign in to comment.