Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 32462a7

Browse files
RobinYuRobinYu
committedMar 7, 2017
fix Invalid CSS after "allowed": expected "{", was ";" on line 1
1 parent d5037a8 commit 32462a7

File tree

8 files changed

+68
-41
lines changed

8 files changed

+68
-41
lines changed
 

‎README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ See what's new in the [CHANGELOG](CHANGELOG.md).
2525
- Optional [header images](https://mmistakes.github.io/minimal-mistakes/docs/layouts/#headers), [custom sidebars](https://mmistakes.github.io/minimal-mistakes/docs/layouts/#sidebars), [table of contents](https://mmistakes.github.io/minimal-mistakes/docs/helpers/#table-of-contents), [galleries](https://mmistakes.github.io/minimal-mistakes/docs/helpers/#gallery), related posts, [breadcrumb links](https://mmistakes.github.io/minimal-mistakes/docs/configuration/#breadcrumb-navigation-beta), [navigation lists](https://mmistakes.github.io/minimal-mistakes/docs/helpers/#navigation-list), and more.
2626
- Commenting support (powered by [Disqus](https://disqus.com/), [Facebook](https://developers.facebook.com/docs/plugins/comments), Google+, [Discourse](https://www.discourse.org/), static-based via [Staticman](https://staticman.net/), and custom).
2727
- [Google Analytics](https://www.google.com/analytics/) support.
28-
- UI localized text in English (default), Brazilian Portuguese, Chinese, French, German, Italian, Spanish, and Turkish
28+
- UI localized text in English (default), Brazilian Portuguese, Chinese, French, German, Italian, Korean, Nepali (Nepalese), Russian, Spanish, and Turkish
2929

3030
## Demo Pages
3131

@@ -98,7 +98,7 @@ Theme documentation and demo pages can be found in the [`/docs`](docs) if submit
9898

9999
To set up your environment to develop this theme, run `bundle install`.
100100

101-
To test the theme, run `bundle exec rake preview` and open your browser at `http://localhost:4000/test/`. This starts a Jekyll server using your theme and the contents of the `test/` directory. As you make modifications to your theme and to the example site, your site will regenerate and you should see the changes in the browser after a refresh.
101+
To test the theme, run `bundle exec rake preview` and open your browser at `http://localhost:4000/test/`. This starts a Jekyll server using content in the `test/` directory. As modifications are made to the theme and test site, it will regenerate and you should see the changes in the browser after a refresh.
102102

103103
---
104104

@@ -129,7 +129,6 @@ To test the theme, run `bundle exec rake preview` and open your browser at `http
129129
- Greedy Navigation - [lukejacksonn](http://codepen.io/lukejacksonn/pen/PwmwWV)
130130
- [jQuery Smooth Scroll](https://github.com/kswedberg/jquery-smooth-scroll)
131131

132-
133132
---
134133

135134
## License

‎_includes/head.html

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
{% include base_path %}
2-
31
<meta charset="utf-8">
42

53
{% include seo.html %}
64

7-
<link href="{% if site.atom_feed.path %}{{ site.atom_feed.path }}{% else %}{{ base_path }}/feed.xml{% endif %}" type="application/atom+xml" rel="alternate" title="{{ site.title }} Feed">
5+
<link href="{% if site.atom_feed.path %}{{ site.atom_feed.path }}{% else %}{{ '/feed.xml' | absolute_url }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ site.title }} Feed">
86

97
<!-- http://t.co/dKP3o1e -->
108
<meta name="HandheldFriendly" content="True">
@@ -16,7 +14,21 @@
1614
</script>
1715

1816
<!-- For all browsers -->
19-
20-
<link rel="stylesheet" href="{{ base_path }}/assets/css/main.css">
17+
<link rel="stylesheet" href="{{ '/assets/css/main.css' | absolute_url }}">
18+
19+
<!--[if lte IE 9]>
20+
<style>
21+
/* old IE unsupported flexbox fixes */
22+
.greedy-nav .site-title {
23+
padding-right: 3em;
24+
}
25+
.greedy-nav button {
26+
position: absolute;
27+
top: 0;
28+
right: 0;
29+
height: 100%;
30+
}
31+
</style>
32+
<![endif]-->
2133

2234
<meta http-equiv="cleartype" content="on">

‎_includes/seo.html

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
{% include base_path %}
2-
31
<!-- begin SEO -->
42
{% if site.url %}
53
{% assign seo_url = site.url | append: site.baseurl %}
@@ -25,7 +23,9 @@
2523
{% assign seo_description = seo_description | markdownify | strip_html | strip_newlines | escape_once %}
2624
{% endif %}
2725

28-
{% assign seo_author = page.author | default: page.author[0] | default: site.author[0] %}
26+
<meta name="description" content="{{ seo_description }}">
27+
28+
{% assign seo_author = page.author | default: page.author[0] | default: site.author.name %}
2929
{% if seo_author %}
3030
{% if seo_author.twitter %}
3131
{% assign seo_author_twitter = seo_author.twitter %}
@@ -39,7 +39,9 @@
3939
{% assign seo_author_twitter = seo_author_twitter | replace: "@", "" %}
4040
{% endif %}
4141

42-
<meta property="og:locale" content="{{ site.locale | replace: "-", "_" | default: "en" }}">
42+
<meta name="author" content="{{ seo_author }}">
43+
44+
<meta property="og:locale" content="{{ site.locale | replace: "-", "_" | default: "en_US" }}">
4345
<meta property="og:site_name" content="{{ site.title }}">
4446
<meta property="og:title" content="{{ page.title | default: site.title | markdownify | strip_html | strip_newlines | escape_once }}">
4547

@@ -60,13 +62,13 @@
6062

6163
{% if page.header.image %}
6264
<meta name="twitter:card" content="summary_large_image">
63-
<meta name="twitter:image" content="{% if page.header.image contains "://" %}{{ page.header.image }}{% else %}{{ page.header.image | prepend: "/images/" | prepend: base_path }}{% endif %}">
65+
<meta name="twitter:image" content="{% if page.header.image contains "://" %}{{ page.header.image }}{% else %}{{ page.header.image | absolute_url }}{% endif %}">
6466
{% else %}
6567
<meta name="twitter:card" content="summary">
6668
{% if page.header.teaser %}
67-
<meta name="twitter:image" content="{% if page.header.teaser contains "://" %}{{ page.header.teaser }}{% else %}{{ page.header.teaser | prepend: "/images/" | prepend: base_path }}{% endif %}">
69+
<meta name="twitter:image" content="{% if page.header.teaser contains "://" %}{{ page.header.teaser }}{% else %}{{ page.header.teaser | absolute_url }}{% endif %}">
6870
{% elsif site.og_image %}
69-
<meta name="twitter:image" content="{{ site.og_image | prepend: "/images/" | prepend: base_path }}">
71+
<meta name="twitter:image" content="{{ site.og_image | absolute_url }}">
7072
{% endif %}
7173
{% endif %}
7274

@@ -86,13 +88,13 @@
8688
{% endif %}
8789

8890
{% if page.header.image %}
89-
<meta property="og:image" content="{% if page.header.image contains "://" %}{{ page.header.image }}{% else %}{{ page.header.image | prepend: "/images/" | prepend: base_path }}{% endif %}">
91+
<meta property="og:image" content="{% if page.header.image contains "://" %}{{ page.header.image }}{% else %}{{ page.header.image | absolute_url }}{% endif %}">
9092
{% elsif page.header.overlay_image %}
91-
<meta property="og:image" content="{% if page.header.overlay_image contains "://" %}{{ page.header.overlay_image }}{% else %}{{ page.header.overlay_image | prepend: "/images/" | prepend: base_path }}{% endif %}">
93+
<meta property="og:image" content="{% if page.header.overlay_image contains "://" %}{{ page.header.overlay_image }}{% else %}{{ page.header.overlay_image | absolute_url }}{% endif %}">
9294
{% elsif page.header.teaser %}
93-
<meta property="og:image" content="{% if page.header.teaser contains "://" %}{{ page.header.teaser }}{% else %}{{ page.header.teaser | prepend: "/images/" | prepend: base_path }}{% endif %}">
95+
<meta property="og:image" content="{% if page.header.teaser contains "://" %}{{ page.header.teaser }}{% else %}{{ page.header.teaser | absolute_url }}{% endif %}">
9496
{% elsif site.og_image %}
95-
<meta property="og:image" content="{% if site.og_image contains "://" %}{{ site.og_image }}{% else %}{{ site.og_image | prepend: "/images/" | prepend: base_path }}{% endif %}">
97+
<meta property="og:image" content="{% if site.og_image contains "://" %}{{ site.og_image }}{% else %}{{ site.og_image | absolute_url }}{% endif %}">
9698
{% endif %}
9799

98100
{% if page.date %}
@@ -113,7 +115,7 @@
113115
"@context": "http://schema.org",
114116
"@type": "Organization",
115117
"url": {{ seo_url | jsonify }},
116-
"logo": {{ site.og_image | prepend: "/images/" | prepend: base_path | jsonify }}
118+
"logo": {{ site.og_image | absolute_url | jsonify }}
117119
}
118120
</script>
119121
{% endif %}

‎_layouts/default.html

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
---
22
---
33

4-
{% include base_path %}
5-
64
<!doctype html>
5+
<!--
6+
Minimal Mistakes Jekyll Theme 4.2.2 by Michael Rose
7+
Copyright 2017 Michael Rose - mademistakes.com | @mmistakes
8+
Free for personal and commercial use under the MIT license
9+
https://github.com/mmistakes/minimal-mistakes/blob/master/LICENSE.txt
10+
-->
711
<html lang="{{ site.locale | slice: 0,2 | default: "en" }}" class="no-js">
812
<head>
913
{% include head.html %}
1014
{% include head/custom.html %}
11-
<script type="text/javascript">
12-
(function(w,d,t,u,n,s,e){w['SwiftypeObject']=n;w[n]=w[n]||function(){
13-
(w[n].q=w[n].q||[]).push(arguments);};s=d.createElement(t);
14-
e=d.getElementsByTagName(t)[0];s.async=1;s.src=u;e.parentNode.insertBefore(s,e);
15-
})(window,document,'script','//s.swiftypecdn.com/install/v2/st.js','_st');
16-
17-
_st('install','gtVufjf64k411sHDDywV','2.0.0');
18-
</script>
1915
</head>
2016

2117
<body class="layout--{{ page.layout | default: layout.layout }}{% if page.classes or layout.classes %}{{ page.classes | default: layout.classes | join: ' ' | prepend: ' ' }}{% endif %}">
@@ -24,7 +20,7 @@
2420
{% include masthead.html %}
2521

2622
{{ content }}
27-
23+
2824
<div class="page__footer">
2925
<footer>
3026
{% include footer/custom.html %}

‎_sass/_sidebar.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
border-radius: $border-radius;
164164
background: #fff;
165165
z-index: -1;
166-
box-shadow: 0 0 10px rgba(#000, 0.25);
166+
box-shadow: 0 2px 4px 0 rgba(#000, 0.16), 0 2px 10px 0 rgba(#000, 0.12);
167167
cursor: default;
168168

169169
@include breakpoint($large) {

‎assets/css/main.scss

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
---
22
---
33

4-
/*
5-
* Minimal Mistakes Jekyll Theme
6-
*
7-
* - Michael Rose
8-
* - mademistakes.com
9-
* - https://twitter.com/mmistakes
10-
*
4+
/*!
5+
* Minimal Mistakes Jekyll Theme 4.3.0 by Michael Rose
6+
* Copyright 2017 Michael Rose - mademistakes.com | @mmistakes
7+
* Licensed under MIT (https://github.com/mmistakes/minimal-mistakes/blob/master/LICENSE.txt)
118
*/
129

1310
/*

‎banner.js

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
const fs = require('fs');
2+
const pkg = require('./package.json');
3+
const filename = 'assets/js/main.min.js';
4+
const script = fs.readFileSync(filename);
5+
const padStart = str => ('0' + str).slice(-2)
6+
const dateObj = new Date;
7+
const date = `${dateObj.getFullYear()}-${padStart(dateObj.getMonth() + 1)}-${padStart(dateObj.getDate())}`;
8+
const banner = `---
9+
layout:
10+
---
11+
/*!
12+
* Minimal Mistakes Jekyll Theme ${pkg.version} by ${pkg.author}
13+
* Copyright ${dateObj.getFullYear()} Michael Rose - mademistakes.com | @mmistakes
14+
* Licensed under ${pkg.license}
15+
*/
16+
`;
17+
18+
if (script.slice(0, 3) != '/**') {
19+
fs.writeFileSync(filename, banner + script);
20+
}

‎package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "minimal-mistakes",
3-
"version": "4.2.1",
3+
"version": "4.3.0",
44
"description": "Minimal Mistakes Jekyll theme npm build scripts",
55
"repository": {
66
"type": "git",
@@ -33,8 +33,9 @@
3333
},
3434
"scripts": {
3535
"uglify": "uglifyjs assets/js/vendor/jquery/jquery-1.12.4.min.js assets/js/plugins/jquery.fitvids.js assets/js/plugins/jquery.greedy-navigation.js assets/js/plugins/jquery.magnific-popup.js assets/js/plugins/jquery.smooth-scroll.min.js assets/js/_main.js -c -m -o assets/js/main.min.js",
36+
"add-banner": "node banner.js",
3637
"watch:js": "onchange \"assets/js/**/*.js\" -e \"assets/js/main.min.js\" -- npm run build:js",
37-
"build:js": "npm run uglify"
38+
"build:js": "npm run uglify && npm run add-banner"
3839
},
3940
"dependencies": {
4041
"shelljs": "^0.7.6",

0 commit comments

Comments
 (0)
Please sign in to comment.