Skip to content

Commit

Permalink
Merge develop into main for v1.2.1 release (#125)
Browse files Browse the repository at this point in the history
* Update author list template to hide on post detail (#122)

* Update dependencies (#124)

* Update dependencies

* Upgrade a few more dependencies
  • Loading branch information
david-poindexter authored Sep 5, 2022
1 parent 9597173 commit fa77a1c
Show file tree
Hide file tree
Showing 7 changed files with 1,419 additions and 1,714 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
2 changes: 1 addition & 1 deletion manifest.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="9.0">
<packages>
<package name="nvisionative.DNNCommunityTheme" type="Skin" version="1.2.0">
<package name="nvisionative.DNNCommunityTheme" type="Skin" version="1.2.1">
<friendlyName>DNNCommunityTheme</friendlyName>
<description>A DNN Theme by and for the DNN Community</description>
<iconFile>MyIcon.png</iconFile>
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"
}
}
2 changes: 1 addition & 1 deletion project-details.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"project": "DNNCommunityTheme",
"version": "1.2.0",
"version": "1.2.1",
"author": "David Poindexter",
"company": "nvisionative",
"url": "www.nvisionative.com",
Expand Down
13 changes: 12 additions & 1 deletion src/Templates/Blog/CommunityAuthorList/Template.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
<div id="authorList[module:moduleid]" class="authorList_list">
[subtemplate|Author.html|authors]
[if|1][query:postselected][=]False[/if]
<h2>Blog Authors</h2>
[subtemplate|Author.html|authors]
[endif|1]
[if|2][query:postselected][=]True[/if]
<script lang="javascript">
var moduleId = [module:moduleid];
document.querySelector('.DnnModule-' + moduleId).remove();
document.querySelector('#dnn_WideLeftPane').classList.replace('col-lg-8', 'col-auto');
document.querySelector('#dnn_NarrowRightPane').classList.replace('col-lg-4', 'col');
</script>
[endif|2]
</div>
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 fa77a1c

Please sign in to comment.