Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use dart-sass for improved compatibility #27

Merged
merged 1 commit into from
Nov 23, 2023
Merged

Use dart-sass for improved compatibility #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 5 additions & 13 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,9 @@ module.exports = function(grunt) {
sass: {
build_main: {
options: {
implementation: require('sass'),
style: 'expanded',
sourcemap: 'none'
sourceMap: false
},
files: [{
expand: true,
Expand All @@ -71,8 +72,9 @@ module.exports = function(grunt) {
// Builds custom style components to temporary folder.
build_custom_styles: {
options: {
implementation: require('sass'),
style: 'expanded',
sourcemap: 'none'
sourceMap: false
},
files: [{
expand: true,
Expand Down Expand Up @@ -266,17 +268,7 @@ module.exports = function(grunt) {
}
});

grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-contrib-cssmin');
grunt.loadNpmTasks('grunt-contrib-imagemin');
grunt.loadNpmTasks('grunt-contrib-sass');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-exec');
grunt.loadNpmTasks('grunt-modernizr-builder');
grunt.loadNpmTasks('grunt-postcss');
require('load-grunt-tasks')(grunt);

grunt.registerTask('default', ['clean:reset', 'modernizr_builder', 'concat', 'uglify', 'sass', 'postcss:main_styles', 'cssmin', 'imagemin', 'postcss:custom_styles', 'copy', 'clean:remove']);

Expand Down
2 changes: 1 addition & 1 deletion components/template-cs-button.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,4 @@
"scope": "global"
*/
--button-text-transform: uppercase;
}
}
2 changes: 1 addition & 1 deletion components/template-cs-content.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,4 +365,4 @@
"scope": "global"
*/
--content-area-product-description__color: rgba(141, 144, 145, 0.6);
}
}
2 changes: 1 addition & 1 deletion components/template-cs-footer.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@
"scope": "global"
*/
--footer-body-text-transform: none;
}
}
2 changes: 1 addition & 1 deletion components/template-cs-form.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,4 @@
"scope": "global"
*/
--form-field-text-transform: none;
}
}
2 changes: 1 addition & 1 deletion components/template-cs-header-front.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,4 +253,4 @@
"scope": "global"
*/
--menu-main-active-text-transform: uppercase;
}
}
2 changes: 1 addition & 1 deletion components/template-cs-header.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,4 +253,4 @@
"scope": "global"
*/
--menu-main-active-text-transform: uppercase;
}
}
2 changes: 1 addition & 1 deletion components/template-cs-headings.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,4 +245,4 @@
"scope": "global"
*/
--headings-subheading-text-transform: none;
}
}
2 changes: 1 addition & 1 deletion components/template-cs-main-styles.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@
]
*/
--third-color: white;
}
}
2 changes: 1 addition & 1 deletion components/template-cs-sidebar.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,4 +183,4 @@
"scope": "global"
*/
--menu-sub-active-text-transform: none;
}
}
28 changes: 17 additions & 11 deletions components/template-cs-style-rules.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,8 @@ body {
.blog-news-page .article-title a {
color: var(--secondary-color);
}
.blog-news-page .article-author, .blog-news-page .article-date {
.blog-news-page .article-author,
.blog-news-page .article-date {
color: var(--secondary-color);
}
.dark-background .blog-news-page .article-author,
Expand Down Expand Up @@ -225,7 +226,6 @@ body {
.language-flags-disabled .mobile-menu-toggler span .lang-menu-btn .lang-title, .language-flags-disabled .mobile-menu-toggler span:before .lang-menu-btn .lang-title, .language-flags-disabled .mobile-menu-toggler span:after .lang-menu-btn .lang-title {
color: var(--third-color);
}

#mobile-menu .search-open-btn svg,
#footer-menu .search-open-btn svg {
fill: var(--secondary-color);
Expand Down Expand Up @@ -503,7 +503,10 @@ body {
.content-area h6 a {
color: var(--secondary-color);
}
.content-area p, .content-area ul, .content-area ol, .content-area dl {
.content-area p,
.content-area ul,
.content-area ol,
.content-area dl {
font-size: var(--content-body-font-size);
}
.site-footer .content-area p,
Expand All @@ -512,7 +515,10 @@ body {
.site-footer .content-area dl {
color: var(--primary-color);
}
.site-footer .dark-background .content-area p, .site-footer .dark-background .content-area ul, .site-footer .dark-background .content-area ol, .site-footer .dark-background .content-area dl {
.site-footer .dark-background .content-area p,
.site-footer .dark-background .content-area ul,
.site-footer .dark-background .content-area ol,
.site-footer .dark-background .content-area dl {
color: var(--third-color);
}
.content-area h1,
Expand Down Expand Up @@ -591,7 +597,7 @@ body {
text-transform: var(--button-text-transform);
}
.content-area a.custom-btn:not(.custom-btn-disabled):hover, .content-area div.custom-btn:not(.custom-btn-disabled):hover, .content-area .edy-product-widget-list .edy-product-widget-item-wrap .edy-product-widget-item .edy-product-widget-item-details-wrap .edy-product-widget-item-btn-wrap .edy-product-widget-item-btn:hover {
opacity: .7;
opacity: 0.7;
}
.dark-background .content-area a.custom-btn:not(.custom-btn-disabled), .dark-background .content-area a.custom-btn:not(.custom-btn-disabled):hover, .dark-background .content-area div.custom-btn:not(.custom-btn-disabled), .dark-background .content-area div.custom-btn:not(.custom-btn-disabled):hover, .dark-background .content-area .edy-product-widget-list .edy-product-widget-item-wrap .edy-product-widget-item .edy-product-widget-item-details-wrap .edy-product-widget-item-btn-wrap .edy-product-widget-item-btn, .dark-background .content-area .edy-product-widget-list .edy-product-widget-item-wrap .edy-product-widget-item .edy-product-widget-item-details-wrap .edy-product-widget-item-btn-wrap .edy-product-widget-item-btn:hover {
border-color: var(--button-background-color);
Expand Down Expand Up @@ -699,7 +705,7 @@ body {
text-transform: var(--button-text-transform);
}
.content-area .form_submit input:hover {
opacity: .7;
opacity: 0.7;
}
.dark-background .content-area .form_submit input {
border-color: var(--button-background-color);
Expand Down Expand Up @@ -751,11 +757,11 @@ body {
.dark-background .edy-product-widget-grid .edy-product-widget-item .edy-product-widget-item-details-wrap .edy-product-widget-item-price,
.dark-background .edy-product-widget-grid .edy-product-widget-item .edy-product-widget-item-details-wrap .edy-product-widget-item-description {
color: var(--third-color);
opacity: .7;
opacity: 0.7;
}
.dark-background .edy-product-widget-grid .edy-product-widget-item .edy-product-widget-item-top-outer .edy-product-widget-item-top.edy-product-widget-item-without-image {
border: 1px solid var(--third-color);
opacity: .5;
opacity: 0.5;
}
.dark-background .edy-product-widget-grid .edy-product-widget-item .edy-product-widget-item-details-flex-wrap .edy-product-widget-item-out-of-stock,
.dark-background .edy-product-widget-grid .edy-product-widget-item .edy-product-widget-item-details-flex-wrap .edy-product-widget-item-btn {
Expand All @@ -770,7 +776,7 @@ body {
}
.dark-background .edy-product-widget-list .edy-product-widget-item-wrap .edy-product-widget-item .edy-product-widget-item-details-wrap .edy-product-widget-item-header .edy-product-widget-item-price {
color: var(--third-color);
opacity: .7;
opacity: 0.7;
}
.dark-background .edy-product-widget-list .edy-product-widget-item-wrap .edy-product-widget-item .edy-product-widget-item-details-wrap .edy-product-widget-item-header .edy-product-widget-item-out-of-stock {
color: var(--third-color);
Expand All @@ -780,7 +786,7 @@ body {
}
.dark-background .edy-product-widget-list .edy-product-widget-item-wrap .edy-product-widget-item .edy-product-widget-item-details-wrap .edy-product-widget-item-without-image {
border: 1px solid var(--third-color);
opacity: .5;
opacity: 0.5;
}

.edy-product-widget-filter-sort option {
Expand All @@ -792,4 +798,4 @@ body {
.dark-background .edy-product-widget-filter-label,
.dark-background .edy-product-widget-filter-search-input {
color: var(--third-color);
}
}
2 changes: 1 addition & 1 deletion components/template-cs-table.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@
"scope": "global"
*/
--table-border-style: solid;
}
}
6 changes: 4 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,14 @@
"grunt-contrib-copy": "^1.0.0",
"grunt-contrib-cssmin": "^3.0.0",
"grunt-contrib-imagemin": "^3.1.0",
"grunt-contrib-sass": "^1.0.0",
"grunt-contrib-uglify": "^4.0.0",
"grunt-contrib-watch": "^1.1.0",
"grunt-exec": "^3.0.0",
"grunt-modernizr-builder": "^0.1.9",
"grunt-postcss": "^0.9.0",
"modernizr": "^3.6.0"
"grunt-sass": "^3.1.0",
"load-grunt-tasks": "^5.1.0",
"modernizr": "^3.6.0",
"sass": "^1.69.5"
}
}
Loading