aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Zamarin <arthurzam@gentoo.org>2023-04-15 17:32:39 +0300
committerArthur Zamarin <arthurzam@gentoo.org>2023-04-15 17:34:02 +0300
commit7a60004f46a8d48e9b9369ddc180f35f17e26a90 (patch)
tree1d2c562336b51ba96799a09264f7e01f59c311e2
parentAdd devmanual to dropdowns. (diff)
downloadtyrian-theme-7a60004f46a8d48e9b9369ddc180f35f17e26a90.tar.gz
tyrian-theme-7a60004f46a8d48e9b9369ddc180f35f17e26a90.tar.bz2
tyrian-theme-7a60004f46a8d48e9b9369ddc180f35f17e26a90.zip
Update dependencies, migrate SASS, bootstrap 4.6.2v2.0.2
- update all dependencies to latest versions - migrate from node-sass to dart-sass - upgrade to bootstrap 4.6.2 - fix some missing `calc` in scss Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
-rw-r--r--package.json23
-rw-r--r--src/scss/compatibility/_fontawesome4.scss2
-rw-r--r--src/scss/compatibility/_social-buttons.scss4
-rw-r--r--src/scss/tyrian.scss2
4 files changed, 15 insertions, 16 deletions
diff --git a/package.json b/package.json
index b12f82e..27f20cd 100644
--- a/package.json
+++ b/package.json
@@ -11,31 +11,30 @@
"src"
],
"devDependencies": {
- "npm-run-all": "^4.1.2",
- "node-sass": "^4.13.0",
- "clean-css-cli": "^4.1.10",
- "postcss-cli": "^4.1.1",
- "node-sass-package-importer": "5.3.2"
+ "clean-css-cli": "^5.6.2",
+ "npm-run-all": "^4.1.5",
+ "postcss-cli": "^10.1.0",
+ "sass": "^1.62.0"
},
"scripts": {
"prepare": "npm run dist",
"dist": "npm-run-all clean:dist css:tyrian:dist copy:assets",
"clean:dist": "rm -rf dist && mkdir -p dist",
"css:tyrian:dist": "npm-run-all css:tyrian:build css:tyrian:prefix css:tyrian:minify",
- "css:tyrian:build": "node-sass --importer node_modules/node-sass-package-importer/dist/cli.js src/scss/ -o dist",
+ "css:tyrian:build": "sass --load-path=node_modules/ src/scss/:dist/",
"css:tyrian:prefix": "postcss dist/tyrian.css --use autoprefixer --replace && postcss dist/components/searchbars.css --use autoprefixer --replace && postcss dist/components/additional-listgroup-link.css --use autoprefixer --replace",
- "css:tyrian:minify": "cleancss --level 1 --source-map --source-map-inline-sources --output dist/tyrian.min.css dist/tyrian.css && cleancss --level 1 --source-map --source-map-inline-sources --output dist/components/searchbars.min.css dist/components/searchbars.css && cleancss --level 1 --source-map --source-map-inline-sources --output dist/components/additional-listgroup-link.min.css dist/components/additional-listgroup-link.css",
+ "css:tyrian:minify": "cleancss -O1 --source-map --source-map-inline-sources --output dist/tyrian.min.css dist/tyrian.css && cleancss -O1 --source-map --source-map-inline-sources --output dist/components/searchbars.min.css dist/components/searchbars.css && cleancss -O1 --source-map --source-map-inline-sources --output dist/components/additional-listgroup-link.min.css dist/components/additional-listgroup-link.css",
"copy:assets": "npm-run-all copy:js copy:img copy:fonts copy:tyrian:assets",
"copy:js": "cp src/js/*.js dist",
"copy:img": "cp src/img/*.* dist",
"copy:fonts": "cp src/fonts/*.* dist",
- "copy:tyrian:assets": "cp ./node_modules/bootstrap/dist/js/bootstrap.min.js dist/bootstrap.min.js && cp ./node_modules/jquery/dist/jquery.slim.js dist/jquery-3.3.slim.js && cp ./node_modules/popper.js/dist/umd/popper.min.js dist"
+ "copy:tyrian:assets": "cp ./node_modules/bootstrap/dist/js/bootstrap.min.js dist/bootstrap.min.js && cp ./node_modules/jquery/dist/jquery.slim.js dist/jquery-3.6.slim.js && cp ./node_modules/popper.js/dist/umd/popper.min.js dist"
},
"dependencies": {
- "jquery": "^3.3.1",
- "popper.js": "1.14.7",
- "bootstrap": "4.3.1",
+ "autoprefixer": "^10.4.14",
+ "bootstrap": "4.6.2",
"font-awesome": "4.7.0",
- "autoprefixer": "^7.2.4"
+ "jquery": "^3.6.4",
+ "popper.js": "^1.16.0"
}
}
diff --git a/src/scss/compatibility/_fontawesome4.scss b/src/scss/compatibility/_fontawesome4.scss
index f4a6895..858b666 100644
--- a/src/scss/compatibility/_fontawesome4.scss
+++ b/src/scss/compatibility/_fontawesome4.scss
@@ -1,2 +1,2 @@
$fa-font-path: ".";
-@import "../../../node_modules/font-awesome/scss/font-awesome";
+@import "font-awesome/scss/font-awesome";
diff --git a/src/scss/compatibility/_social-buttons.scss b/src/scss/compatibility/_social-buttons.scss
index 6acb4c5..d991e0f 100644
--- a/src/scss/compatibility/_social-buttons.scss
+++ b/src/scss/compatibility/_social-buttons.scss
@@ -1,5 +1,5 @@
@function calculateRem($target, $context: 16px) {
- @return ($target / $context) * 1rem;
+ @return calc($target / $context) * 1rem;
}
$line-height-computed: floor(($font-size-base * $line-height-base));
@@ -126,4 +126,4 @@ $bs-height-xs: (floor($font-size-small * 1.2) + $padding-small-vertical + 1) !
.btn-twitter { @include btn-social(#55acee); }
.btn-vimeo { @include btn-social(#1ab7ea); }
.btn-vk { @include btn-social(#587ea3); }
-.btn-yahoo { @include btn-social(#720e9e); } \ No newline at end of file
+.btn-yahoo { @include btn-social(#720e9e); }
diff --git a/src/scss/tyrian.scss b/src/scss/tyrian.scss
index 4c54b4d..464c83e 100644
--- a/src/scss/tyrian.scss
+++ b/src/scss/tyrian.scss
@@ -2,7 +2,7 @@
// Bootstrap
@import "./variables";
-@import '~bootstrap/scss/bootstrap';
+@import 'bootstrap/scss/bootstrap';
// Bootstrap