Skip to content

Commit

Permalink
⬆️ Updated legacy styles #455 #458
Browse files Browse the repository at this point in the history
  • Loading branch information
padms authored and Fernando Lucchesi committed Dec 1, 2021
1 parent fc6424b commit bf8a17f
Show file tree
Hide file tree
Showing 20 changed files with 554 additions and 2,422 deletions.
3 changes: 2 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ node_modules
storybook-static
.next
studio/dist
legacy/js/src
legacy/js/src
legacy/css
13 changes: 9 additions & 4 deletions legacy/css/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const scss = require('gulp-sass'),
consolidate = require('gulp-consolidate'),
concat = require('gulp-concat'),
del = require('del'),
// eslint-disable-next-line no-unused-vars
replace = require('gulp-replace')
_ = require('lodash')

scss.compiler = require('node-sass')
Expand Down Expand Up @@ -57,11 +57,13 @@ const fontName = 'equinor_icons'
// Delete dist folder
gulp.task('clean', () => del(['./dist/']))

gulp.task('clean-intermediates', () => del(['./dist/*.css']))

gulp.task('compass-minify', () =>
gulp.src(['dist/legacy.css','dist/equinor-icons.css'])
.pipe(minifyCSS())
.pipe(concat('legacy.minified.css'))
.pipe(gulp.dest('dist/css')),
.pipe(gulp.dest('dist/css'))
)
// Copy static files to dist
gulp.task('copy-static-files', function () {
Expand All @@ -85,13 +87,16 @@ gulp.task('Iconfont', () =>
)
.on('glyphs', function (glyphs, options) {
console.log(glyphs, options)
gulp.src('src/sass/icons/equinor-icons.css').pipe(
gulp.src('src/sass/icons/equinor-icons.scss').pipe(
consolidate('lodash', {
glyphs: glyphs,
fontName: fontName,
className: 'si',
}),
)
.pipe(scss(scssSettings))
.pipe(autoprefixer())
.pipe(replace('@charset "UTF-8";', ''))
.pipe(gulp.dest('dist'))
})
.pipe(gulp.dest('dist/static/fonts'))
Expand All @@ -101,7 +106,7 @@ gulp.task('Iconfont', () =>
// ---------------------------------------------------------------------------------------

// Default Task
gulp.task('default', gulp.series('clean', gulp.parallel('compass-unminified', 'Iconfont', 'copy-static-files'),'compass-minify'))
gulp.task('default', gulp.series('clean', gulp.parallel('compass-unminified', 'Iconfont', 'copy-static-files'),'compass-minify','clean-intermediates'))

// Watch Task
gulp.task('watch', () => gulp.watch(['src/sass/*.scss', 'src/sass/**/*.scss'], ['compass-minify']))
Expand Down
5 changes: 3 additions & 2 deletions legacy/css/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@equinor/energyvision-legacy-css",
"version": "1.0.0",
"version": "1.0.2",
"description": "Legacy styles project moved from AEM source code",
"main": "dist/css/legacy.minified.css",
"style": "dist/css/legacy.minified.css",
Expand Down Expand Up @@ -34,7 +34,8 @@
"lodash": "^4.17.21",
"node-sass": "^4.11.0",
"susy": "2.2.14",
"gulp-concat":"2.6.1"
"gulp-concat":"2.6.1",
"gulp-replace":"1.1.3"
},
"dependencies": {
"del": "^6.0.0",
Expand Down
54 changes: 54 additions & 0 deletions legacy/css/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit bf8a17f

Please sign in to comment.