Skip to content

Commit

Permalink
Merge pull request #298 from nvisionative/develop
Browse files Browse the repository at this point in the history 
Merge `develop` into `main` for `2.3.0` release
  • Loading branch information
@david-poindexter
david-poindexter authored Apr 24, 2022
2 parents 4688c7b + 18f6de1 commit d17f336
Show file tree
Hide file tree
Showing 48 changed files with 2,058 additions and 1,972 deletions.
34 changes: 5 additions & 29 deletions default.ascx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,41 +6,17 @@

<!-- Main Content -->
<main>
<div class="container-fluid bannerpane">
<div class="container">
<div class="row justify-content-center">
<div id="BannerPane" class="col-md-8 text-center" runat="server"></div>
</div>
</div>
</div>

<div class="container">
<div class="row justify-content-center">
<div id="ContentPane" class="col-md-8 text-center" runat="server"></div>
</div>
</div>

<div id="BannerPane" runat="server"></div>

<div class="container">
<div class="row">
<div id="DoublePaneOneOne" class="col-md-6 cpr-5" runat="server"></div>
<div id="DoublePaneOneTwo" class="col-md-6 bg-light-grey cp-5" runat="server"></div>
</div>
</div>

<div class="container-fluid bg-tertiary">
<div class="container">
<div class="row align-items-center">
<div id="FullWidthBGDoublePaneOne" class="col-md-6 cpy-5" runat="server"></div>
<div id="FullWidthBGDoublePaneTwo" class="col-md-6" runat="server"></div>
</div>
<div id="ContentPane" class="col-12" runat="server"></div>
</div>
</div>

<div class="container">
<div class="row justify-content-center">
<div id="SinglePaneOne" class="col-md-8 text-center" runat="server"></div>
</div>
</div>
<div id="FluidPane" runat="server"></div>

</main>

