Merge pull request #8 from andreysgra/fixes

Замена изображений и обновление зависимостей
andreysgra · May 6, 2018 · 0c9a46f · 0c9a46f
2 parents fc7513d + d49ce01
commit 0c9a46f
Show file tree

Hide file tree

Showing 48 changed files with 3,394 additions and 1,729 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pink",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "Проект «Пинк» от HTML Academy",
   "main": "index.html",
   "scripts": {
@@ -17,7 +17,7 @@
   "author": "Andrey Grachev <[email protected]> (https://github.com/andreysgra)",
   "license": "ISC",
   "devDependencies": {
-    "autoprefixer": "^8.1.0",
+    "autoprefixer": "^8.4.1",
     "css-mqpacker": "^6.0.2",
     "gh-pages": "^1.1.0",
     "grunt": "^1.0.2",
@@ -28,15 +28,15 @@
     "grunt-contrib-imagemin": "^2.0.1",
     "grunt-contrib-less": "^1.4.1",
     "grunt-contrib-uglify": "^3.3.0",
-    "grunt-contrib-watch": "^1.0.0",
+    "grunt-contrib-watch": "^1.0.1",
     "grunt-csso": "^2.2.0",
-    "grunt-lintspaces": "^0.8.1",
+    "grunt-lintspaces": "^0.8.2",
     "grunt-postcss": "^0.9.0",
     "grunt-svgstore": "^1.0.0",
     "imagemin-jpegoptim": "^5.2.0",
     "imagemin-webp": "^4.1.0",
     "load-grunt-tasks": "^3.5.2",
-    "stylelint": "^9.1.1",
+    "stylelint": "^9.2.0",
     "stylelint-config-standard": "^18.2.0"
   },
   "dependencies": {
@@ -45,8 +45,6 @@
     "svg4everybody": "^2.1.9"
   },
   "browserslist": [
-    "last 2 versions",
-    "IE 11",
-    "Firefox ESR"
+    "defaults"
   ]
 }
diff --git a/src/img/[email protected] b/src/img/[email protected]
diff --git a/src/img/[email protected] b/src/img/[email protected]
diff --git a/src/img/[email protected] b/src/img/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/img/content/[email protected] → src/img/content/[email protected] b/src/img/content/[email protected] → src/img/content/[email protected]
diff --git a/src/photo.html b/src/photo.html
@@ -98,13 +98,13 @@ <h3 class="visually-hidden">Сообщение пользователя Лево
 
           <a class="photo__link" href="#">
             <picture>
-              <source type="image/webp" media="(min-width: 960px)" srcset="img/content/photo-1[email protected] 1x, img/content/photo-1[email protected] 2x">
-              <source type="image/webp" media="(min-width: 660px)" srcset="img/content/photo-1[email protected] 1x, img/content/photo-1[email protected] 2x">
-              <source type="image/webp" srcset="img/content/photo-1[email protected] 1x, img/content/photo-1[email protected] 2x">
+              <source type="image/webp" media="(min-width: 960px)" srcset="img/content/photo-car[email protected] 1x, img/content/photo-car[email protected] 2x">
+              <source type="image/webp" media="(min-width: 660px)" srcset="img/content/photo-car[email protected] 1x, img/content/photo-car[email protected] 2x">
+              <source type="image/webp" srcset="img/content/photo-car[email protected] 1x, img/content/photo-car[email protected] 2x">
 
-              <source media="(min-width: 960px)" srcset="img/content/photo-1[email protected] 1x, img/content/photo-1[email protected] 2x">
-              <source media="(min-width: 660px)" srcset="img/content/photo-1[email protected] 1x, img/content/photo-1[email protected] 2x">
-              <img class="photo__image" src="img/content/photo-1[email protected]" srcset="img/content/photo-1[email protected] 2x" alt="Фото 1">
+              <source media="(min-width: 960px)" srcset="img/content/photo-car[email protected] 1x, img/content/photo-car[email protected] 2x">
+              <source media="(min-width: 660px)" srcset="img/content/photo-car[email protected] 1x, img/content/photo-car[email protected] 2x">
+              <img class="photo__image" src="img/content/photo-car[email protected]" srcset="img/content/photo-car[email protected] 2x" alt="Фото 1">
             </picture>
           </a>
 
