ultimate-jekyll-manager 0.0.16 → 0.0.18

package/README.md

@@ -40,9 +40,18 @@ npm start
 ```
 
 ## 📦 How to sync with the template
-1. Simply run `npx uj setup` in Terminal to get all the latest updates from the **Ultimate Jekyll template**.
+1. Simply run `npm start` in Terminal to get all the latest updates from the **Ultimate Jekyll template** and launch your website in the browser.
 
 ## 🌎 Publishing your website
 1. Change the `url` in `_config.yml` to your domain.
 2. Push your changes to GitHub using `npm run dist` in Terminal.
 
+## ⛳️ Flags
+* `--browser=false` - Disables the browser from opening when running `npm start`.
+```bash
+npm start -- --browser=false
+```
+* `--debug=true` - Enables logging of extra information when running `npm start`.
+```bash
+npm start -- --debug=true
+```

package/dist/build.js

@@ -1,8 +1,8 @@
 // Libraries
 const jetpack = require('fs-jetpack');
-const path = require('path');
 const yaml = require('js-yaml');
-const { execute } = require('node-powertools');
+const argv = require('yargs').argv;
+const { force } = require('node-powertools');
 
 // Class
 function Manager() {
@@ -30,6 +30,20 @@ Manager.prototype.logger = function (name) {
   return this._logger;
 };
 
+// argv
+Manager.getArguments = function () {
+  const options = argv || {};
+
+  // Fix
+  options._ = options._ || [];
+  options.browser = force(options.browser === undefined ? true : options.browser, 'boolean');
+  options.debug = force(options.debug === undefined ? false : options.debug, 'boolean');
+
+  // Return
+  return options;
+};
+Manager.prototype.getArguments = Manager.getArguments;
+
 // isServer
 Manager.isServer = function () {
   return process.env.UJ_IS_SERVER === 'true';

package/dist/cli.js

@@ -41,6 +41,10 @@ function resolveCommand(options) {
 function Main() {}
 
 Main.prototype.process = async function (options) {
+  // Fix options
+  options = options || {};
+  options._ = options._ || [];
+
   // Determine the command (use default if not provided)
   const command = resolveCommand(options);
 

package/dist/commands/setup.js

@@ -1,6 +1,7 @@
 // Libraries
 const Manager = new (require('../build.js'));
 const logger = Manager.logger('setup');
+const argv = Manager.getArguments();
 const path = require('path');
 const jetpack = require('fs-jetpack');
 const version = require('wonderful-version');
@@ -17,6 +18,7 @@ const templating = {
   bundlerVersion: version.clean(package.engines.bundler),
   nodeVersion: version.major(package.engines.node),
 };
+const config = Manager.getConfig();
 
 // Dependency MAP
 const DEPENDENCY_MAP = {
@@ -26,15 +28,48 @@ const DEPENDENCY_MAP = {
 // File MAP
 const FILE_MAP = {
   // Files to skip overwrite
-  'hooks/**/*': {overwrite: false},
-  'src/**/*': {overwrite: false},
-
-  // Files to rename
-  '_.gitignore': {rename: '.gitignore'},
+  'hooks/**/*': {
+    overwrite: false,
+  },
+  'src/**/*': {
+    overwrite: false,
+  },
+  'src/**/*.{html,md}': {
+    skip: (file) => {
+      // Get the name
+      const name = path.basename(file.name, path.extname(file.name));
+      const htmlFilePath = path.join(file.destination, `${name}.html`);
+      const mdFilePath = path.join(file.destination, `${name}.md`);
+      const htmlFileExists = jetpack.exists(htmlFilePath);
+      const mdFileExists = jetpack.exists(mdFilePath);
+      const eitherExists = htmlFileExists || mdFileExists;
+
+      console.log('--htmlFilePath', htmlFilePath);
+      console.log('--mdFilePath', mdFilePath);
+      console.log('--htmlFileExists', htmlFileExists);
+      console.log('--mdFileExists', mdFileExists);
+      console.log('--eitherExists', eitherExists);
+
+      // Skip if both files exist
+      return eitherExists;
+    },
+  },
+
+  // Files to rewrite path
+  'dist/pages/**/*': {
+    path: (file) => file.source.replace('dist/pages', 'dist'),
+  },
+  '_.gitignore': {
+    name: (file) => file.name.replace('_.gitignore', '.gitignore'),
+  },
 
   // Files to run templating on
-  '.github/workflows/build.yml': {template: templating},
-  '.nvmrc': {template: templating},
+  '.github/workflows/build.yml': {
+    template: templating,
+  },
+  '.nvmrc': {
+    template: templating,
+  },
 }
 
 module.exports = async function (options) {
@@ -47,6 +82,9 @@ module.exports = async function (options) {
   project.devDependencies = project.devDependencies || {};
 
   try {
+    // Log current working directory
+    await logCWD();
+
     // Ensure this package is up-to-date
     await updateManager();
 
@@ -68,6 +106,15 @@ module.exports = async function (options) {
     // Build files
     await buildSiteFiles();
 
+    // Copy all files from src/defaults/dist on first run
+    // await copyDefaultDistFiles();
+
+    // Create CNAME
+    await createCNAME();
+
+    // Fetch firebase-auth files
+    await fetchFirebaseAuth();
+
     // Check which locality we are using
     await checkLocality();
 
@@ -77,6 +124,12 @@ module.exports = async function (options) {
   }
 };
 
+async function logCWD() {
+  logger.log('Current working directory:', process.cwd());
+  // logger.log('Current working directory 2:', await execute('pwd'));
+  // logger.log('Current working directory 3:', await execute('ls -al'));
+}
+
 async function updateManager() {
   const npm = new NPM();
 
@@ -89,20 +142,25 @@ async function updateManager() {
     }, (e) => {
       return '0.0.0';
     });
+  const isUpToDate = version.is(installedVersion, '>=', latestVersion);
+  const levelDifference = version.levelDifference(installedVersion, latestVersion);
+
+  // Log
+  logVersionCheck('ultimate-jekyll-manager', installedVersion, latestVersion, isUpToDate);
 
   // Quit if local
   if (installedVersion.startsWith('file:')) {
-    return logger.log('Local version detected. Skipping update check.');
+    return;
   }
 
-  // Log
-  logger.log('Installed Version:', installedVersion);
-  logger.log('Latest Version:', latestVersion);
-
   // Check if we need to update
-  if (version.is(installedVersion, '>=', latestVersion)) {
-    return logger.log('Ultimate Jekyll Manager is up-to-date.');
-  } else {
+  if (!isUpToDate) {
+    // Quit if major version difference
+    if (levelDifference === 'major') {
+      return logger.error(`Major version difference detected. Please update to ${latestVersion} manually.`);
+    }
+
+    // Install the latest version
     await install('ultimate-jekyll-manager', latestVersion);
   }
 }
@@ -110,15 +168,13 @@ async function updateManager() {
 async function ensureNodeVersion() {
   const installedVersion = version.clean(process.version);
   const requiredVersion = version.clean(package.engines.node);
+  const isUpToDate = version.is(installedVersion, '>=', requiredVersion);
 
   // Log
-  logger.log('Installed Node Version:', installedVersion);
-  logger.log('Required Node Version:', requiredVersion);
+  logVersionCheck('Node.js', installedVersion, requiredVersion, isUpToDate);
 
   // Check if we need to update
-  if (version.is(installedVersion, '>=', requiredVersion)) {
-    return logger.log('Node version is up-to-date.');
-  } else {
+  if (!isUpToDate) {
     throw new Error(`Node version is out-of-date. Required version is ${requiredVersion}.`);
   }
 }
@@ -128,15 +184,13 @@ async function ensureBundlerVersion() {
     (await execute('bundler -v', { log: false })).match(/(\d+\.\d+\.\d+)/)[0]
   );
   const requiredVersion = version.clean(package.engines.bundler);
+  const isUpToDate = version.is(installedVersion, '>=', requiredVersion);
 
   // Log
-  logger.log('Installed Bundler Version:', installedVersion);
-  logger.log('Required Bundler Version:', requiredVersion);
+  logVersionCheck('Bundler', installedVersion, requiredVersion, isUpToDate);
 
   // Check if we need to update
-  if (version.is(installedVersion, '>=', requiredVersion)) {
-    return logger.log('Bundler version is up-to-date.');
-  } else {
+  if (!isUpToDate) {
     throw new Error(`Bundler version is out-of-date. Required version is ${requiredVersion}.`);
   }
 }
@@ -146,15 +200,13 @@ async function ensureRubyVersion() {
     (await execute('ruby -v', { log: false })).match(/(\d+\.\d+\.\d+)/)[0]
   );
   const requiredVersion = version.clean(package.engines.ruby);
+  const isUpToDate = version.is(installedVersion, '>=', requiredVersion);
 
   // Log
-  logger.log('Installed Ruby Version:', installedVersion);
-  logger.log('Required Ruby Version:', requiredVersion);
+  logVersionCheck('Ruby', installedVersion, requiredVersion, isUpToDate);
 
   // Check if we need to update
-  if (version.is(installedVersion, '>=', requiredVersion)) {
-    return logger.log('Ruby version is up-to-date.');
-  } else {
+  if (!isUpToDate) {
     throw new Error(`Ruby version is out-of-date. Required version is ${requiredVersion}.`);
   }
 }
@@ -163,19 +215,24 @@ async function ensurePeerDependencies() {
   const requiredPeerDependencies = package.peerDependencies || {};
 
   // Loop through and make sure project has AT LEAST the required version
-  for (const [dependency, ver] of Object.entries(requiredPeerDependencies)) {
-    const projectDependencyVersion = project.dependencies[dependency] || project.devDependencies[dependency];
+  for (let [dependency, ver] of Object.entries(requiredPeerDependencies)) {
+    const projectDependencyVersion = version.clean(project.dependencies[dependency] || project.devDependencies[dependency]);
     const location = DEPENDENCY_MAP[dependency] === 'dev' ? '--save-dev' : '';
+    const isUpToDate = version.is(projectDependencyVersion, '>=', ver);
+
+    // Clean version if needed
+    ver = version.clean(ver);
 
     // Log
-    logger.log('Checking peer dep:', dependency, '-->', projectDependencyVersion, '>=', ver);
+    // logger.log('Checking peer dep:', dependency, '-->', projectDependencyVersion, '>=', ver);
+    logVersionCheck(dependency, projectDependencyVersion, ver, isUpToDate);
 
     // Install if not found
     if (
       // Not found
       !projectDependencyVersion
       // Not the right version
-      || version.is(projectDependencyVersion, '<', ver)
+      || !isUpToDate
     ) {
       await install(dependency, ver, location);
     }
@@ -239,6 +296,8 @@ function buildSiteFiles() {
     '**/*',
 
     // Files to exclude
+    // Dist files
+    // '!dist/**',
     '!**/.DS_Store', // TODO: NOT WORKING
   ]
 
@@ -249,44 +308,100 @@ function buildSiteFiles() {
     nodir: true,
   });
 
+  const debug = argv.debug
+    || true;
+
   // Log
-  // logger.log('Files:', files);
+  logger.log(`Preparing to copy ${files.length} default files...`);
 
   // Loop
   for (const file of files) {
+    // Build item
+    const item = {
+      source: null,
+      destination: null,
+      name: null,
+    }
     // Get the destination
-    const source = path.join(dir, file);
-    let destination = path.join(process.cwd(), file.replace('defaults/', ''));
-    const filename = path.basename(destination);
+    // const source = path.join(dir, file);
+    // let destination = path.join(process.cwd(), file.replace('defaults/', ''));
+    // const filename = path.basename(destination);
+
+    // Set the item properties
+    item.source = path.dirname(path.join(dir, file));
+    item.name = path.basename(file);
+    item.destination = path.dirname(path.join(process.cwd(), file.replace('defaults/', '')));
+
+    // Get options
     const options = getFileOptions(file);
+    const ogName = item.name;
 
     // Quit if file is '_'
-    if (filename === '_') {
+    // We have files like this to trigger the creation of directories without them being ignored by git
+    if (item.name === '_') {
       // First, create the directory around the file
-      jetpack.dir(destination.split(path.sep).slice(0, -1).join(path.sep));
+      jetpack.dir(item.destination);
 
       // Skip
       continue;
     }
 
-    // Rename if needed
-    if (options.rename) {
-      destination = destination.replace(filename, options.rename);
+    // Resolve name
+    if (typeof options.name === 'function') {
+      item.name = options.name(item);
     }
 
-    // Check if the file exists
-    const exists = jetpack.exists(destination);
+    // Resolve path
+    if (typeof options.path === 'function') {
+      item.destination = options.path(item);
+    }
+
+    // Resolve overwrite
+    if (typeof options.overwrite === 'function') {
+      options.overwrite = options.overwrite(item);
+    }
+
+    // Resolve skip
+    if (typeof options.skip === 'function') {
+      options.skip = options.skip(item);
+    }
 
     // Log
-    // logger.log('File:', file);
-    // logger.log('filename:', filename);
-    // logger.log('options:', options);
-    // logger.log('contents:', jetpack.read(source));
-    // logger.log('source:', source);
-    // logger.log('Destination:', destination);
+    if (debug) {
+      logger.log(`Copying defaults...`);
+      logger.log(`  name: ${item.name}`);
+      logger.log(`  from: ${item.source}`);
+      logger.log(`  to: ${item.destination}`);
+      logger.log(`  overwrite: ${options.overwrite}`);
+      logger.log(`  skip: ${options.skip}`);
+
+      // logger.log('File:', file);
+      // logger.log('filename:', filename);
+      // logger.log('options:', options);
+      // // logger.log('contents:', jetpack.read(source));
+      // logger.log('source:', source);
+      // logger.log('Destination:', destination);
+      console.log('\n');
+    }
+
+    // Skip if needed
+    if (options.skip) {
+      continue;
+    }
+
+
+    // Get final paths
+    const finalSource = path.join(item.source, ogName);
+    const finalDestination = path.join(item.destination, item.name);
+
+    // console.log('---finalSource', finalSource);
+    // console.log('---finalDestination', finalDestination);
+
+    // Check if the file exists
+    const exists = jetpack.exists(finalDestination);
 
     // Skip if exists and we don't want to overwrite
-    if (exists && !options.overwrite) {
+    if (!options.overwrite && exists) {
       continue;
     }
 
@@ -296,31 +411,186 @@ function buildSiteFiles() {
       // logger.log('Running templating on:', destination);
 
       // Run the templating
-      const contents = jetpack.read(source);
+      const contents = jetpack.read(finalSource);
       const templated = template(contents, options.template);
 
       // Write the file
-      jetpack.write(destination, templated);
+      jetpack.write(finalDestination, templated);
     } else {
       // Copy the file
-      jetpack.copy(source, destination, { overwrite: true });
+      jetpack.copy(finalSource, finalDestination, { overwrite: true });
     }
   }
 }
+
+// Copy default dist files
+// async function copyDefaultDistFiles() {
+//   // Get the directory
+//   const dir = path.join(__dirname, '..', '..', 'defaults', 'dist');
+
+//   // Log
+//   logger.log(`Copying default dist files from ${dir}`);
+
+//   // Copy the files
+//   jetpack.copy(dir, 'dist', { overwrite: true });
+// }
+// async function copyDefaultDistFiles() {
+//   // Loop through all files in /defaults directory
+//   const dir = path.join(__dirname, '..', '..', 'defaults', 'dist');
+//   const input = [
+//     // Files to include
+//     '**/*',
+
+//     // Files to exclude
+//     '!**/.DS_Store', // TODO: NOT WORKING
+//   ]
+
+//   // Get all files
+//   const files = glob(input, {
+//     cwd: dir,
+//     dot: true,
+//     nodir: true,
+//   });
+
+//   // Log
+//   logger.log(`Preparing to copy ${files.length} default dist files...`);
+
+//   for (const file of files) {
+//     // const relativePath = path.relative(path.join(__dirname, '..', '..', 'defaults', 'dist'), file);
+//     // const destination = path.join(__dirname, '..', '..', 'dist', relativePath.replace('pages', ''));
+//     const source = path.join(dir, file);
+//     const destination = path.join(process.cwd(), file.replace('dist/pages', 'dist'));
+
+//     // Log
+//     if (true) {
+//       logger.log(`Copying default dist file...`);
+//       logger.log(`  file: ${file}`);
+//       logger.log(`  from: ${source}`);
+//       logger.log(`  to: ${destination}`);
+//       console.log('\n');
+//     }
+
+//     // Ensure the directory exists
+//     // await jetpack.dir(path.dirname(destination));
+
+//     // Copy the file
+//     // await jetpack.copy(file, destination, { overwrite: true });
+//   }
+// }
+
+// Create CNAME
+async function createCNAME() {
+  // Get the CNAME
+  const url = config.url;
+  const host = new URL(url).host
+
+  // Write to file
+  jetpack.write('dist/CNAME', host);
+
+  // Log
+  logger.log('Created CNAME');
+}
+
+// Fetch firebase-auth files
+async function fetchFirebaseAuth() {
+  const managerConfig = config.settings['manager-configuration'];
+  const firebase = eval(`(${managerConfig})`)?.libraries?.firebase_app?.config;
+  const projectId = firebase.projectId || 'ultimate-jekyll';
+  const base = `https://${projectId}.firebaseapp.com`;
+  const files = [
+    {
+      remote: '__/auth/handler',
+      filename: 'handler.html',
+    },
+    {
+      remote: '__/auth/handler.js',
+    },
+    {
+      remote: '__/auth/experiments.js',
+    },
+    {
+      remote: '__/auth/iframe',
+      filename: 'iframe.html',
+    },
+    {
+      remote: '__/auth/iframe.js',
+    },
+    {
+      remote: '__/firebase/init.json',
+    }
+  ]
+  const promises = [];
+  const output = './dist';
+
+  // Loop through files
+  files.forEach((file) => {
+    // Get the remote URL
+    const url = `${base}/${file.remote}`;
+
+    // Get the local path
+    const fileName = file.filename ? path.basename(file.filename) : path.basename(file.remote);
+    // console.log('---fileName', fileName);
+
+    const filePath = path.join(path.dirname(file.remote), fileName);
+    // console.log('---filePath', filePath);
+
+    const finalPath = path.join(output, filePath);
+    // console.log('---finalPath', finalPath);
+
+    // Push to promises
+    promises.push(
+      fetch(url, {
+        response: 'text',
+      })
+      .then((r) => {
+        // Write to file
+        // jetpack.write(finalPath, r);
+
+        jetpack.write(finalPath,
+          '---\n'
+          + `permalink: /${file.remote}\n`
+          + '---\n'
+          + '\n'
+          + r
+        )
+      })
+    );
+  });
+
+  // Await all promises
+  await Promise.all(promises);
+
+  // Log
+  logger.log('Fetched firebase-auth files');
+}
+
 function getFileOptions(filePath) {
   const defaults = {
     overwrite: true,
-    rename: null,
+    name: null,
+    path: null,
     template: null,
+    skip: false,
   };
 
+  let options = { ...defaults };
+
   // Loop through all patterns
   for (const pattern in FILE_MAP) {
     if (minimatch(filePath, pattern)) {
-      return { ...defaults, ...FILE_MAP[pattern] };
+      options = { ...options, ...FILE_MAP[pattern] };
     }
   }
 
-  // Default
-  return defaults;
+  return options;
+}
+
+function logVersionCheck(name, installedVersion, latestVersion, isUpToDate) {
+  // Quit if local
+  if (installedVersion.startsWith('file:')) {
+    isUpToDate = true;
+  }
+
+  // Log
+  logger.log(`Checking if ${name} is up to date (${logger.format.bold(installedVersion)} >= ${logger.format.bold(latestVersion)}): ${isUpToDate ? logger.format.green('Yes') : logger.format.red('No')}`);
 }

