chore(npm): cleanup dependencies, move to Dart Sass

pull/289/head
Francis Lachapelle 2020-11-16 10:21:56 -05:00
parent 12047d112f
commit defd3c97a9
5 changed files with 10 additions and 9 deletions

View File

@ -21,7 +21,7 @@ module.exports = function(grunt) {
'js/vendor/FileSaver.min.js': ['node_modules/file-saver/dist/FileSaver.js']
};
const sass = require('node-sass');
const sass = require('sass');
require('time-grunt')(grunt);
// Tasks

View File

@ -20,18 +20,15 @@
"devDependencies": {
"autoprefixer": "^9.8.5",
"breakpoint-sass": ">=2.4.2",
"csswring": ">=3.0.0",
"grunt": "^1.3.0",
"grunt-contrib-cssmin": ">=1.0.0",
"grunt-contrib-jshint": ">=0.11.2",
"grunt-contrib-jshint": "^3.0.0",
"grunt-contrib-uglify": "^5.0.0",
"grunt-contrib-watch": ">=0.5.3",
"grunt-cssnano": "^2.1.0",
"grunt-ng-annotate": "^4.0.0",
"grunt-postcss": ">=0.6.0",
"grunt-sass": "^3.1.0",
"kss": "^3.0.1",
"node-sass": "^4.14.1",
"sass": "^1.29.0",
"time-grunt": "latest"
},
"browserslist": [

View File

@ -1,6 +1,10 @@
/// button.scss -*- Mode: scss; indent-tabs-mode: nil; basic-offset: 2 -*-
@import 'extends';
md-button {
font-weight: 600;
}
md-sidenav md-list .md-button {
font-weight: normal;
}
@ -150,7 +154,7 @@ $button-fab-height: 56px;
a.md-button.sg-icon-button,
.md-button.sg-icon-button,
md-list md-list-item button.md-button.sg-icon-button {
@extend .md-button.md-icon-button;
@extend .md-button, .md-icon-button;
//transition: $iconButton-transition;
min-width: $iconButton-size;
&:hover:not([disabled]),

View File

@ -185,7 +185,7 @@ sg-timepicker {
}
.sg-timepicker-triangle-button.md-button.md-icon-button {
@extend .md-datepicker-triangle-button.md-button.md-icon-button;
@extend .md-datepicker-triangle-button, .md-button, .md-icon-button;
}
// Disabled state for all elements of the picker.

View File

@ -147,7 +147,7 @@ $sg-typo-scale: (
45,
56,
112
) !global;
);
// todo: fix that
//@function sg-font-sizes($size-List: $sg-typo-scale, $prefix: '$sg-font-size') {