@@ -131,13 +131,13 @@ <h3 class="visually-hidden">Сообщение пользователя Анто
 
           <a class="photo__link" href="#">
             <picture>
-              <source type="image/webp" media="(min-width: 960px)" srcset="img/content/photo-2[email protected] 1x, img/content/photo-2[email protected] 2x">
-              <source type="image/webp" media="(min-width: 660px)" srcset="img/content/photo-2[email protected] 1x, img/content/photo-2[email protected] 2x">
-              <source type="image/webp" srcset="img/content/photo-2[email protected] 1x, img/content/photo-2[email protected] 2x">
+              <source type="image/webp" media="(min-width: 960px)" srcset="img/content/photo-drumset[email protected] 1x, img/content/photo-drumset[email protected] 2x">
+              <source type="image/webp" media="(min-width: 660px)" srcset="img/content/photo-drumset[email protected] 1x, img/content/photo-drumset[email protected] 2x">
+              <source type="image/webp" srcset="img/content/photo-drumset[email protected] 1x, img/content/photo-drumset[email protected] 2x">
 
-              <source media="(min-width: 960px)" srcset="img/content/photo-2[email protected] 1x, img/content/photo-2[email protected] 2x">
-              <source media="(min-width: 660px)" srcset="img/content/photo-2[email protected] 1x, img/content/photo-2[email protected] 2x">
-              <img class="photo__image" src="img/content/photo-2[email protected]" srcset="img/content/photo-2[email protected] 2x" alt="Фото 2">
+              <source media="(min-width: 960px)" srcset="img/content/photo-drumset[email protected] 1x, img/content/photo-drumset[email protected] 2x">
+              <source media="(min-width: 660px)" srcset="img/content/photo-drumset[email protected] 1x, img/content/photo-drumset[email protected] 2x">
+              <img class="photo__image" src="img/content/photo-drumset[email protected]" srcset="img/content/photo-drumset[email protected] 2x" alt="Фото 2">
             </picture>
           </a>
 
@@ -164,13 +164,13 @@ <h3 class="visually-hidden">Сообщение пользователя Бори
 
           <a class="photo__link" href="#">
             <picture>
-              <source type="image/webp" media="(min-width: 960px)" srcset="img/content/photo-3[email protected] 1x, img/content/photo-3[email protected] 2x">
-              <source type="image/webp" media="(min-width: 660px)" srcset="img/content/photo-3[email protected] 1x, img/content/photo-3[email protected] 2x">
-              <source type="image/webp" srcset="img/content/photo-3[email protected] 1x, img/content/photo-3[email protected] 2x">
+              <source type="image/webp" media="(min-width: 960px)" srcset="img/content/photo-window[email protected] 1x, img/content/photo-window[email protected] 2x">
+              <source type="image/webp" media="(min-width: 660px)" srcset="img/content/photo-window[email protected] 1x, img/content/photo-window[email protected] 2x">
+              <source type="image/webp" srcset="img/content/photo-window[email protected] 1x, img/content/photo-window[email protected] 2x">
 
-              <source media="(min-width: 960px)" srcset="img/content/photo-3[email protected] 1x, img/content/photo-3[email protected] 2x">
-              <source media="(min-width: 660px)" srcset="img/content/photo-3[email protected] 1x, img/content/photo-3[email protected] 2x">
-              <img class="photo__image" src="img/content/photo-3[email protected]" srcset="img/content/photo-3[email protected] 2x" alt="Фото 3">
+              <source media="(min-width: 960px)" srcset="img/content/photo-window[email protected] 1x, img/content/photo-window[email protected] 2x">
+              <source media="(min-width: 660px)" srcset="img/content/photo-window[email protected] 1x, img/content/photo-window[email protected] 2x">
+              <img class="photo__image" src="img/content/photo-window[email protected]" srcset="img/content/photo-window[email protected] 2x" alt="Фото 3">
             </picture>
           </a>
 