package/dist/defaults/.vscode/settings.json

@@ -3,6 +3,6 @@
     // The following will hide certian files from the file explorer
     "files.exclude": {
       // Hide any files with /master/ in the path
-      "**/master/**": true,
+      // "**/master/**": true,
     }
 }

package/dist/defaults/dist/_includes/app/elements/footer.html

@@ -0,0 +1 @@
+<!-- App Footer Content -->

package/dist/defaults/dist/_includes/app/elements/header.html

@@ -0,0 +1 @@
+<!-- App Header Content -->

package/dist/defaults/dist/_includes/master/assets/css/cookieconsent.css

@@ -0,0 +1,6 @@
+.cc-window{opacity:1;transition:opacity 1s ease}.cc-window.cc-invisible{opacity:0}.cc-animate.cc-revoke{transition:transform 1s ease}.cc-animate.cc-revoke.cc-top{transform:translateY(-2em)}.cc-animate.cc-revoke.cc-bottom{transform:translateY(2em)}.cc-animate.cc-revoke.cc-active.cc-bottom,.cc-animate.cc-revoke.cc-active.cc-top,.cc-revoke:hover{transform:translateY(0)}.cc-grower{max-height:0;overflow:hidden;transition:max-height 1s}
+.cc-link,.cc-revoke:hover{text-decoration:underline}.cc-revoke,.cc-window{position:fixed;overflow:hidden;box-sizing:border-box;font-family:Helvetica,Calibri,Arial,sans-serif;font-size:16px;line-height:1.5em;display:-ms-flexbox;display:flex;-ms-flex-wrap:nowrap;flex-wrap:nowrap;z-index:9999}.cc-window.cc-static{position:static}.cc-window.cc-floating{padding:2em;max-width:24em;-ms-flex-direction:column;flex-direction:column}.cc-window.cc-banner{padding:1em 1.8em;width:100%;-ms-flex-direction:row;flex-direction:row}.cc-revoke{padding:.5em}.cc-header{font-size:18px;font-weight:700}.cc-btn,.cc-close,.cc-link,.cc-revoke{cursor:pointer}.cc-link{opacity:.8;display:inline-block;padding:.2em}.cc-link:hover{opacity:1}.cc-link:active,.cc-link:visited{color:initial}.cc-btn{display:block;padding:.4em .8em;font-size:.9em;font-weight:700;border-width:2px;border-style:solid;text-align:center;white-space:nowrap}.cc-highlight .cc-btn:first-child{background-color:transparent;border-color:transparent}.cc-highlight .cc-btn:first-child:focus,.cc-highlight .cc-btn:first-child:hover{background-color:transparent;text-decoration:underline}.cc-close{display:block;position:absolute;top:.5em;right:.5em;font-size:1.6em;opacity:.9;line-height:.75}.cc-close:focus,.cc-close:hover{opacity:1}
+.cc-revoke.cc-top{top:0;left:3em;border-bottom-left-radius:.5em;border-bottom-right-radius:.5em}.cc-revoke.cc-bottom{bottom:0;left:3em;border-top-left-radius:.5em;border-top-right-radius:.5em}.cc-revoke.cc-left{left:3em;right:unset}.cc-revoke.cc-right{right:3em;left:unset}.cc-top{top:1em}.cc-left{left:1em}.cc-right{right:1em}.cc-bottom{bottom:1em}.cc-floating>.cc-link{margin-bottom:1em}.cc-floating .cc-message{display:block;margin-bottom:1em}.cc-window.cc-floating .cc-compliance{-ms-flex:1 0 auto;flex:1 0 auto}.cc-window.cc-banner{-ms-flex-align:center;align-items:center}.cc-banner.cc-top{left:0;right:0;top:0}.cc-banner.cc-bottom{left:0;right:0;bottom:0}.cc-banner .cc-message{display:block;-ms-flex:1 1 auto;flex:1 1 auto;max-width:100%;margin-right:1em}.cc-compliance{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;-ms-flex-line-pack:justify;align-content:space-between}.cc-floating .cc-compliance>.cc-btn{-ms-flex:1;flex:1}.cc-btn+.cc-btn{margin-left:.5em}
+@media print{.cc-revoke,.cc-window{display:none}}@media screen and (max-width:900px){.cc-btn{white-space:normal}}@media screen and (max-width:414px) and (orientation:portrait),screen and (max-width:736px) and (orientation:landscape){.cc-window.cc-top{top:0}.cc-window.cc-bottom{bottom:0}.cc-window.cc-banner,.cc-window.cc-floating,.cc-window.cc-left,.cc-window.cc-right{left:0;right:0}.cc-window.cc-banner{-ms-flex-direction:column;flex-direction:column}.cc-window.cc-banner .cc-compliance{-ms-flex:1 1 auto;flex:1 1 auto}.cc-window.cc-floating{max-width:none}.cc-window .cc-message{margin-bottom:1em}.cc-window.cc-banner{-ms-flex-align:unset;align-items:unset}.cc-window.cc-banner .cc-message{margin-right:0}}
+.cc-floating.cc-theme-classic{padding:1.2em;border-radius:5px}.cc-floating.cc-type-info.cc-theme-classic .cc-compliance{text-align:center;display:inline;-ms-flex:none;flex:none}.cc-theme-classic .cc-btn{border-radius:5px}.cc-theme-classic .cc-btn:last-child{min-width:140px}.cc-floating.cc-type-info.cc-theme-classic .cc-btn{display:inline-block}
+.cc-theme-edgeless.cc-window{padding:0}.cc-floating.cc-theme-edgeless .cc-message{margin:2em 2em 1.5em}.cc-banner.cc-theme-edgeless .cc-btn{margin:0;padding:.8em 1.8em;height:100%}.cc-banner.cc-theme-edgeless .cc-message{margin-left:1em}.cc-floating.cc-theme-edgeless .cc-btn+.cc-btn{margin-left:0}