Skip to content

Commit e94cd80

Browse files
nielsenramonnielsenramon
committed
Update to jekyll-assets 3 + ruby + jekyll
1 parent d51a2d1 commit e94cd80

23 files changed

+123
-346
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ Thumbs.db
88
*.sass-cache
99
/_assets/yarn/
1010
/_site/
11-
/.asset-cache/
11+
/.jekyll-cache/
1212
Gemfile.lock
1313
yarn.lock

‎.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.1
1+
2.4.3

‎404.html

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,13 @@
1212
<meta name="viewport" content="width=device-width, initial-scale=1">
1313

1414
{% if site.local_fonts %}
15-
{% include stylesheet.html path="fonts" %}
15+
{% asset fonts.css %}
1616
{% endif %}
1717

1818
{% if site.blog_theme == "light" %}
19-
{% stylesheet notfound-light %}
20-
{% include stylesheet.html path="notfound-light" %}
19+
{% asset notfound-light.css %}
2120
{% else %}
22-
{% include stylesheet.html path="notfound-dark" %}
21+
{% asset notfound-dark.css %}
2322
{% endif %}
2423
</head>
2524
<body>
@@ -33,7 +32,7 @@ <h1><a href="{{ '/' | relative_url }}" title="Back to homepage">{{ site.name }}<
3332
</main>
3433

3534
{% unless site.local_fonts %}
36-
{% include javascript.html path="webfonts" %}
35+
{% asset webfonts.js %}
3736
{% endunless %}
3837
</body>
3938
</html>

‎Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@ source "https://rubygems.org"
22

