Merge pull request #217 from nvisionative/release/2.2.0

Release/2.2.0

Author: david-poindexter

.gitignore

@@ -1,3 +1,4 @@
 node_modules/
 build/
 dist/
+yarn-error.log

default.ascx

@@ -44,4 +44,4 @@
 </main>
 
 <!-- Footer -->
-<!--#include file="partials/_footer.ascx" -->
+<!--#include file="partials/_footer.ascx" -->

docs/Commands.md

@@ -12,7 +12,8 @@ This command initializes all third-party dependencies utilized within **nvQuickT
 * **gulp bsJsInit**
 
 ### gulp build
-This command error checks, concatenates, compiles and minifies all your JS and SCSS into the `./dist/` folder, as well as copies your containers to the correct folder. More specifically, it executes the following commands in series (completes each task before the next):
+This command cleans your `./dist/` folder, then error checks, concatenates, compiles and minifies all your JS and SCSS into the `./dist/` folder, as well as copies your containers to the correct folder. More specifically, it executes the following commands in series (completes each task before the next):
+* **gulp cleandist**
 * **gulp init**
 * **gulp styles**
 * **gulp scripts**
@@ -55,6 +56,9 @@ Copies containers to the correct folder within your DNN instance (assuming you a
 ## Process Commands
 These commands are used within other commands and for other special situations. _We recommend use of these only for advanced users._
 
+### gulp cleandist
+Deletes contents of `./dist/` folder. This is particularly useful when assets (such as images) are no longer required and removed from `./src/` folder. It is the first task triggered during **gulp build**.
+
 ### gulp zipdist
 ZIPs contents of `./dist/` folder. Used to prepare for theme packaging.
 
@@ -67,5 +71,5 @@ ZIPs contents of `./menus/` folder, `./partials/` folder, and all ASCX, XML, HTM
 ### gulp zippackage
 ZIPs all subset ZIP files and other pertinent project files into theme package installation file using the following naming convention: `[project]_[version]_install.zip`
 
-### gulp cleanup
-Deletes all temporary ZIP and project files used in package tasks.
+### gulp cleantemp
+Deletes all temporary ZIP and project files from `./temp/` folder used in package tasks.

docs/_layouts/default.html

@@ -33,7 +33,7 @@ <h2>{{ site.description | default: site.github.project_tagline }}</h2>
     <div id="content-wrapper">
       <div class="inner clearfix">
         <section id="main-content">
-          <a href="https://www.nvquicktheme.com" target="_blank"><img alt="nvQuickTheme" src="https://www.nvquicktheme.com/portals/0/nvQuickTheme_logo.png" /></a>
+          <a href="https://www.nvquicktheme.com" rel="noopener noreferrer" target="_blank"><img alt="nvQuickTheme" src="https://www.nvquicktheme.com/portals/0/nvQuickTheme_logo.png" /></a>
 
           {{ content }}
         </section>
@@ -65,7 +65,7 @@ <h3>{{ item.title }}</h3>
           <p>This page was generated by <a href="https://pages.github.com">GitHub Pages</a>.</p>
         </aside>
         <div class="footer">
-          <a href="https://www.nvisionative.com" target="_blank"><img alt="Brought to the DNN community by nvisionative" src="https://www.nvquicksite.com/Portals/0/broughtBy-nvisionative.png" /></a>
+          <a href="https://www.nvisionative.com" rel="noopener noreferrer" target="_blank"><img alt="Brought to the DNN community by nvisionative" src="https://www.nvquicksite.com/Portals/0/broughtBy-nvisionative.png" /></a>
         </div>
       </div>
     </div>

gulpfile.js

@@ -10,7 +10,7 @@ var bs            = require('browser-sync').create(),
     replace       = require('gulp-replace'),
     zip           = require('gulp-zip'),
     clean         = require('gulp-clean'),
-    cleanCSS      = require('gulp-clean-css');
+    cleanCSS      = require('gulp-clean-css'),
     details       = require('./project-details.json'),
     project       = details.project,
     version       = details.version,
@@ -88,8 +88,11 @@ var paths = {
     zipfile: project+'\_'+version+'\_install.zip',
     dest: './build/'
   },
-  cleanup: {
+  cleantemp: {
     src: './temp/'
+  },
+  cleandist: {
+    src: './dist/'
   }
 };
 
@@ -131,18 +134,11 @@ function normalizeInit() {
   .pipe(sass({outputStyle: 'compressed'}).on('error', sass.logError))
   .pipe(cleanCSS())
   .pipe(rename({suffix: '.min'}))
-  .pipe(autoprefixer({browsers: ['last 2 versions', 'ie >= 9', '> 1%']}))
+  .pipe(autoprefixer())
   .pipe(gulp.dest(paths.normalize.dest, { sourcemaps: '.' }))
   .pipe(notify({message: '<%= file.relative %> compiled and distributed!', title : 'normalizeInit', sound: false}));
 }
 
-// Copy bootstrap CSS from node_modules to dist/css
-function bsCssInit() {
-  return gulp.src(paths.bsCss.src)
-    .pipe(gulp.dest(paths.bsCss.dest))
-    .pipe(notify({message: '<%= file.relative %> distributed!', title : 'bsCssInit', sound: false}));
-}
-
 // Copy bootstrap JS from node_modules to dist/js
 function bsJsInit() {
   return gulp.src(paths.bsJs.src)
@@ -183,7 +179,7 @@ function styles() {
   .pipe(sass({includePaths: ['./node_modules']},{outputStyle: 'compressed'}).on('error', sass.logError))
   .pipe(cleanCSS())
   .pipe(rename({suffix: '.min'}))
-  .pipe(autoprefixer({browsers: ['last 2 versions', 'ie >= 9', '> 1%']}))
+  .pipe(autoprefixer())
   .pipe(gulp.dest(paths.styles.dest, { sourcemaps: '.' }))
   .pipe(notify({message: '<%= file.relative %> compiled and distributed!', title : 'styles', sound: false}));
 }
@@ -243,6 +239,20 @@ function manifest() {
 /*------------------------------------------------------*/
 
 
+/*------------------------------------------------------*/
+/* MAINTENANCE TASKS -----------------------------------*/
+/*------------------------------------------------------*/
+// Clean up dist folder
+function cleandist() {
+  return gulp.src(paths.cleandist.src, { allowEmpty: true })
+    .pipe(clean())
+    .pipe(notify({message: 'dist folder cleaned up!', title : 'cleandist', sound: false}));
+}
+/*------------------------------------------------------*/
+/* END MAINTENANCE TASKS -------------------------------*/
+/*------------------------------------------------------*/
+
+
 /*------------------------------------------------------*/
 /* PACKAGING TASKS -------------------------------------*/
 /*------------------------------------------------------*/
@@ -284,11 +294,11 @@ function zippackage() {
     .pipe(notify({message: '<%= file.relative %> created!', title : 'zippackage', sound: false}));
 }
 
-// Cleanup temp folder
-function cleanup() {
-  return gulp.src(paths.cleanup.src)
+// Clean temp folder
+function cleantemp() {
+  return gulp.src(paths.cleantemp.src)
     .pipe(clean())
-    .pipe(notify({message: 'temp folder cleaned up!', title : 'cleanup', sound: false}));
+    .pipe(notify({message: 'temp folder cleaned up!', title : 'cleantemp', sound: false}));
 }
 /*------------------------------------------------------*/
 /* END PACKAGING TASKS ---------------------------------*/
@@ -321,10 +331,10 @@ function watch() {
 var init = gulp.series(fontsInit, faFontsInit, faCssInit, slimMenuInit, normalizeInit, bsJsInit);
 
 // gulp build
-var build = gulp.series(init, styles, scripts, images, containers, manifest);
+var build = gulp.series(cleandist, init, styles, scripts, images, containers, manifest);
 
 // gulp package
-var package = gulp.series(build, ziptemp, zippackage, cleanup);
+var package = gulp.series(build, ziptemp, zippackage, cleantemp);
 /*------------------------------------------------------*/
 /* END DEV TASKS ---------------------------------------*/
 /*------------------------------------------------------*/
@@ -339,19 +349,19 @@ exports.faFontsInit = faFontsInit;
 exports.faCssInit = faCssInit;
 exports.slimMenuInit = slimMenuInit;
 exports.normalizeInit = normalizeInit;
-exports.bsCssInit = bsCssInit;
 exports.bsJsInit = bsJsInit;
 exports.images = images;
 exports.styles = styles;
 exports.scripts = scripts;
 exports.containers = containers;
 exports.manifest = manifest;
+exports.cleandist = cleandist;
 exports.zipdist = zipdist;
 exports.zipcontainers = zipcontainers;
 exports.zipelse = zipelse;
 exports.ziptemp = ziptemp;
 exports.zippackage = zippackage;
-exports.cleanup = cleanup;
+exports.cleantemp = cleantemp;
 exports.serve = serve;
 exports.watch = watch;
 exports.init = init;

package.json

@@ -8,7 +8,7 @@
   "private": true,
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.9.0",
-    "bootstrap": "^4.3.1",
+    "bootstrap": "^4.4.1",
     "normalize.css": "^8.0.1"
   },
   "devDependencies": {
@@ -26,5 +26,18 @@
     "gulp-uglify": "^3.0.0",
     "gulp-zip": "^4.1.0",
     "jshint": "^2.9.5"
-  }
+  },
+  "browserslist": [
+    "> 1%",
+    "ie >= 8",
+    "edge >= 15",
+    "ie_mob >= 10",
+    "ff >= 45",
+    "chrome >= 45",
+    "safari >= 7",
+    "opera >= 23",
+    "ios >= 7",
+    "android >= 4",
+    "bb >= 10"
+  ]
 }

partials/_footer.ascx

@@ -15,4 +15,6 @@
       </ul>
     </div>
   </div>
+
+  <dnn:Login runat="server" id="dnnHiddenLogin" CssClass="hiddenLogin" />
 </footer>

partials/_includes-popUpSkin.ascx

@@ -0,0 +1,3 @@
+<dnn:META ID="mobileScale" runat="server" Name="viewport" Content="width=device-width, initial-scale=1.0" />
+
+<dnn:DnnCssInclude runat="server" FilePath="dist/css/layouts/popUpSkin.min.css" Priority="120" PathNameAlias="SkinPath" />

partials/_registers-popUpSkin.ascx

@@ -0,0 +1,2 @@
+<%@ Control Language="C#" AutoEventWireup="false" Explicit="True" Inherits="DotNetNuke.UI.Skins.Skin" %>
+<%@ Register TagPrefix="dnn" TagName="META" Src="~/Admin/Skins/Meta.ascx" %>

popUpSkin.ascx

@@ -0,0 +1,4 @@
+<!--#include file="partials/_registers-popUpSkin.ascx" -->
+<!--#include file="partials/_includes-popUpSkin.ascx" -->
+
+<div id="ContentPane" runat="server" />

src/scss/components/_login.scss

@@ -102,7 +102,7 @@
                             padding-right: .25em;
                         }
 
-                        &::nth-child(2) {
+                        &:nth-child(2) {
                             padding-left: .25em;
                         }
                     }
@@ -114,4 +114,16 @@
             }
         }
     }