<!-- Footer -->
Expand Down
102 changes: 73 additions & 29 deletions gulpfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@ var bs = require('browser-sync').create(),
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'),
modernizr = require('gulp-modernizr'),
imwebp = require('imagemin-webp'),
webp = require('gulp-webp'),
rename = require('gulp-rename'),
uglify = require('gulp-uglify'),
notify = require('gulp-notify'),
Expand Down Expand Up @@ -49,7 +52,7 @@ var paths = {
dest: './dist/js/'
},
images: {
src: './src/images/**/*.{jpg,jpeg,png,gif,svg}',
src: './src/images/**/*.{jpg,jpeg,png,gif,svg,webp}',
dest: './dist/images/'
},
styles: {
Expand Down Expand Up @@ -79,7 +82,7 @@ var paths = {
dest: './temp/'
},
zipelse: {
src: ['./menus/**/*', './partials/*', '*.{ascx,xml,html,htm}'],
src: ['./menus/**/*', './partials/*', '*.{ascx,xml,html,htm}', 'koi.json'],
zipfile: 'else.zip',
dest: './temp/'
},
Expand All @@ -104,28 +107,28 @@ var paths = {
function fontsInit() {
return gulp.src(paths.fonts.src)
.pipe(gulp.dest(paths.fonts.dest))
.pipe(notify({message: '<%= file.relative %> distributed!', title : 'fontsInit', sound: false}));
.pipe(notify({message: '<%= file.relative %> distributed!', title : 'fontsInit'}));
}

// Copy fontawesome-free fonts from node_modules to dist/fonts
function faFontsInit() {
return gulp.src(paths.faFonts.src)
.pipe(gulp.dest(paths.faFonts.dest))
.pipe(notify({message: '<%= file.relative %> distributed!', title : 'faFontsInit', sound: false}));
.pipe(notify({message: '<%= file.relative %> distributed!', title : 'faFontsInit'}));
}

// Copy fontawesome-free CSS from node_modules to dist/css/fontawesome-free
function faCssInit() {
return gulp.src(paths.faCss.src)
.pipe(gulp.dest(paths.faCss.dest))
.pipe(notify({message: '<%= file.relative %> distributed!', title : 'faCssInit', sound: false}));
.pipe(notify({message: '<%= file.relative %> distributed!', title : 'faCssInit'}));
}

// Copy jquery.slimmenu.min.js from src/assets to dist/js
function slimMenuInit() {
return gulp.src(paths.slimMenu.src)
.pipe(gulp.dest(paths.slimMenu.dest))
.pipe(notify({message: '<%= file.relative %> distributed!', title : 'slimMenuInit', sound: false}));
.pipe(notify({message: '<%= file.relative %> distributed!', title : 'slimMenuInit'}));
}

// Compile normalize.css from node_modules and copy to dist/js
Expand All @@ -136,15 +139,33 @@ function normalizeInit() {
.pipe(rename({suffix: '.min'}))
.pipe(autoprefixer())
.pipe(gulp.dest(paths.normalize.dest, { sourcemaps: '.' }))
.pipe(notify({message: '<%= file.relative %> compiled and distributed!', title : 'normalizeInit', sound: false}));
.pipe(notify({message: '<%= file.relative %> compiled and distributed!', title : 'normalizeInit'}));
}

// Copy bootstrap JS from node_modules to dist/js
function bsJsInit() {
return gulp.src(paths.bsJs.src)
.pipe(gulp.dest(paths.bsJs.dest))
.pipe(notify({message: '<%= file.relative %> distributed!', title : 'bsJsInit', sound: false}));
.pipe(notify({message: '<%= file.relative %> distributed!', title : 'bsJsInit'}));
}

// modernizr Init
function modernizrInit() {
return gulp.src(paths.scripts.src)
.pipe(modernizr({
'options': [
'setClasses'
],
'tests': [
'webp'
]
}))
.pipe(uglify())
.pipe(rename({suffix: '-custom.min'}))
.pipe(gulp.dest(paths.scripts.dest))
.pipe(notify({message: '<%= file.relative %> distributed!', title : 'modernizrInit', sound: false}));
}

/*------------------------------------------------------*/
/* END INIT TASKS --------------------------------------*/
/*------------------------------------------------------*/
Expand All @@ -154,17 +175,34 @@ function bsJsInit() {
/* IMAGE TASKS -----------------------------------------*/
/*------------------------------------------------------*/
// Optimize images and copy to dist/images
function images() {
function optimize() {
return gulp.src(paths.images.src, {since: gulp.lastRun(images)})
.pipe(imagemin({
interlaced: true,
progressive: true,
optimizationLevel: 5,
svgoPlugins: [{removeViewBox: true}]
}))
.pipe(imagemin([
imagemin.gifsicle({interlaced: true}),
imagemin.mozjpeg({quality: 75, progressive: true}),
imagemin.optipng({optimizationLevel: 5}),
imagemin.svgo({
plugins: [
{removeViewBox: true},
{cleanupIDs: false}
]
})
], {
plugins: imwebp({quality:75})
}
))
.pipe(gulp.dest(paths.images.dest))
.pipe(notify({message: '<%= file.relative %> optimized!', title : 'images', sound: false}));
.pipe(notify({message: '<%= file.relative %> optimized!', title : 'images'}));
}

// Make WebP versions of all images
function convert() {
return gulp.src(paths.images.src, {since: gulp.lastRun(images)})
.pipe(webp())
.pipe(gulp.dest(paths.images.dest))
.pipe(notify({message: '<%= file.relative %> converted to webp!', title : 'images'}));
}

/*------------------------------------------------------*/
/* END IMAGE TASKS -------------------------------------*/
/*------------------------------------------------------*/
Expand All @@ -181,7 +219,7 @@ function styles() {
.pipe(rename({suffix: '.min'}))
.pipe(autoprefixer())
.pipe(gulp.dest(paths.styles.dest, { sourcemaps: '.' }))
.pipe(notify({message: '<%= file.relative %> compiled and distributed!', title : 'styles', sound: false}));
.pipe(notify({message: '<%= file.relative %> compiled and distributed!', title: 'styles'}));
}
/*------------------------------------------------------*/
/* END STYLES TASKS ------------------------------------*/
Expand All @@ -200,7 +238,7 @@ function scripts() {
.pipe(gulp.dest(paths.scripts.dest, { sourcemaps: '.' }))
.pipe(jshint.reporter('default'))
.pipe(jshint.reporter('fail'))
.pipe(notify({ message : '<%= file.relative %> minified!', title : "scripts", sound: false}));
.pipe(notify({ message : '<%= file.relative %> minified!', title : "scripts"}));
}
/*------------------------------------------------------*/
/* END SCRIPTS TASKS -----------------------------------*/
Expand All @@ -214,7 +252,7 @@ function scripts() {
function containers() {
return gulp.src(paths.containers.src)
.pipe(gulp.dest(paths.containers.dest))
.pipe(notify({message: '<%= file.relative %> distributed!', title : 'containers', sound: false}));
.pipe(notify({message: '<%= file.relative %> distributed!', title : 'containers'}));
}

// Update manifest.dnn
Expand All @@ -232,7 +270,7 @@ function manifest() {
.pipe(replace(/(\\Skins\\)(.*?)(?=\\)/g, '\\Skins\\'+project))
.pipe(replace(/(\\Containers\\)(.*?)(?=\\)/g, '\\Containers\\'+project))
.pipe(gulp.dest(paths.manifest.dest))
.pipe(notify({message: '<%= file.relative %> updated!', title : 'manifest', sound: false}));
.pipe(notify({message: '<%= file.relative %> updated!', title : 'manifest'}));
}
/*------------------------------------------------------*/
/* END DNN TASKS ---------------------------------------*/
Expand All @@ -246,7 +284,7 @@ function manifest() {
function cleandist() {
return gulp.src(paths.cleandist.src, { allowEmpty: true })
.pipe(clean())
.pipe(notify({message: 'dist folder cleaned up!', title : 'cleandist', sound: false}));
.pipe(notify({message: 'dist folder cleaned up!', title : 'cleandist'}));
}
/*------------------------------------------------------*/
/* END MAINTENANCE TASKS -------------------------------*/
Expand All @@ -261,26 +299,26 @@ function zipdist() {
return gulp.src(paths.zipdist.src)
.pipe(zip(paths.zipdist.zipfile))
.pipe(gulp.dest(paths.zipdist.dest))
.pipe(notify({message: '<%= file.relative %> temporarily created!', title : 'zipdist', sound: false}));
.pipe(notify({message: '<%= file.relative %> temporarily created!', title : 'zipdist'}));
}

// ZIP contents of containers folder
function zipcontainers() {
return gulp.src(paths.zipcontainers.src)
.pipe(zip(paths.zipcontainers.zipfile))
.pipe(gulp.dest(paths.zipcontainers.dest))
.pipe(notify({message: '<%= file.relative %> temporarily created!', title : 'zipcontainers', sound: false}));
.pipe(notify({message: '<%= file.relative %> temporarily created!', title : 'zipcontainers'}));
}

// ZIP everything else
function zipelse() {
return gulp.src(paths.zipelse.src, {base: '.'})
.pipe(gulp.dest(paths.zipelse.dest))
.pipe(notify({message: '<%= file.relative %> temporarily created!', title : 'zipcontainers', sound: false}))
.pipe(notify({message: '<%= file.relative %> temporarily created!', title : 'zipcontainers'}))
.pipe(replace('dist/', ''))
.pipe(zip(paths.zipelse.zipfile))
.pipe(gulp.dest(paths.zipelse.dest))
.pipe(notify({message: '<%= file.relative %> temporarily created!', title : 'zipcontainers', sound: false}));
.pipe(notify({message: '<%= file.relative %> temporarily created!', title : 'zipcontainers'}));
}

// git ziptemp
Expand All @@ -291,14 +329,14 @@ function zippackage() {
return gulp.src(paths.zippackage.src)
.pipe(zip(paths.zippackage.zipfile))
.pipe(gulp.dest(paths.zippackage.dest))
.pipe(notify({message: '<%= file.relative %> created!', title : 'zippackage', sound: false}));
.pipe(notify({message: '<%= file.relative %> created!', title : 'zippackage'}));
}

// Clean temp folder
function cleantemp() {
return gulp.src(paths.cleantemp.src)
.pipe(clean())
.pipe(notify({message: 'temp folder cleaned up!', title : 'cleantemp', sound: false}));
.pipe(notify({message: 'temp folder cleaned up!', title : 'cleantemp'}));
}
/*------------------------------------------------------*/
/* END PACKAGING TASKS ---------------------------------*/
Expand Down Expand Up @@ -327,8 +365,11 @@ function watch() {
gulp.watch(paths.containers.src, containers);
}

// gulp images
var images = gulp.series(optimize, convert);

// gulp init
var init = gulp.series(fontsInit, faFontsInit, faCssInit, slimMenuInit, normalizeInit, bsJsInit);
var init = gulp.series(fontsInit, faFontsInit, faCssInit, slimMenuInit, normalizeInit, bsJsInit, modernizrInit);

// gulp build
var build = gulp.series(cleandist, init, styles, scripts, images, containers, manifest);
Expand All @@ -350,7 +391,10 @@ exports.faCssInit = faCssInit;
exports.slimMenuInit = slimMenuInit;
exports.normalizeInit = normalizeInit;
exports.bsJsInit = bsJsInit;
exports.convert = convert;
exports.optimize = optimize;
exports.images = images;
exports.modernizrInit = modernizrInit;
exports.styles = styles;
exports.scripts = scripts;
exports.containers = containers;
Expand Down
4 changes: 3 additions & 1 deletion manifest.dnn
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="9.0">
<packages>
<package name="nvisionative.nvQuickTheme" type="Skin" version="2.2.0">
<package name="nvisionative.nvQuickTheme" type="Skin" version="2.3.0">
<friendlyName>nvQuickTheme</friendlyName>
<description>A DNN Theme Dev Framework</description>
<iconFile>MyIcon.png</iconFile>
Expand Down Expand Up @@ -80,6 +80,8 @@
</staticContent>
</node>
<node path="/configuration/system.webServer/staticContent" action="update" key="fileExtension" collision="ignore">
<remove fileExtension=".eot" />
<mimeMap fileExtension=".eot" mimeType="application/vnd.ms-fontobject" />
<remove fileExtension=".otf" />
<mimeMap fileExtension=".otf" mimeType="font/otf" />
<remove fileExtension=".svg" />
Expand Down
10 changes: 5 additions & 5 deletions menus/main/MainMenu.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<li[?SELECTED] class="active"[/?]>

[?ENABLED]
<a href="[=URL]" class="btn btn-primary[?NODE] split[/?]" target="[=TARGET]">[=TEXT]</a>
<a href="[=URL]" class="btn btn-main-shade[?NODE] split[/?]"[?TARGET] target="[=TARGET]"[/?]>[=TEXT]</a>
[?ELSE]
<a href="#" class="btn btn-primary[?NODE] single[/?]" target="[=TARGET]">[=TEXT]</a>
<a href="#" class="btn btn-main-shade[?NODE] single[/?]"[?TARGET] target="[=TARGET]"[/?]>[=TEXT]</a>
[/?]

[?NODE]
Expand All @@ -23,9 +23,9 @@
<li class="[?SELECTED] active[/?]">

[?ENABLED]
<a href="[=URL]" [?NODE]class="split"[/?] target="[=TARGET]">[=TEXT]</a>
<a href="[=URL]" [?NODE]class="split"[/?][?TARGET] target="[=TARGET]"[/?]>[=TEXT]</a>
[?ELSE]
<a href="#" target="[=TARGET]">[=TEXT]</a>
<a href="#"[?TARGET] target="[=TARGET]"[/?]>[=TEXT]</a>
[/?]

[?NODE]
Expand All @@ -34,4 +34,4 @@
</ul>
[/?]
</li>
[/>]
[/>]
Loading

0 comments on commit d17f336

Please sign in to comment.