Compare commits

...
18 Commits
Author SHA1 Message Date
Michael Rose 233dcde6f9 Merge branch 'release/3.4.5' 2016-09-09 10:12:25 -04:00
Michael Rose 3889ff311e Update CHANGELOG.md and bump version to 3.4.5 2016-09-09 10:12:07 -04:00
Michael Rose 3c034e59f4 Improve styling of {% highlight %} tag code blocks
- Fix alignment in issues in Firefox
- Remove table borders from `linenos`
- Harmonize padding and font-sizes
- Close #513 and close #512
2016-09-09 09:58:27 -04:00
Roger Schaerer 0c2d3bbb9f get Follow-Button label from ui-text and default to "Follow" (#496) 2016-09-02 08:33:54 -04:00
Michael Rose a718162d96 Merge branch 'uru-ch-clarified-comment-stackoverflow-author-profile' into develop
* uru-ch-clarified-comment-stackoverflow-author-profile:
  clarified comment for author.stackoverflow value
2016-08-29 21:46:06 -04:00
rschaerer d3ac1123da clarified comment for author.stackoverflow value 2016-08-29 01:39:27 +02:00
Michael Rose a40e93fa41 Merge branch 'release/3.4.4' into develop 2016-08-25 14:34:08 -04:00
Michael Rose 50c1dfe4cf Merge branch 'release/3.4.4' 2016-08-25 14:34:03 -04:00
Michael Rose bcae932f8c Update CHANGELOG.md and bump version to 3.4.4 2016-08-25 14:33:44 -04:00
Michael Rose 467e5dc84e Update gems: colorator (1.1.0), forwardable-extended (2.6.0), github-pages (93), jekyll (= 3.2.1), minima (= 1.0.1) 2016-08-25 14:28:51 -04:00
Michael Rose bff773668b Merge branch 'feature/fix-page-hero-liquid-warning' into develop 2016-08-25 14:25:31 -04:00
Michael Rose 86a4ca6e2d Merge branch 'hotfix' of https://github.com/vwchu/minimal-mistakes into feature/fix-page-hero-liquid-warning 2016-08-25 14:24:14 -04:00
Vincent Chu 0d6816e770 Fix Liquid syntax error for offending parentheses
Liquid Warning: Liquid syntax error (line 3): Expected dotdot but found id in "(page.header.overlay_color or page.header.overlay_image) or page.header.image" in /_layouts/single.html
Liquid Warning: Liquid syntax error (line 1): Expected dotdot but found id in "(page.header.overlay_color or page.header.overlay_image) or page.header.image" in /_layouts/archive.html
Liquid Warning: Liquid syntax error (line 3): Expected dotdot but found id in "(page.header.overlay_color or page.header.overlay_image) or page.header.image" in /_layouts/splash.html
2016-08-25 13:20:38 -04:00
Michael Rose 16a1a9a505 Exclude vendor 2016-08-23 08:53:39 -04:00
Michael Rose 3c12f7c168 Merge branch 'feature/fr-translations' into develop 2016-08-23 08:48:34 -04:00
Michael Rose 8bbf9bb62b Merge branch 'master' of https://github.com/flohw/minimal-mistakes into feature/fr-translations 2016-08-23 08:47:57 -04:00
Flohw 306d6b40b0 Add french translations 2016-08-23 10:00:37 +02:00
Michael Rose 4be38f4c8a Merge branch 'release/3.4.3' into develop 2016-08-22 09:20:05 -04:00
10 changed files with 95 additions and 31 deletions
+33
View File
@@ -1,3 +1,36 @@
## [3.4.5](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.4.5)
### Enhancements
- Improve line numbered code block styling when using `{% highlight linenos %}` tag. [#513](https://github.com/mmistakes/minimal-mistakes/issues/513)
- Add English fallback to "Follow" button label. [#496](https://github.com/mmistakes/minimal-mistakes/pull/496)
### Bug Fixes
- Fix Firefox alignment issues with code blocks generated with the `{% highlight %}` tag. [#512](https://github.com/mmistakes/minimal-mistakes/issues/512)
### Maintenance
- Clarified comment for `author.stackoverflow` value used in author sidebar links. [#487](https://github.com/mmistakes/minimal-mistakes/pull/487)
- Add list of localized text strings. [#488](https://github.com/mmistakes/minimal-mistakes/pull/488)
- Add `{% highlight %}` code block examples to demo site.
- Add documentation for using custom sidebar navigation menus. [#476](https://github.com/mmistakes/minimal-mistakes/issues/476)
## [3.4.4](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.4.4)
### Enhancements
- Add French "comments" related localized UI text. [#472](https://github.com/mmistakes/minimal-mistakes/pull/472)
### Bug Fixes
- Exclude `vendor` in Jekyll config file.
- Fix Liquid syntax error for offending parenthesis. [#479](https://github.com/mmistakes/minimal-mistakes/issues/479)
### Maintenance
- Update gems: `colorator` (1.1.0), `forwardable-extended` (2.6.0), `github-pages` (93), `jekyll` (= 3.2.1), `minima` (= 1.0.1).
## [3.4.3](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.4.3)
### Enhancements
+13 -7
View File
@@ -12,7 +12,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.10.0)
colorator (0.1)
colorator (1.1.0)
ethon (0.9.0)
ffi (>= 1.3.0)
execjs (2.7.0)
@@ -20,11 +20,12 @@ GEM
multipart-post (>= 1.2, < 3)
ffi (1.9.14)
ffi (1.9.14-x64-mingw32)
forwardable-extended (2.6.0)
gemoji (2.1.0)
github-pages (89)
github-pages (93)
activesupport (= 4.2.7)
github-pages-health-check (= 1.1.0)
jekyll (= 3.1.6)
github-pages-health-check (= 1.2.0)
jekyll (= 3.2.1)
jekyll-coffeescript (= 1.0.1)
jekyll-feed (= 0.5.1)
jekyll-gist (= 1.4.0)
@@ -40,9 +41,10 @@ GEM
liquid (= 3.0.6)
listen (= 3.0.6)
mercenary (~> 0.3)
minima (= 1.0.1)
rouge (= 1.11.1)
terminal-table (~> 1.4)
github-pages-health-check (1.1.0)
github-pages-health-check (1.2.0)
addressable (~> 2.3)
net-dns (~> 0.8)
octokit (~> 4.0)
@@ -52,13 +54,14 @@ GEM
activesupport (>= 2)
nokogiri (>= 1.4)
i18n (0.7.0)
jekyll (3.1.6)
colorator (~> 0.1)
jekyll (3.2.1)
colorator (~> 1.0)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 1.1)
kramdown (~> 1.3)
liquid (~> 3.0)
mercenary (~> 0.3.3)
pathutil (~> 0.9)
rouge (~> 1.7)
safe_yaml (~> 1.0)
jekyll-coffeescript (1.0.1)
@@ -95,6 +98,7 @@ GEM
rb-inotify (>= 0.9.7)
mercenary (0.3.6)
mini_portile2 (2.1.0)
minima (1.0.1)
minitest (5.9.0)
multipart-post (2.0.0)
net-dns (0.8.0)
@@ -106,6 +110,8 @@ GEM
pkg-config (~> 1.1.7)
octokit (4.3.0)
sawyer (~> 0.7.0, >= 0.5.3)
pathutil (0.14.0)
forwardable-extended (~> 2.6)
pkg-config (1.1.7)
public_suffix (1.5.3)
rb-fsevent (0.9.7)
+2 -1
View File
@@ -97,7 +97,7 @@ author:
linkedin :
pinterest :
soundcloud :
stackoverflow : # http://stackoverflow.com/users/123456/username
stackoverflow : # "123456/username" (the last part of your profile url, e.g. http://stackoverflow.com/users/123456/username)
steam :
tumblr :
twitter :
@@ -114,6 +114,7 @@ include:
exclude:
- "*.sublime-project"
- "*.sublime-workspace"
- vendor
- .asset-cache
- .bundle
- .jekyll-assets-cache
+12 -11
View File
@@ -120,17 +120,18 @@ fr: &DEFAULT_FR
email_label : "Email"
recent_posts : "Posts récents"
undefined_wpm : "Le paramètre words_per_minute n'est pas défini dans _config.yml"
comment_form_info :
comment_form_comment_label :
comment_form_md_info :
comment_form_name_label :
comment_form_email_label :
comment_form_website_label :
comment_btn_submit :
comment_btn_submitted :
comment_success_msg :
comment_error_msg :
loading_label :
comments_title : "Commentaires"
comment_form_info : "Votre adresse email ne sera pas visible. Les champs obligatoires sont marqués"
comment_form_comment_label : "Commentaire"
comment_form_md_info : "Markdown est supporté."
comment_form_name_label : "Nom"
comment_form_email_label : "Adresse mail"
comment_form_website_label : "Site web (optionnel)"
comment_btn_submit : "Envoyer"
comment_btn_submitted : "Envoyé"
comment_success_msg : "Merci pour votre comentaire, il sera visible sur le site une fois approuvé."
comment_error_msg : "Désolé, une erreur est survenue lors de la soumission. Vérifiez que les champs obligatoires ont été remplis et réessayez."
loading_label : "Chargement..."
fr-FR:
<<: *DEFAULT_FR
fr-BE:
+1 -1
View File
@@ -20,7 +20,7 @@
</div>
<div class="author__urls-wrapper">
<button class="btn btn--inverse">Follow</button>
<button class="btn btn--inverse">{{ site.data.ui-text[site.locale].follow_label | remove: ":" | default: "Follow" }}</button>
<ul class="author__urls social-icons">
{% if author.location %}
<li><i class="fa fa-fw fa-map-marker" aria-hidden="true"></i> {{ author.location }}</li>
+1 -1
View File
@@ -2,7 +2,7 @@
layout: default
---
{% if (page.header.overlay_color or page.header.overlay_image) or page.header.image %}
{% if page.header.overlay_color or page.header.overlay_image or page.header.image %}
{% include page__hero.html %}
{% endif %}
+1 -1
View File
@@ -4,7 +4,7 @@ layout: default
{% include base_path %}
{% if (page.header.overlay_color or page.header.overlay_image) or page.header.image %}
{% if page.header.overlay_color or page.header.overlay_image or page.header.image %}
{% include page__hero.html %}
{% endif %}
+1 -1
View File
@@ -4,7 +4,7 @@ layout: default
{% include base_path %}
{% if (page.header.overlay_color or page.header.overlay_image) or page.header.image %}
{% if page.header.overlay_color or page.header.overlay_image or page.header.image %}
{% include page__hero.html %}
{% endif %}
+30 -7
View File
@@ -2,9 +2,13 @@
Syntax highlighting
========================================================================== */
div.highlighter-rouge, figure.highlight {
div.highlighter-rouge,
figure.highlight {
position: relative;
margin-bottom: 1em;
font-family: $monospace;
font-size: $type-size-7;
line-height: 1.8;
border: 1px solid $border-color;
border-radius: $border-radius;
background-color: $code-background-color;
@@ -18,7 +22,6 @@ div.highlighter-rouge, figure.highlight {
background-color: $lighter-gray;
content: "\f121";
font-family: "fontawesome" !important;
font-size: $type-size-6;
line-height: 1;
text-transform: none;
speak: none;
@@ -27,15 +30,35 @@ div.highlighter-rouge, figure.highlight {
.highlight {
margin: 0;
padding: 1em;
font-family: $monospace;
font-size: $type-size-7;
line-height: 1.8;
}
}
.highlight table td { padding: 5px; }
.highlight table pre { margin: 0; }
figure.highlight {
padding-left: 1em;
padding-right: 1em;
}
.highlight table {
font-size: 1em;
border: 0;
td {
padding: 5px;
border: 0;
// line numbers
&.gutter {
padding-right: 1em;
color: $light-gray;
}
}
pre {
margin: 0;
}
}
.highlight pre { width: 100%; }
/*
Solarized Light
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "minimal-mistakes",
"version": "3.4.3",
"version": "3.4.5",
"description": "Minimal Mistakes Jekyll theme npm build scripts",
"repository": {
"type": "git",