Skip to content

Commit

Permalink
Обновление Bootstrap до 4.3.1 и небольшие исправления
Browse files Browse the repository at this point in the history
  • Loading branch information
itchief committed Mar 3, 2019
1 parent afcdb7e commit 73b61ad
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 21 deletions.
6 changes: 3 additions & 3 deletions assets/src/index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="en">
<!doctype html>
<html lang="ru">
<head>
//= template/head.html
</head>
Expand All @@ -10,4 +10,4 @@

//= template/footer.html
</body>
</html>
</html>
2 changes: 1 addition & 1 deletion assets/src/template/footer.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<script src="js/main.js"></script>
<script src="js/main.min.js"></script>
14 changes: 3 additions & 11 deletions assets/src/template/head.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
<meta charset="UTF-8">

<!-- Useful meta tags -->
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="description" content="">
<meta name="keywords" content="">
<meta name="robots" content="index, follow, noodp">
<meta name="googlebot" content="index, follow">
<meta name="google" content="notranslate">
<meta name="format-detection" content="telephone=no">

<link href="css/main.css" rel="stylesheet" />
<link rel="stylesheet" href="css/main.min.css">

<title>Home</title>
<title>Стартовая страница</title>
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,24 @@
},
"dependencies": {
"jquery": "^3.3.1",
"popper.js": "^1.14.6",
"bootstrap": "^4.2.1"
"popper.js": "^1.14.7",
"bootstrap": "^4.3.1"
},
"devDependencies": {
"browser-sync": "^2.26.3",
"gulp": "^4.0.0",
"gulp-autoprefixer": "^6.0.0",
"gulp-cache": "^1.0.2",
"gulp-cache": "^1.1.1",
"gulp-clean-css": "^4.0.0",
"gulp-rimraf": "^0.2.2",
"gulp-imagemin": "^5.0.3",
"gulp-plumber": "^1.2.1",
"gulp-rigger": "^0.5.8",
"gulp-sass": "^4.0.2",
"gulp-sourcemaps": "^2.6.4",
"gulp-uglify": "^3.0.1",
"gulp-sourcemaps": "^2.6.5",
"gulp-uglify": "^3.0.2",
"imagemin-jpeg-recompress": "^6.0.0",
"imagemin-pngquant": "^6.0.1",
"imagemin-pngquant": "^7.0.0",
"gulp-rename": "^1.4.0"
}
}

0 comments on commit 73b61ad

Please sign in to comment.