@@ -197,13 +197,13 @@ <h3 class="visually-hidden">Сообщение пользователя Серг
 
           <a class="photo__link" href="#">
             <picture>
-              <source type="image/webp" media="(min-width: 960px)" srcset="img/content/photo-4[email protected] 1x, img/content/photo-4[email protected] 2x">
-              <source type="image/webp" media="(min-width: 660px)" srcset="img/content/photo-4[email protected] 1x, img/content/photo-4[email protected] 2x">
-              <source type="image/webp" srcset="img/content/photo-4[email protected] 1x, img/content/photo-4[email protected] 2x">
+              <source type="image/webp" media="(min-width: 960px)" srcset="img/content/photo-fair[email protected] 1x, img/content/photo-fair[email protected] 2x">
+              <source type="image/webp" media="(min-width: 660px)" srcset="img/content/photo-fair[email protected] 1x, img/content/photo-fair[email protected] 2x">
+              <source type="image/webp" srcset="img/content/photo-fair[email protected] 1x, img/content/photo-fair[email protected] 2x">
 
-              <source media="(min-width: 960px)" srcset="img/content/photo-4[email protected] 1x, img/content/photo-4[email protected] 2x">
-              <source media="(min-width: 660px)" srcset="img/content/photo-4[email protected] 1x, img/content/photo-4[email protected] 2x">
-              <img class="photo__image" src="img/content/photo-4[email protected]" srcset="img/content/photo-4[email protected] 2x" alt="Фото 4">
+              <source media="(min-width: 960px)" srcset="img/content/photo-fair[email protected] 1x, img/content/photo-fair[email protected] 2x">
+              <source media="(min-width: 660px)" srcset="img/content/photo-fair[email protected] 1x, img/content/photo-fair[email protected] 2x">
+              <img class="photo__image" src="img/content/photo-fair[email protected]" srcset="img/content/photo-fair[email protected] 2x" alt="Фото 4">
             </picture>
           </a>
 
@@ -230,13 +230,13 @@ <h3 class="visually-hidden">Сообщение пользователя Макс
 
           <a class="photo__link" href="#">
             <picture>
-              <source type="image/webp" media="(min-width: 960px)" srcset="img/content/photo-5[email protected] 1x, img/content/photo-5[email protected] 2x">
-              <source type="image/webp" media="(min-width: 660px)" srcset="img/content/photo-5[email protected] 1x, img/content/photo-5[email protected] 2x">
-              <source type="image/webp" srcset="img/content/photo-5[email protected] 1x, img/content/photo-5[email protected] 2x">
+              <source type="image/webp" media="(min-width: 960px)" srcset="img/content/photo-pov[email protected] 1x, img/content/photo-pov[email protected] 2x">
+              <source type="image/webp" media="(min-width: 660px)" srcset="img/content/photo-pov[email protected] 1x, img/content/photo-pov[email protected] 2x">
+              <source type="image/webp" srcset="img/content/photo-pov[email protected] 1x, img/content/photo-pov[email protected] 2x">
 
-              <source media="(min-width: 960px)" srcset="img/content/photo-5[email protected] 1x, img/content/photo-5[email protected] 2x">
-              <source media="(min-width: 660px)" srcset="img/content/photo-5[email protected] 1x, img/content/photo-5[email protected] 2x">
-              <img class="photo__image" src="img/content/photo-5[email protected]" srcset="img/content/photo-5[email protected] 2x" alt="Фото 5">
+              <source media="(min-width: 960px)" srcset="img/content/photo-pov[email protected] 1x, img/content/photo-pov[email protected] 2x">
+              <source media="(min-width: 660px)" srcset="img/content/photo-pov[email protected] 1x, img/content/photo-pov[email protected] 2x">
+              <img class="photo__image" src="img/content/photo-pov[email protected]" srcset="img/content/photo-pov[email protected] 2x" alt="Фото 5">
             </picture>
           </a>
 