33
gem "autoprefixer-rails"
44
gem "html-proofer"
5+
gem "image_optim"
56
gem "jekyll"
67
gem "jekyll-assets"
78
gem "jekyll-paginate"
89
gem "jekyll-sitemap"
910
gem "jemoji"
1011
gem "mini_magick"
1112
gem "sass"
13+
gem "sprockets", "4.0.0.beta6"
1214
gem "uglifier"

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ Integrations
2525
- [Google Fonts](https://fonts.google.com/)
2626
- [Disqus](https://disqus.com/)
2727
- [SVG Icons](https://icomoon.io/)
28-
- Social media links
28+
- Many social media links
2929

3030
Used tools
3131
- [Autoprefixer](https://github.com/postcss/autoprefixer)
3232
- [Circle CI](https://circleci.com/)
3333
- [Html-proofer](https://github.com/gjtorikian/html-proofer)
3434
- [Jekyll](https://jekyllrb.com/)
35-
- [Jekyll assets](https://github.com/jekyll/jekyll-assets)
35+
- [Jekyll Assets](https://github.com/jekyll/jekyll-assets)
3636
- [Jekyll Sitemap](https://github.com/jekyll/jekyll-sitemap)
3737
- [HTML5 Boilerplate](https://html5boilerplate.com/) (Influenced by)
3838
- [Kickster](https://kickster.nielsenramon.com/)

‎_assets/icons/icon-arrow-left.svg renamed to ‎_assets/icons/arrow-left.svg

File renamed without changes.

‎_assets/icons/icon-arrow-right.svg renamed to ‎_assets/icons/arrow-right.svg

File renamed without changes.

‎_assets/stylesheets/.csscomb.json

Lines changed: 0 additions & 196 deletions
This file was deleted.

‎_assets/stylesheets/.scss-lint.yml

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎_assets/stylesheets/fonts.scss

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@
1111
font-family: 'Cormorant Garamond';
1212
font-style: normal;
1313
font-weight: 700;
14-
src: url(font_path('cormorant-garamond/Cormorant-Garamond-700.eot'));
15-
src: url(font_path('cormorant-garamond/Cormorant-Garamond-700.eot?#iefix')) format('embedded-opentype'),
16-
local('Cormorant Garamond Medium'),
17-
local('Cormorant-Garamond-600'),
18-
url(font_path('cormorant-garamond/Cormorant-Garamond-700.woff2')) format('woff2'),
19-
url(font_path('cormorant-garamond/Cormorant-Garamond-700.woff')) format('woff'),
20-
url(font_path('cormorant-garamond/Cormorant-Garamond-700.ttf')) format('truetype'),
14+
src: asset_url('cormorant-garamond/Cormorant-Garamond-700.eot');
15+
src:
16+
asset_url('cormorant-garamond/Cormorant-Garamond-700.eot?#iefix') format('embedded-opentype'),
17+
local('Cormorant Garamond Medium'),
18+
local('Cormorant-Garamond-600'),
19+
asset_url('cormorant-garamond/Cormorant-Garamond-700.woff2') format('woff2'),
20+
asset_url('cormorant-garamond/Cormorant-Garamond-700.woff') format('woff'),
21+
asset_url('cormorant-garamond/Cormorant-Garamond-700.ttf') format('truetype');
2122
}
2223

2324
// Lato
@@ -27,37 +28,40 @@
2728
font-family: 'Lato';
2829
font-style: normal;
2930
font-weight: 300;
30-
src: url(font_path('lato/Lato-300.eot'));
31-
src: url(font_path('lato/Lato-300.eot?#iefix')) format('embedded-opentype'),
32-
local('Lato Light'),
33-
local('Lato-300'),
34-
url(font_path('lato/Lato-300.woff2')) format('woff2'),
35-
url(font_path('lato/Lato-300.woff')) format('woff'),
36-
url(font_path('lato/Lato-300.ttf')) format('truetype'),
31+
src: asset_url('lato/Lato-300.eot');
32+
src:
33+
asset_url('lato/Lato-300.eot?#iefix') format('embedded-opentype'),
34+
local('Lato Light'),
35+
local('Lato-300'),
36+
asset_url('lato/Lato-300.woff2') format('woff2'),
37+
asset_url('lato/Lato-300.woff') format('woff'),
38+
asset_url('lato/Lato-300.ttf') format('truetype');
3739
}
3840

3941
@font-face {
4042
font-family: 'Lato';
4143
font-style: normal;
4244
font-weight: 400;
43-
src: url(font_path('lato/Lato-regular.eot'));
44-
src: url(font_path('lato/Lato-regular.eot?#iefix')) format('embedded-opentype'),
45-
local('Lato Regular'),
46-
local('Lato-regular'),
47-
url(font_path('lato/Lato-regular.woff2')) format('woff2'),
48-
url(font_path('lato/Lato-regular.woff')) format('woff'),
49-
url(font_path('lato/Lato-regular.ttf')) format('truetype'),
45+
src: asset_url('lato/Lato-regular.eot');
46+
src:
47+
asset_url('lato/Lato-regular.eot?#iefix') format('embedded-opentype'),
48+
local('Lato Regular'),
49+
local('Lato-regular'),
50+
asset_url('lato/Lato-regular.woff2') format('woff2'),
51+
asset_url('lato/Lato-regular.woff') format('woff'),
52+
asset_url('lato/Lato-regular.ttf') format('truetype');
5053
}
5154

5255
@font-face {
5356
font-family: 'Lato';
5457
font-style: normal;
5558
font-weight: 700;
56-
src: url(font_path('lato/Lato-700.eot'));
57-
src: url(font_path('lato/Lato-700.eot?#iefix')) format('embedded-opentype'),
58-
local('Lato Bold'),
59-
local('Lato-700'),
60-
url(font_path('lato/Lato-700.woff2')) format('woff2'),
61-
url(font_path('lato/Lato-700.woff')) format('woff'),
62-
url(font_path('lato/Lato-700.ttf')) format('truetype'),
59+
src: asset_url('lato/Lato-700.eot');
60+
src:
61+
asset_url('lato/Lato-700.eot?#iefix') format('embedded-opentype'),
62+
local('Lato Bold'),
63+
local('Lato-700'),
64+
asset_url('lato/Lato-700.woff2') format('woff2'),
65+
asset_url('lato/Lato-700.woff') format('woff'),
66+
asset_url('lato/Lato-700.ttf') format('truetype');
6367
}

0 commit comments

Comments
 (0)