Skip to content

Commit

Permalink
Update dependencies (DNNCommunity#124)
Browse files Browse the repository at this point in the history
* Update dependencies

* Upgrade a few more dependencies
  • Loading branch information
david-poindexter authored Sep 5, 2022
1 parent 80271d2 commit 143ec68
Show file tree
Hide file tree
Showing 4 changed files with 1,405 additions and 1,711 deletions.
2 changes: 1 addition & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
var gulp = require('gulp'),
autoprefixer = require('gulp-autoprefixer'),
jshint = require('gulp-jshint'),
sass = require('gulp-sass'),
sass = require('gulp-sass')(require('sass')),
imagemin = require('gulp-imagemin'),
rename = require('gulp-rename'),
uglify = require('gulp-uglify'),
Expand Down
15 changes: 8 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,24 @@
"license": "GPL-3.0",
"private": true,
"dependencies": {
"bootstrap": "^4.5.3",
"bootstrap": "^4.6.2",
"font-awesome": "^4.7.0",
"normalize.css": "^8.0.1"
},
"devDependencies": {
"gulp": "^4.0.2",
"gulp-autoprefixer": "^7.0.1",
"gulp-autoprefixer": "^8.0.0",
"gulp-clean": "^0.4.0",
"gulp-clean-css": "^4.3.0",
"gulp-imagemin": "^7.1.0",
"gulp-jshint": "^2.1.0",
"gulp-notify": "^3.2.0",
"gulp-notify": "^4.0.0",
"gulp-rename": "^2.0.0",
"gulp-replace": "^1.0.0",
"gulp-sass": "^4.1.0",
"gulp-replace": "^1.1.3",
"gulp-sass": "^5.1.0",
"gulp-uglify": "^3.0.2",
"gulp-zip": "^5.0.2",
"jshint": "^2.12.0"
"gulp-zip": "^5.1.0",
"jshint": "^2.13.4",
"sass": "^1.50.1"
}
}
12 changes: 6 additions & 6 deletions src/scss/mixins/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
// usage: @include font-size(16)
@mixin font-size($sizeValue) {
font-size: $sizeValue + px;
font-size: ($sizeValue / 16) + rem;
font-size: calc($sizeValue / 16) + rem;
}

// vertical rhythm
// usage: @include font-baseline(16,24);
@mixin font-baseline($font-size, $lineheight){
font-size: $font-size + px;
font-size: ($font-size / $base-font-size ) + rem;
line-height: ( $lineheight / $font-size / 1 );
margin: 0 0 ( ($lineheight / $font-size * ( 1 / ( $lineheight / $defaultlineheight))) * .5em ) 0;
font-size: calc($font-size / $base-font-size) + rem;
line-height: calc($lineheight / $font-size / 1);
margin: 0 0 ( calc($lineheight / $font-size * calc( 1 / calc($lineheight / $defaultlineheight))) * .5em ) 0;
}

@mixin background-cover(){
Expand All @@ -25,13 +25,13 @@
}

@mixin mq-max-width( $width-in-px ) {
@media only screen and (max-width: ($width-in-px / $base-font-size) * 1em ) {
@media only screen and (max-width: calc($width-in-px / $base-font-size * 1em)) {
@content;
}
}

@mixin mq-min-width( $width-in-px ) {
@media only screen and (min-width: ($width-in-px / $base-font-size) * 1em ) {
@media only screen and (min-width: calc($width-in-px / $base-font-size * 1em)) {
@content;
}
}
Loading

0 comments on commit 143ec68

Please sign in to comment.