+}
+
+
+//Hides the #dnnHiddenLogin LOGIN theme object
+.hiddenLogin {
+    bottom: 0;
+    display: none;
+    height: 25px;
+    left: 0;
+    position: fixed;
+    text-indent: -1000px;
+    width: 25px;
 }

src/scss/layouts/popUpSkin.scss

@@ -0,0 +1,3 @@
+html {
+    height: auto;
+}

src/scss/style.scss

@@ -1,3 +1,4 @@
+@import 'variables/bs-overrides';
 @import 'autoload/autoload';
 @import 'variables/variables';
 @import 'mixins/mixins';

src/scss/variables/_bs-overrides.scss

@@ -0,0 +1,75 @@
+/* Bootstrap Overrides */
+
+// Bootstrap colors
+$bs-colors: (
+  'primary':#ec3d46,
+  'secondary':#00a5e1,
+  'success':#28a745,
+  'info':#17a2b8,
+  'warning':#ffc107,
+  'danger':#dc3545,
+  'light':#f8f9fa,
+  'dark':#343a40
+);
+
+$primary:map-get($bs-colors, 'primary');
+$secondary:map-get($bs-colors, 'secondary');
+$success:map-get($bs-colors, 'success');
+$info:map-get($bs-colors, 'info');
+$warning:map-get($bs-colors, 'warning');
+$danger:map-get($bs-colors, 'danger');
+$light:map-get($bs-colors, 'light');
+$dark:map-get($bs-colors, 'dark');
+
+// Grid breakpoints (changed to relative units to fix cross-platform inconsistencies)
+$grid-breakpoints: (
+  xs: 0,
+  sm: 36rem,
+  md: 48rem,
+  lg: 62rem,
+  xl: 75rem
+);
+
+// Grid containers (changed to relative units to fix cross-platform inconsistencies)
+$container-max-widths: (
+  sm: 33.75rem,
+  md: 45rem,
+  lg: 60rem,
+  xl: 71.25rem
+);
+
+// Override Bootstrap spacers for more options
+$spacer:1rem;
+$spacers: (
+    0: 0,
+    1: $spacer,
+    2: ($spacer * 2),
+    3: ($spacer * 3),
+    4: ($spacer * 4),
+    5: ($spacer * 5),
+    6: ($spacer * 6),
+    7: ($spacer * 7),
+    8: ($spacer * 8)
+);
+
+// Get rid of deprecated warnings
+$enable-deprecation-messages: false;
+
+// Change gutter width
+$grid-gutter-width: 22px !default;
+
+// Form Control changes
+$input-height:2rem;
+$input-color:#444;
+$input-font-size:13;
+$input-border-radius:2px;
+$input-padding-y:.25rem;
+$input-padding-x:.75rem;
+
+$form-check-input-margin-y:3px;
+
+$custom-file-height-inner:unset;
+$custom-file-line-height:1.61539;
+
+// The yiq lightness value that determines when the lightness of color changes from "dark" to "light". Acceptable values are between 0 and 255.
+// $yiq-contrasted-threshold:  195 !default;

src/scss/variables/_colors.scss

@@ -3,9 +3,9 @@ $light-grey: #e6e6e6 !default;
 $grey:#7d7d7d !default;
 $dark-grey: #333333 !default;
 
-$primary-color: rgb(236, 61, 70) !default;
-$secondary-color: rgb(0, 165, 225) !default;
-$tertiary-color: rgb(70, 42, 43) !default;
+$primary-color: map-get($bs-colors, 'primary') !default;
+$secondary-color: map-get($bs-colors, 'secondary')  !default;
+$tertiary-color: #462a2b !default;
 
 $border-color: #bbb !default;
 $link-color: $primary-color !default;