boot-5 about

README.md

@@ -12,6 +12,7 @@
 - git master -> main
 - rm old grunt files
 - rewrite gulpfile to auto-build
+  - replace uglify with terser
 - update packages
   - remove jasny boot for 5.0 offcanvas
 - consolidate and remove old scripts ( 

functions.php

@@ -52,7 +52,7 @@ function dw_scripts() {
 	wp_deregister_script('jquery');
 
 	if ( is_page('about') ) {
-		wp_enqueue_script( 'scriptmin', get_template_directory_uri() . '/js/v3-script.min.js', '', '', true );
+		wp_enqueue_script( 'scriptmin', get_template_directory_uri() . '/js/v4-script.min.js', '', '', true );
 		wp_enqueue_script( 'init', get_template_directory_uri() . '/js/about.js', '', '', true );
 	}
 

gulpfile.js

@@ -3,6 +3,7 @@ const gulp = require('gulp'),
       rename = require("gulp-rename"),
       cleanCSS = require('gulp-clean-css'),
       uglify = require('gulp-uglify'),
+      terser = require('gulp-terser'),
       sass = require('gulp-sass')(require('sass')),
       streamqueue = require('streamqueue');
       browserSync = require('browser-sync').create();
@@ -86,20 +87,15 @@ function cssf(cb) {
 
 function js(cb) {
   return streamqueue({ objectMode: true },
-      gulp.src('./js/v3-jquery.js'),
-      gulp.src('./js/v3-popper.js'),
-      gulp.src('./js/v3-bootstrap.js'),
-      gulp.src('./js/v3-jasny-bootstrap.js'),
-      gulp.src('./js/v3-moment.js'),
-      gulp.src('./js/v3-fullcalendar.js'),
-      gulp.src('./js/v3-fullcalendar-daygrid.js'),
-      gulp.src('./js/v3-fullcalendar-google.js'),
+      gulp.src('./js/v4-jquery.js'),
+      gulp.src('./js/v4-bootstrap.js'),
+      gulp.src('./js/v4-fullcalendar.js'),
+      gulp.src('./js/modernizr.js'),
       gulp.src('./js/validate.js'),
       gulp.src('./js/scripts.js')
     )
-  .pipe(concat('v3-script.js'))
-  .pipe(uglify())
-  .pipe(rename('v3-script.min.js'))
+  .pipe(terser({ output: {comments: false} }))
+  .pipe(concat('v4-script.min.js'))
   .pipe(gulp.dest('./js/', { overwrite:true })),
   console.log("JS built 🔧 "),
   cb();
@@ -141,9 +137,13 @@ function run() {
     open: 'external',
     host: 'daw.ovid',
     proxy: 'https://daw.ovid',
-    port: '333'
+    port: '333',
+    ssl: {
+      key: '/opt/homebrew/etc/httpd/ssl/daw.ovid-key.pem',
+      cert: '/opt/homebrew/etc/httpd/ssl/daw.ovid.pem'
+    }
   });
-  gulp.watch('./css/*.scss', gulp.series(mixin, build));
+  gulp.watch(['./style.css', './css/*.scss',]).on('change', gulp.series(mixin, build));
   gulp.watch(['./**/*.php', './**/*.js', './**/*.css']).on('change', gulp.series(reload));
   console.log("🔥 Run");
 }

js/about.js

@@ -11,6 +11,7 @@ jQuery(document).ready(function($) {
   })
 
   var person = localStorage.getItem('person');
+  console.log('person ' + person + ' from localstorage' )
 
   $('.nav-toggle').on('touchstart click', function(e) {
   	e.preventDefault();
@@ -44,12 +45,21 @@ jQuery(document).ready(function($) {
     vidout.play();
 
 
+
   $('#caro-lead').carousel({
   	interval: 5000,
-    cycle: true,
   	wrap: true
   });
 
+  $(document).on('keyup', function(e) {
+    if(e.which === 39){
+  	$('#caro-lead').carousel('next');
+    }
+    else if(e.which === 37){
+  	$('#caro-lead').carousel('prev');
+    }
+  });
+
   $('#caro-lead').on('slid.bs.carousel', function(event) {
   	var consta = $('#caro-lead li.active');
     //console.log('target: ' + consta.data('target') + ' value: ' + ' slide-to: ' + consta.data('slideTo'));
@@ -73,14 +83,7 @@ jQuery(document).ready(function($) {
 		animac.replay();
 	});
 
-  $(document).bind('keyup', function(e) {
-    if(e.which === 39){
-  	$('#caro-lead').carousel('next');
-    }
-    else if(e.which === 37){
-  	$('#caro-lead').carousel('prev');
-    }
-  });
+
 
 
 /*============================================
@@ -119,25 +122,29 @@ $('#commentform').validate({
 
 var calendarEl = document.getElementById('calendar');
   var calendar = new FullCalendar.Calendar(calendarEl, {
-    plugins: [ 'dayGrid', 'googleCalendar'  ],
-    header: {
-      left: 'title ',
+    headerToolbar: {
+      start: 'title',
       center: '',
-      right: 'prev,next '
+      end: 'prev,next'
     },
   	firstDay : 1,
-  	height: 345,
-    defaultView: 'dayGridMonth',
+  	height: 380,
+    views: {
+      dayGrid: { hiddenDays: [ 0,6,7 ] },
+      timeGrid: {
+        slotMinTime: '08:00:00',
+        slotMaxTime: '17:00:00',
+        dayHeaderFormat: { weekday: 'short' },
+        hiddenDays: [ 0,6,7 ]
+      },
+    },
     googleCalendarApiKey: 'AIzaSyAGowGJYx6dOaQvG_vSUI73uT88VWOTcNQ',
   	events: {
       googleCalendarId: 'davidawindham.com_bvrht1f8n2vgldgjenpgfdd4bk@group.calendar.google.com',
       className: 'gcal-event'
     },
-    eventRender: function(info) {
-    },
-    eventClick: function(info) {
-      info.jsEvent.preventDefault();
-    }
+    eventDataTransform: function(event) { event.url = ""; return event; },
+    eventClick: function(info) { info.jsEvent.preventDefault(); }
   });
 calendar.render();
 });

package-lock.json

@@ -24,11 +24,70 @@
         "gulp-concat": "^2.6.1",
         "gulp-rename": "^2.0.0",
         "gulp-sass": "^5.1.0",
+        "gulp-terser": "^2.1.0",
         "gulp-uglify": "^3.0.2",
         "sass": "^1.56.1",
         "streamqueue": "^1.1.2"
       }
     },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+      "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
+      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/source-map": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz",
+      "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.14",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
+      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
+      "dev": true
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.17",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz",
+      "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/resolve-uri": "3.1.0",
+        "@jridgewell/sourcemap-codec": "1.4.14"
+      }
+    },
     "node_modules/@popperjs/core": {
       "version": "2.11.6",
       "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz",
@@ -79,6 +138,18 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/acorn": {
+      "version": "8.8.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
+      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/animate.css": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/animate.css/-/animate.css-4.1.1.tgz",
@@ -2769,6 +2840,44 @@
         "node": ">=8"
       }
     },
+    "node_modules/gulp-terser": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/gulp-terser/-/gulp-terser-2.1.0.tgz",
+      "integrity": "sha512-lQ3+JUdHDVISAlUIUSZ/G9Dz/rBQHxOiYDQ70IVWFQeh4b33TC1MCIU+K18w07PS3rq/CVc34aQO4SUbdaNMPQ==",
+      "dev": true,
+      "dependencies": {
+        "plugin-error": "^1.0.1",
+        "terser": "^5.9.0",
+        "through2": "^4.0.2",
+        "vinyl-sourcemaps-apply": "^0.2.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/gulp-terser/node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/gulp-terser/node_modules/through2": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
+      "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "3"
+      }
+    },
     "node_modules/gulp-uglify": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/gulp-uglify/-/gulp-uglify-3.0.2.tgz",
@@ -5373,6 +5482,25 @@
         "urix": "^0.1.0"
       }
     },
+    "node_modules/source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dev": true,
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/source-map-support/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/source-map-url": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
@@ -5692,6 +5820,24 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/terser": {
+      "version": "5.16.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.1.tgz",
+      "integrity": "sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/source-map": "^0.3.2",
+        "acorn": "^8.5.0",
+        "commander": "^2.20.0",
+        "source-map-support": "~0.5.20"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/tfunk": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/tfunk/-/tfunk-4.0.0.tgz",
@@ -6343,6 +6489,55 @@
     }
   },
   "dependencies": {
+    "@jridgewell/gen-mapping": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+      "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      }
+    },
+    "@jridgewell/resolve-uri": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
+      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+      "dev": true
+    },
+    "@jridgewell/set-array": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+      "dev": true
+    },
+    "@jridgewell/source-map": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz",
+      "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/gen-mapping": "^0.3.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      }
+    },
+    "@jridgewell/sourcemap-codec": {
+      "version": "1.4.14",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
+      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
+      "dev": true
+    },
+    "@jridgewell/trace-mapping": {
+      "version": "0.3.17",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz",
+      "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/resolve-uri": "3.1.0",
+        "@jridgewell/sourcemap-codec": "1.4.14"
+      }
+    },
     "@popperjs/core": {
       "version": "2.11.6",
       "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz",
@@ -6386,6 +6581,12 @@
         "negotiator": "0.6.3"
       }
     },
+    "acorn": {
+      "version": "8.8.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
+      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
+      "dev": true
+    },
     "animate.css": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/animate.css/-/animate.css-4.1.1.tgz",
@@ -8563,6 +8764,40 @@
         }
       }
     },
+    "gulp-terser": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/gulp-terser/-/gulp-terser-2.1.0.tgz",
+      "integrity": "sha512-lQ3+JUdHDVISAlUIUSZ/G9Dz/rBQHxOiYDQ70IVWFQeh4b33TC1MCIU+K18w07PS3rq/CVc34aQO4SUbdaNMPQ==",
+      "dev": true,
+      "requires": {
+        "plugin-error": "^1.0.1",
+        "terser": "^5.9.0",
+        "through2": "^4.0.2",
+        "vinyl-sourcemaps-apply": "^0.2.1"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "through2": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz",
+          "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==",
+          "dev": true,
+          "requires": {
+            "readable-stream": "3"
+          }
+        }
+      }
+    },
     "gulp-uglify": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/gulp-uglify/-/gulp-uglify-3.0.2.tgz",
@@ -10644,6 +10879,24 @@
         "urix": "^0.1.0"
       }
     },
+    "source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dev": true,
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
     "source-map-url": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
@@ -10901,6 +11154,18 @@
       "integrity": "sha512-Kb3PrPYz4HanVF1LVGuAdW6LoVgIwjUYJGzFe7NDrBLCN4lsV/5J0MFurV+ygS4bRVwrCEt2c7MQ1R2a72oJDw==",
       "dev": true
     },
+    "terser": {
+      "version": "5.16.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.1.tgz",
+      "integrity": "sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/source-map": "^0.3.2",
+        "acorn": "^8.5.0",
+        "commander": "^2.20.0",
+        "source-map-support": "~0.5.20"
+      }
+    },
     "tfunk": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/tfunk/-/tfunk-4.0.0.tgz",

package.json

@@ -14,6 +14,7 @@
     "gulp-concat": "^2.6.1",
     "gulp-rename": "^2.0.0",
     "gulp-sass": "^5.1.0",
+    "gulp-terser": "^2.1.0",
     "gulp-uglify": "^3.0.2",
     "sass": "^1.56.1",
     "streamqueue": "^1.1.2"

page-about.php

@@ -10,12 +10,12 @@ get_header('home'); ?>
 	</video>
 
 	<div class="container-full leader about-caro">
-		<div id="caro-lead" class="carousel carousel-fade">
-			<ol class="carousel-indicators">
-				<li data-target="#caro-lead" data-slide-to="0" class="active"></li>
-				<li data-target="#caro-lead" data-slide-to="1"></li>
-				<li data-target="#caro-lead" data-slide-to="2"></li>
-			</ol>
+		<div id="caro-lead" class="carousel slide carousel-fade">
+      <div class="carousel-indicators">
+				<li data-bs-target="#caro-lead" data-bs-slide-to="0" class="active"></li>
+				<li data-bs-target="#caro-lead" data-bs-slide-to="1"></li>
+				<li data-bs-target="#caro-lead" data-bs-slide-to="2"></li>
+      </div>
 			<div class="carousel-inner">
         <div class="carousel-item active" data-id="0">
           <div class="container web">

page-studio.php

@@ -3,12 +3,12 @@
 		<div id="caro" class="carousel slide">
 			<div class="container">
 				<ol class="carousel-indicators">
-					<li data-target="#caro" data-slide-to="0" class="active"></li>
-					<li data-target="#caro" data-slide-to="1"></li>
-					<li data-target="#caro" data-slide-to="2"></li>
-					<li data-target="#caro" data-slide-to="3"></li>
-					<li data-target="#caro" data-slide-to="4"></li>
-					<li data-target="#caro" data-slide-to="5"></li>
+					<li data-bs-target="#caro" data-bs-slide-to="0" class="active"></li>
+					<li data-bs-target="#caro" data-bs-slide-to="1"></li>
+					<li data-bs-target="#caro" data-bs-slide-to="2"></li>
+					<li data-bs-target="#caro" data-bs-slide-to="3"></li>
+					<li data-bs-target="#caro" data-bs-slide-to="4"></li>
+					<li data-bs-target="#caro" data-bs-slide-to="5"></li>
 				</ol>
 			</div>
 			<div class="carousel-inner">
@@ -151,7 +151,7 @@
   						<div class="col-sm-9 mt-4">
 							<h2 class="fs-5">Note: It's been some time since I've updated this page, so I'm working on it... I started by replacing the photo above from a stock image I was using.  </h2>
   							<div class="entry-content">
-									
+
   								<h4 class="georgia"><em><span class="firstcharacter">A</span>lthough it seems that in the shower or sleeping is where my best work occurs,</em> the studio is the place where the shoe leather hits the pavement. I mostly work with web and application development, but I also do a good deal of graphic, print, and multimedia design. On my off hours, I like to turn off the computers to paint with camel hair, canvas, and minerals.</h4>
   							</div>
   						</div>

style.css

@@ -2902,9 +2902,21 @@ ul.tags {
 #calendar {
   color:#555;
 }
-.fc-unthemed .fc-content, .fc-unthemed .fc-divider, .fc-unthemed .fc-list-heading td, .fc-unthemed .fc-list-view, .fc-unthemed .fc-popover, .fc-unthemed .fc-row, .fc-unthemed tbody, .fc-unthemed td, .fc-unthemed th, .fc-unthemed thead {
+.fc-theme-standard, .fc-unthemed .fc-content, .fc-unthemed .fc-divider, .fc-unthemed .fc-list-heading td, .fc-unthemed .fc-list-view, .fc-unthemed .fc-popover, .fc-unthemed .fc-row, .fc-unthemed tbody, .fc-unthemed td, .fc-unthemed th, .fc-unthemed thead {
   border-color: #555;
 }
+.fc-theme-standard .fc-scrollgrid, .fc-theme-standard td, .fc-theme-standard th {
+  border-color: #555;
+}
+.fc .fc-toolbar.fc-header-toolbar {
+  margin-bottom: 5px;
+}
+.fc .fc-toolbar-title {
+  font-size: 16px;
+}
+.fc-h-event .fc-event-main {
+  color: #999;
+}
 .chess-html {
   padding: 0 5px 0 5px;
 }