Skip to content

Commit

Permalink
Replace gulp-sass with gulp-dart-sass
Browse files Browse the repository at this point in the history
* Rewrite Sass code that relies on deprecated or removed features in Dart Sass
* Remove unneeded rebuild of node-sass
* Update lockfile
  • Loading branch information
thibaudcolas authored and lb- committed May 17, 2020
1 parent 471823f commit 7eeb44a
Show file tree
Hide file tree
Showing 8 changed files with 180 additions and 522 deletions.
1 change: 0 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ jobs:
- run: npm run lint:js
- run: npm run lint:css
- run: npm run test:unit:coverage -- --runInBand
- run: npm rebuild node-sass
- run: npm run dist
- run: bash <(curl -s https://codecov.io/bash) -F frontend

Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ Changelog
* `bulk_delete` page permission is no longer required to move pages, even if those pages have children (Robert Rollins, LB (Ben Johnston))
* Add `after_edit_snippet`, `after_create_snippet` and `after_delete_snippet` hooks and documentation (Kalob Taulien)
* Improve performance of empty search results by avoiding downloading the entire search index in these scenarios (Lars van de Kerkhof, Coen van der Kamp)
* Replace `gulp-sass` with `gulp-dart-sass` to improve core development across different platforms (Thibaud Colas)
* Fix: Support IPv6 domain (Alex Gleason, Coen van der Kamp)
* Fix: Ensure link to add a new user works when no users are visible in the users list (LB (Ben Johnston))
* Fix: `AbstractEmailForm` saved submission fields are now aligned with the email content fields, `form.cleaned_data` will be used instead of `form.fields` (Haydn Greatnews)
Expand Down
6 changes: 3 additions & 3 deletions client/scss/components/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -226,19 +226,19 @@ li.focused > .help {
.date_field,
.date_time_field {
.input:before {
@extend .icon-date:before;
content: map-get($icons, 'date');
}
}

.time_field {
.input:before {
@extend .icon-time:before;
content: map-get($icons, 'time');
}
}

.url_field {
.input:before {
@extend .icon-link:before;
content: map-get($icons, 'link');
}
}

Expand Down
1 change: 1 addition & 0 deletions docs/releases/2.10.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ Other features
* ``bulk_delete`` page permission is no longer required to move pages, even if those pages have children (Robert Rollins, LB (Ben Johnston))
* Add ``after_edit_snippet``, ``after_create_snippet`` and ``after_delete_snippet`` hooks and documentation (Kalob Taulien)
* Improve performance of empty search results by avoiding downloading the entire search index in these scenarios (Lars van de Kerkhof, Coen van der Kamp)
* Replace ``gulp-sass`` with ``gulp-dart-sass`` to improve core development across different platforms (Thibaud Colas)


Bug fixes
Expand Down
4 changes: 2 additions & 2 deletions gulpfile.js/tasks/styles.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var path = require('path');
var gulp = require('gulp');
var sass = require('gulp-sass');
var sass = require('gulp-dart-sass');
var cssnano = require('gulp-cssnano');
var sourcemaps = require('gulp-sourcemaps');
var size = require('gulp-size');
Expand Down Expand Up @@ -90,4 +90,4 @@ gulp.task('styles:sass', function () {
.on('error', gutil.log);
});

gulp.task('styles', gulp.series('styles:sass', 'styles:css', 'styles:assets'));
gulp.task('styles', gulp.series('styles:sass', 'styles:css', 'styles:assets'));

0 comments on commit 7eeb44a

Please sign in to comment.