@@ -263,13 +263,13 @@ <h3 class="visually-hidden">Сообщение пользователя Наде
 
           <a class="photo__link" href="#">
             <picture>
-              <source type="image/webp" media="(min-width: 960px)" srcset="img/content/photo-6[email protected] 1x, img/content/photo-6[email protected] 2x">
-              <source type="image/webp" media="(min-width: 660px)" srcset="img/content/photo-6[email protected] 1x, img/content/photo-6[email protected] 2x">
-              <source type="image/webp" srcset="img/content/photo-6[email protected] 1x, img/content/photo-6[email protected] 2x">
+              <source type="image/webp" media="(min-width: 960px)" srcset="img/content/photo-wing[email protected] 1x, img/content/photo-wing[email protected] 2x">
+              <source type="image/webp" media="(min-width: 660px)" srcset="img/content/photo-wing[email protected] 1x, img/content/photo-wing[email protected] 2x">
+              <source type="image/webp" srcset="img/content/photo-wing[email protected] 1x, img/content/photo-wing[email protected] 2x">
 
-              <source media="(min-width: 960px)" srcset="img/content/photo-6[email protected] 1x, img/content/photo-6[email protected] 2x">
-              <source media="(min-width: 660px)" srcset="img/content/photo-6[email protected] 1x, img/content/photo-6[email protected] 2x">
-              <img class="photo__image" src="img/content/photo-6[email protected]" srcset="img/content/photo-6[email protected] 2x" alt="Фото 6">
+              <source media="(min-width: 960px)" srcset="img/content/photo-wing[email protected] 1x, img/content/photo-wing[email protected] 2x">
+              <source media="(min-width: 660px)" srcset="img/content/photo-wing[email protected] 1x, img/content/photo-wing[email protected] 2x">
+              <img class="photo__image" src="img/content/photo-wing[email protected]" srcset="img/content/photo-wing[email protected] 2x" alt="Фото 6">
             </picture>
           </a>
 
@@ -302,13 +302,13 @@ <h2 class="visually-hidden">Добавить новую фотографию</h2
         <form class="form-photo" action="https://echo.htmlacademy.ru/" method="post">
           <div class="form-photo__preview">
             <picture>
-              <source type="image/webp" media="(min-width: 960px)" srcset="img/content/photo-7[email protected] 1x, img/content/photo-7[email protected] 2x">
-              <source type="image/webp" media="(min-width: 660px)" srcset="img/content/photo-7[email protected] 1x, img/content/photo-7[email protected] 2x">
-              <source type="image/webp" srcset="img/content/photo-7[email protected] 1x, img/content/photo-7[email protected] 2x">
+              <source type="image/webp" media="(min-width: 960px)" srcset="img/content/photo-road[email protected] 1x, img/content/photo-road[email protected] 2x">
+              <source type="image/webp" media="(min-width: 660px)" srcset="img/content/photo-road[email protected] 1x, img/content/photo-road[email protected] 2x">
+              <source type="image/webp" srcset="img/content/photo-road[email protected] 1x, img/content/photo-road[email protected] 2x">
 
-              <source media="(min-width: 960px)" srcset="img/content/photo-7[email protected], img/content/photo-7[email protected] 2x">
-              <source media="(min-width: 660px)" srcset="img/content/photo-7[email protected], img/content/photo-7[email protected] 2x">
-              <img class="form-photo__image" src="img/content/photo-7[email protected]" srcset="img/content/photo-7[email protected] 2x" alt="Фото 7">
+              <source media="(min-width: 960px)" srcset="img/content/photo-road[email protected], img/content/photo-road[email protected] 2x">
+              <source media="(min-width: 660px)" srcset="img/content/photo-road[email protected], img/content/photo-road[email protected] 2x">
+              <img class="form-photo__image" src="img/content/photo-road[email protected]" srcset="img/content/photo-road[email protected] 2x" alt="Фото 7">
             </picture>
           </div>