Skip to content
This repository was archived by the owner on Oct 2, 2019. It is now read-only.

Commit cb36c2c

Browse files
committed
Merge branch 'es6-webpack'
2 parents 6bb3a83 + fd31180 commit cb36c2c

33 files changed

+16675
-8262
lines changed

.babelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"presets": ["env"]
3+
}

.eslintrc.js

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
module.exports = {
2+
"env": {
3+
"browser": true,
4+
"es6": true
5+
},
6+
"extends": "eslint:recommended",
7+
"parserOptions": {
8+
"sourceType": "module"
9+
},
10+
"rules": {
11+
"indent": [
12+
"error",
13+
2
14+
],
15+
"linebreak-style": [
16+
"error",
17+
"unix"
18+
],
19+
"quotes": [
20+
"error",
21+
"single"
22+
],
23+
"semi": [
24+
"error",
25+
"always"
26+
]
27+
}
28+
};

assets/css/imageset.css

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
@charset "UTF-8";
2-
/*!
2+
3+
/*
34
* ImageSet - responsive, lazy-loading images for Kirby CMS
45
*
5-
* @copyright (c) 2016 Fabian Michael <https://fabianmichael.de>
6+
* @copyright (c) 2016-2018 Fabian Michael <https://fabianmichael.de>
67
* @link https://github.com/fabianmichael/kirby-imageset
78
*
89
*/
10+
911
/* ----- ImageSet Component ----------------------------------------------- */
12+
1013
.imageset {
1114
/* Fixes a glitch in Firefox, where (in rare cases) a
1215
black border appears for no abvious reason at the
@@ -17,11 +20,12 @@
1720
}
1821

1922
/* ····· ImageSet with Ratio-Placeholder ·································· */
23+
2024
.imageset.-ratio {
2125
display: block;
2226
/* Remove bottom margin (borrowed from Inuit CSS) */
23-
width: 100%;
2427
position: relative;
28+
width: 100%;
2529
/* Create a new stacking context for this imageset.
2630
See comments below to learn about why this
2731
is important. */
@@ -65,7 +69,7 @@
6569
browsers. */
6670
z-index: 1;
6771
-webkit-backface-visibility: hidden;
68-
backface-visibility: hidden;
72+
backface-visibility: hidden;
6973
}
7074

7175
@media screen {
@@ -108,7 +112,7 @@
108112
transform: translate(-50%, -50%);
109113
overflow: hidden;
110114
-webkit-backface-visibility: hidden;
111-
backface-visibility: hidden;
115+
backface-visibility: hidden;
112116
}
113117

114118
.js .imageset.-lazyload .imageset-placeholder {
@@ -138,6 +142,10 @@
138142
}
139143
}
140144

145+
.imageset.-alpha .imageset-placeholder {
146+
visibility: hidden;
147+
}
148+
141149
.js .imageset.-alpha .imageset-placeholder {
142150
visibility: visible;
143151
}
@@ -179,6 +187,7 @@
179187
}
180188

181189
/* ····· NoScript Fallback ················································ */
190+
182191
.imageset.-ratio .imageset-fallback {
183192
/* autoprefixer: off */
184193
position: absolute;
@@ -209,6 +218,7 @@
209218
}
210219

211220
/* ····· Error Handling ··················································· */
221+
212222
.js .imageset .imageset-error {
213223
position: absolute;
214224
z-index: 3;
@@ -220,9 +230,9 @@
220230
transition: opacity 0.5s;
221231
pointer-events: none;
222232
-webkit-user-select: none;
223-
-moz-user-select: none;
224-
-ms-user-select: none;
225-
user-select: none;
233+
-moz-user-select: none;
234+
-ms-user-select: none;
235+
user-select: none;
226236
}
227237

228238
.js .imageset .imageset-error {
@@ -271,6 +281,7 @@
271281
}
272282

273283
/* ····· Opera Mini Fixes ················································· */
284+
274285
.operamini .imageset-placeholder {
275286
display: none;
276287
}
@@ -279,4 +290,4 @@
279290
/* autoprefixer: off */
280291
-o-object-fit: cover;
281292
object-fit: cover;
282-
}
293+
}

assets/css/imageset.min.css

Lines changed: 1 addition & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)