@digigov/css 2.0.0-4be8f7cc → 2.0.0-6452adf3

package/index.js

@@ -1,66 +1,92 @@
-const path = require("path");
+const path = require('path');
 
-var digigovCssInfo = require(path.join(__dirname,'./package.json'))
-const digigovTailwindConfig = require(path.join(__dirname,'./tailwind.config.js'));
+var digigovCssInfo = require(path.join(__dirname, './package.json'));
+const digigovTailwindConfig = require(
+  path.join(__dirname, './tailwind.config.js')
+);
 
-const base = require(path.join(__dirname,'./dist/base'))
-const utilities = require(path.join(__dirname,'./dist/utilities'))
-const components = require(path.join(__dirname,'./dist/components'))
+const getThemeBaseStyle = require(path.join(__dirname, './theming.js'));
 
-const mainFunction = ({ addBase, addComponents, addUtilities, config }) => {
-	let digigovCssIncludedItems = []
-	let logs = false
-	if (config('digigovCss.logs') != false) {
-		logs = true
-	}
-	if (logs) {
-		console.log()
-		console.log('\x1b[35m%s\x1b[0m', '🌼 Digigov CSS components ' + digigovCssInfo.version, '\x1b[0m', digigovCssInfo.homepage)
-		console.group()
-	}
+const base = require(path.join(__dirname, './dist/base'));
+const utilities = require(path.join(__dirname, './dist/utilities'));
+const components = require(path.join(__dirname, './dist/components'));
 
-	// inject @base style 
-	if (config('digigovCss.base') != false) {
-		addBase(base)
-		digigovCssIncludedItems.push('base')
-	}
+/**
+ * Load Digigov CSS styles and add them to the base tailwindcss styles.
+ *
+ * Optionally, you can provide additional options for loading a custom theme.
+ *
+ * @param {object} [options={}]
+ * @param {string} [options.customTheme] - Custom theme package name or file path.
+ * @param {boolean} [options.eject] - Whether to ignore the default Digigov CSS base styles.
+ */
+function mainFunction(options = {}) {
+  return function ({ addBase, addComponents, addUtilities, config }) {
+    let digigovCssIncludedItems = [];
+    let logs = false;
+    if (config('digigovCss.logs') != false) {
+      logs = true;
+    }
+    if (logs) {
+      console.log();
+      console.log(
+        '\x1b[35m%s\x1b[0m',
+        '🌼 Digigov CSS components ' + digigovCssInfo.version,
+        '\x1b[0m',
+        digigovCssInfo.homepage
+      );
+      console.group();
+    }
 
-	// inject components
-	let classNames = [];
-	let mediaQueries = [];
-	// split compiled components in two different sectors
-	// to load them in the correct order, since media queries
-	// should be always after the main CSS rules
-	Object.keys(components).forEach(selector => {
-		// checking if selectors are media queries
-		if (selector.startsWith('@media')) {
-			mediaQueries.push({[selector]: components[selector]});
-		// ... or just regular css rules
-		} else {
-			classNames.push({[selector]: components[selector]});
-		}
-	});
-	if (config('digigovCss.components') != false) {
-		// this order is important for loading CSS rules and media queries
-		// consistently, since the keys in js objects are not ordered and 
-		// sometimes order can be different. By spreading them in sequence 
-		// we fix this bug
-		addComponents([
-			...classNames,
-			...mediaQueries,
-		])
-		digigovCssIncludedItems.push('components')
-	}
+    // inject @base style
+    if (config('digigovCss.base') != false) {
+      const themeBaseStyle = getThemeBaseStyle({
+        eject: options.eject,
+        theme: options.customTheme,
+        debug: logs,
+      });
+      addBase({ ...base, ...themeBaseStyle });
+      digigovCssIncludedItems.push('base');
+    }
 
-	// inject @utilities style needed by components
-	if (config('digigovCss.utils') != false) {
-		addUtilities(utilities)
-		digigovCssIncludedItems.push('utilities')
-	}
-	if (logs) {
-		console.log('\x1b[32m%s\x1b[0m', '✔︎ Including:', '\x1b[0m', '' + digigovCssIncludedItems.join(', '));
-		if (isTailwindInstalled === false) {
-			console.log(`\n\x1b[33;1m! warning\x1b[0m - unable to require \x1b[36mtailwindcss/plugin\x1b[0m
+    // inject components
+    let classNames = [];
+    let mediaQueries = [];
+    // split compiled components in two different sectors
+    // to load them in the correct order, since media queries
+    // should be always after the main CSS rules
+    Object.keys(components).forEach((selector) => {
+      // checking if selectors are media queries
+      if (selector.startsWith('@media')) {
+        mediaQueries.push({ [selector]: components[selector] });
+        // ... or just regular css rules
+      } else {
+        classNames.push({ [selector]: components[selector] });
+      }
+    });
+    if (config('digigovCss.components') != false) {
+      // this order is important for loading CSS rules and media queries
+      // consistently, since the keys in js objects are not ordered and
+      // sometimes order can be different. By spreading them in sequence
+      // we fix this bug
+      addComponents([...classNames, ...mediaQueries]);
+      digigovCssIncludedItems.push('components');
+    }
+
+    // inject @utilities style needed by components
+    if (config('digigovCss.utils') != false) {
+      addUtilities(utilities);
+      digigovCssIncludedItems.push('utilities');
+    }
+    if (logs) {
+      console.log(
+        '\x1b[32m%s\x1b[0m',
+        '🛠️ Including functions:',
+        '\x1b[0m',
+        '' + digigovCssIncludedItems.join(', ')
+      );
+      if (isTailwindInstalled === false) {
+        console.log(`\n\x1b[33;1m! warning\x1b[0m - unable to require \x1b[36mtailwindcss/plugin\x1b[0m
 Digigov CSS color are now only available for Digigov CSS components.
 If you want to use DigigovCSS color as utility classes (like 'bg-primary')
 you need to add this to your \x1b[36mtailwind.config.js\x1b[0m file:
@@ -73,25 +99,29 @@ you need to add this to your \x1b[36mtailwind.config.js\x1b[0m file:
   },\x1b[0m
 \x1b[36m}\x1b[0m
 ───────────────────────────────────────  
-      `)
-		}
-		console.log()
-		console.groupEnd()
-	}
+      `);
+      }
+      console.log();
+      console.groupEnd();
+    }
+  };
 }
 
 // check if tailwindcss package exists
 let isTailwindInstalled = false;
 try {
-	require.resolve('tailwindcss/plugin')
-	isTailwindInstalled = true
+  require.resolve('tailwindcss/plugin');
+  isTailwindInstalled = true;
 } catch (er) {
-	isTailwindInstalled = false
+  isTailwindInstalled = false;
 }
 if (isTailwindInstalled !== false) {
-	module.exports = require("tailwindcss/plugin")(
-		mainFunction, digigovTailwindConfig
-	);
+  module.exports = require('tailwindcss/plugin').withOptions(
+    mainFunction,
+    function (options) {
+      return { ...digigovTailwindConfig, ...options };
+    }
+  );
 } else {
-	module.exports = mainFunction;
+  module.exports = mainFunction;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digigov/css",
-  "version": "2.0.0-4be8f7cc",
+  "version": "2.0.0-6452adf3",
   "description": "Digigov CSS - Tailwind CSS Components",
   "author": "GRNET Devs <devs@lists.grnet.gr>",
   "license": "BSD-2-Clause",
@@ -27,7 +27,7 @@
     "defaultTheme",
     "src",
     "colors",
-    "themes.plugin.js",
+    "theming.js",
     "postcss.config.js",
     "tailwind.config.js",
     "screens.json"
@@ -39,32 +39,32 @@
     ]
   },
   "devDependencies": {
-    "@digigov/cli": "1.1.0",
+    "@digigov/cli": "2.0.0-6452adf3",
     "autoprefixer": "10.4.16",
-    "cssnano": "4.1.10",
-    "postcss": "8.4.4",
     "postcss-cli": "8.3.0",
     "postcss-import": "13.0.0",
     "prejss-cli": "0.3.3",
     "rtlcss": "3.0.0",
     "tailwindcss": "3.3.5",
     "nodemon": "2.0.7",
-    "next": "10.0.9",
-    "@digigov/postcss-banner": "1.0.4",
-    "@digigov/cli-build-tailwind": "1.0.1",
+    "next": "13.1.1",
+    "@digigov/postcss-banner": "1.0.5-6452adf3",
+    "@digigov/cli-build-tailwind": "2.0.0-6452adf3",
     "rimraf": "3.0.2",
     "publint": "0.1.8",
     "stylelint": "15.11.0",
-    "stylelint-plugin-digigov": "1.1.0-4be8f7cc",
+    "stylelint-plugin-digigov": "1.1.0-6452adf3",
     "prettier": "3.2.5"
   },
   "dependencies": {
+    "@digigov/theme-default": "1.0.0-6452adf3",
     "@fontsource/roboto": "4.4.0",
+    "cssnano": "4.1.10",
     "publint": "0.1.8",
-    "@adobe/leonardo-contrast-colors": "1.0.0-alpha.13",
-    "polished": "4.2.2",
+    "postcss": "8.4.4",
     "postcss-js": "4.0.0",
-    "postcss-load-config": "3.1.4"
+    "postcss-load-config": "3.1.4",
+    "postcss-sort-media-queries": "5.2.0"
   },
   "scripts": {
     "preutilities": "DIGIGOV_CSS_BUILD=TRUE postcss --config src/utilities src/utilities/index.css --base src --dir dist",

package/postcss.config.js

@@ -1,13 +1,14 @@
 /** @type {import('postcss-load-config').Config} */
 const config = {
   plugins: {
-    "postcss-import": {},
-    "tailwindcss/nesting": {},
+    'postcss-import': {},
+    'tailwindcss/nesting': {},
     tailwindcss: {},
     autoprefixer: {},
+    'postcss-sort-media-queries': {},
     cssnano: {
       preset: [
-        "default",
+        'default',
         {
           mergeRules: false,
         },

package/src/base/index.css

@@ -1,4 +1,5 @@
 @import 'tailwindcss/base';
+
 :root {
   accent-color: var(--color-accent);
 }

package/src/base/postcss.config.js

@@ -1,27 +1,28 @@
-const changeLog = require("../../CHANGELOG.json");
+const changeLog = require('../../CHANGELOG.json');
 const entries = changeLog.entries.sort(
-  (a, b) => new Date(b.date) - new Date(a.date),
+  (a, b) => new Date(b.date) - new Date(a.date)
 );
 const version = entries[0].version;
 const date = entries[0].date;
-const cssDate = new Date(date).toLocaleDateString("si-LK"); //yyyy-MM-dd
+const cssDate = new Date(date).toLocaleDateString('si-LK'); //yyyy-MM-dd
 
 /** @type {import('postcss-load-config').Config} */
 const config = {
   plugins: [
-    require("postcss-import"),
-    require("tailwindcss/nesting"),
-    require("tailwindcss")("./src/base/tailwind.config.js"),
-    require("autoprefixer"),
-    require("cssnano")({
+    require('postcss-import'),
+    require('tailwindcss/nesting'),
+    require('tailwindcss')('./src/base/tailwind.config.js'),
+    require('autoprefixer'),
+    require('postcss-sort-media-queries'),
+    require('cssnano')({
       preset: [
-        "default",
+        'default',
         {
           mergeRules: false,
         },
       ],
     }),
-    require("@digigov/postcss-banner")({
+    require('@digigov/postcss-banner')({
       banner: `@digigov/css: ${version}\n\nAuthor: grnet-devs\nDate: ${cssDate}`,
       inline: false,
       important: true,

package/src/base/tailwind.config.js

@@ -1,21 +1,14 @@
-const plugin = require("tailwindcss/plugin");
-const themesPlugin = require("../../themes.plugin");
-const tailwindConfig = require("../../tailwind.config");
+const tailwindConfig = require('../../tailwind.config');
 
 /** @type {import('tailwindcss').Config} */
 module.exports = {
   ...tailwindConfig,
   content: {
     files: [
-      "./*.css",
-      "../../dist/components/*.css",
-      "../../dist/utilities/*.css",
+      './*.css',
+      '../../dist/components/*.css',
+      '../../dist/utilities/*.css',
     ],
     relative: true,
   },
-  themes: {
-    light: require.resolve("../../../../themes/govgr-light"),
-    dark: require.resolve("../../../../themes/govgr-dark"),
-  },
-  plugins: [plugin(themesPlugin)],
 };

package/src/components/accordion.css

@@ -1,4 +1,5 @@
 .ds-accordion {
+  @apply mb-4 md:mb-8;
   &.ds-accordion--no-border {
     .ds-accordion__section {
       @apply border-0 !important;
@@ -122,7 +123,10 @@
 
 .ds-accordion__section-summary {
   .ds-hint {
-    @apply mb-0 mt-1;
+    @apply mb-0;
+  }
+  > *[class^="ds-"]:not(:last-child) {
+    @apply mb-1;
   }
 }
 .ds-accordion__section-heading {

package/src/components/admin-header.css

@@ -1,10 +1,7 @@
 .ds-admin-header {
-  @apply bg-primary print:bg-white border-b-8 print:border-b-2 border-tertiary;
-  border-bottom-style: solid;
 }
 .ds-admin-header__content {
-  @apply px-4 py-2 mx-auto max-w-full w-full flex justify-between items-center
-  flex-wrap sm:flex-nowrap print:px-0 gap-3;
+  @apply max-w-full !important;
 }
 
 /* overrides */
@@ -16,19 +13,4 @@
   .ds-dropdown__button.ds-link {
     @apply text-lg text-white focus:text-base-content print:text-base-800 text-right;
   }
-  .ds-link {
-    &:hover {
-      .ds-svg-icon {
-        fill: var(--color-white);
-      }
-    }
-    &:focus {
-      .ds-svg-icon {
-        fill: var(--color-link-active);
-      }
-    }
-    .ds-svg-icon {
-      fill: var(--color-white);
-    }
-  }
 }

package/src/components/admin-layout.css

@@ -1,7 +1,4 @@
-.ds-admin-layout-wrapper {
-  display: flex;
-  flex-flow: column wrap;
-  min-height: 100vh;
+.ds-admin-layout {
 }
 .ds-admin-top-section {
   &.ds-admin-top-section--secondary {
@@ -12,8 +9,9 @@
   }
 }
 .ds-admin-main {
-  @apply lg:col-span-8 md:col-span-7;
 }
 .ds-admin-aside {
-  @apply lg:col-span-4 md:col-span-5 print:order-1;
+  &.ds-aside {
+    @apply block;
+  }
 }

package/src/components/autocomplete.css

@@ -78,7 +78,7 @@
 }
 
 .ds-autocomplete__menu {
-  @apply block max-h-96 w-full m-0 p-0 overflow-x-hidden
+  @apply block max-h-64 md:max-h-96 w-full m-0 p-0 overflow-x-hidden
   border-2 border-t-0 border-base-content bg-base-100
   absolute left-0 top-full z-50 shadow-xl;
   &.ds-autocomplete__menu--hidden {

package/src/components/blockquote.common.css

@@ -0,0 +1,14 @@
+@tailwind utilities;
+
+@layer utilities {
+    .util-blockquote {
+      @apply mb-4 md:mb-8 p-4 border-l-8 border-base-500 text-base-content;
+    }
+    .util-blockquote-text {
+      font-size: var(--blockquote-font-size);
+      line-height: var(--blockquote-line-height);
+    }
+    .util-blockquote--dense {
+        @apply mb-3 md:mb-6 p-3 border-l-6;
+    }
+}

package/src/components/blockquote.css

@@ -0,0 +1,9 @@
+@import './blockquote.common.css';
+
+.ds-blockquote {
+    @apply util-blockquote util-blockquote-text;
+    &.ds-blockquote--dense,
+    .ds-dense & {
+      @apply util-blockquote--dense;
+    }
+  }

package/src/components/blockquote.native.css

@@ -0,0 +1,11 @@
+@import './blockquote.common.css';
+
+.ds-blockquote {
+  @apply util-blockquote;
+}
+.ds-blockquote__text {
+  @apply util-blockquote-text;
+}
+.ds-blockquote--dense {
+  @apply util-blockquote--dense;
+}

package/src/components/breadcrumbs.css

@@ -1,5 +1,5 @@
 .ds-breadcrumbs {
-  @apply block font-normal text-base-content mt-4 mb-2;
+  @apply block font-normal text-base-content mb-2 md:mb-4;
 }
 .ds-breadcrumbs__list {
   @apply block m-0 p-0 list-none;
@@ -12,8 +12,12 @@
 .ds-breadcrumbs__list-item {
   @apply inline-block relative mb-1 ml-2 pl-4 float-left;
   font-size: var(--breadcrumbs__list-item-font-size);
+  &[aria-current='page'] {
+    @apply font-semibold;
+  }
   &::before {
-    @apply block absolute top-2 bottom-0 left-0 md:w-3 md:h-3 w-2 h-2 mx-auto my-0 bg-contain bg-no-repeat bg-center;
+    @apply block absolute top-2 bottom-0 left-0 md:w-3 md:h-3 w-2 h-2 mx-auto my-0 
+    bg-contain bg-no-repeat bg-center;
     content: '';
     background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' aria-hidden='true'> <path d='M8.5,2L6.1,4.3l7.6,7.7l-7.6,7.6L8.5,22l10-10L8.5,2z' />  </svg>");
   }
@@ -47,4 +51,7 @@
     text-decoration: none;
     outline: none;
   }
+  &.ds-breadcrumbs__link--inactive {
+    @apply no-underline;
+  }
 }

package/src/components/button.common.css

@@ -0,0 +1,62 @@
+/* stylelint-disable declaration-block-no-redundant-longhand-properties */
+/* stylelint-disable digigov/nest-related-rules */
+/* stylelint-disable digigov/enforce-class-selector-namespace */
+@tailwind utilities;
+
+@layer utilities {
+  .util-btn {
+    @apply m-0 mb-4 md:mb-8 flex items-center gap-x-3;
+    border-radius: var(--btn-border-radius);
+    padding-right: var(--btn-padding-x);
+    padding-left: var(--btn-padding-x);
+    padding-top: var(--btn-padding-y);
+    padding-bottom: var(--btn-padding-y);
+  }
+  .util-btn-text {
+    @apply text-white font-medium no-underline;
+    font-size: var(--btn-font-size);
+    letter-spacing: var(--letter-spacing-wide);
+    color: var(--color-base-100);
+  }
+  .util-btn-primary {
+    /* @apply print:border-2 print:border-success print:shadow-none; */
+    box-shadow: var(--btn-primary-box-shadow);
+    background-color: var(--btn-primary-background-color);
+  }
+  .util-btn-primary-text {
+    color: var(--btn-primary-color);
+  }
+  .util-btn-secondary {
+    /* @apply print:border-2 print:border-base-700 print:shadow-none; */
+    box-shadow: var(--btn-secondary-box-shadow);
+    background-color: var(--btn-secondary-background-color);
+  }
+  .util-btn-secondary-text {
+    color: var(--btn-secondary-color) !important;
+  }
+  .util-btn-warning {
+    /* @apply print:border-2 print:border-error print:shadow-none; */
+    box-shadow: var(--btn-warning-box-shadow);
+    background-color: var(--btn-warning-background-color);
+  }
+  .util-btn-warning-text {
+    color: var(--btn-warning-color);
+  }
+
+  .util-btn--dense {
+    --btn-padding-y: 0.375rem;
+    --btn-padding-x: 0.75rem;
+    @apply min-h-6;
+  }
+  .util-btn--disabled {
+    opacity: 0.5;
+  }
+  .util-btn--disabled-text {
+    @apply print:text-base-400;
+  }
+  .util-btn-cta {
+  }
+  .util-btn-cta-text {
+    font-size: var(--btn-cta-font-size);
+  }
+}

package/src/components/button.css

@@ -1,14 +1,9 @@
+@import './button.common.css';
 .ds-btn,
 .ds-btn[type='submit'],
 .ds-btn[type='button'],
 .ds-btn[type='reset'] {
-  @apply no-underline font-medium cursor-pointer 
-  m-0 mb-8 w-max min-h-10 md:min-h-12 
-  flex gap-x-3 items-center;
-  border-radius: var(--btn-border-radius);
-  padding: var(--btn-padding);
-  letter-spacing: var(--btn-letter-spacing);
-  font-size: var(--btn-font-size);
+  @apply util-btn util-btn-text min-h-10 md:min-h-12 w-max cursor-pointer;
   &:focus {
     box-shadow:
       0 0 0 2px var(--color-white),
@@ -18,10 +13,10 @@
   &:focus-within {
     @apply outline-none;
   }
+
   &.ds-btn--dense,
   .ds-dense & {
-    --btn-padding: 0.375rem 0.75rem;
-    @apply min-h-8;
+    @apply util-btn--dense;
     &:focus {
       box-shadow:
         0 0 0 2px var(--color-white),
@@ -34,12 +29,9 @@
 .ds-btn-primary[type='submit'],
 .ds-btn-primary[type='button'],
 .ds-btn-primary[type='reset'] {
-  @apply hover:no-underline
-  print:border-2 print:border-success print:shadow-none;
-  box-shadow: var(--btn-primary-box-shadow);
-  background-color: var(--btn-primary-background-color);
-  color: var(--btn-primary-color);
+  @apply util-btn-primary util-btn-primary-text;
   &:hover {
+    @apply no-underline;
     background-color: var(--btn-primary-background-color-hover);
     color: var(--btn-primary-color-hover);
   }
@@ -48,8 +40,7 @@
   }
 }
 .ds-btn-cta {
-  @apply py-4 print:pr-2;
-  font-size: var(--btn-cta-font-size);
+  @apply py-4 print:pr-2 mb-8 util-btn-cta-text;
   &.ds-btn--dense,
   .ds-dense & {
     @apply py-3 px-4;
@@ -59,12 +50,9 @@
 .ds-btn-secondary[type='submit'],
 .ds-btn-secondary[type='button'],
 .ds-btn-secondary[type='reset'] {
-  @apply hover:no-underline
-    print:border-2 print:border-base-700 print:shadow-none;
-  box-shadow: var(--btn-secondary-box-shadow);
-  background-color: var(--btn-secondary-background-color);
-  color: var(--btn-secondary-color);
+  @apply util-btn-secondary util-btn-secondary-text;
   &:hover {
+    @apply no-underline;
     background-color: var(--btn-secondary-background-color-hover);
     color: var(--btn-secondary-color-hover);
   }
@@ -76,12 +64,9 @@
 .ds-btn-warning[type='submit'],
 .ds-btn-warning[type='button'],
 .ds-btn-warning[type='reset'] {
-  @apply hover:no-underline
-    print:border-2 print:border-error print:shadow-none;
-  box-shadow: var(--btn-warning-box-shadow);
-  background-color: var(--btn-warning-background-color);
-  color: var(--btn-warning-color);
+  @apply util-btn-warning util-btn-warning-text;
   &:hover {
+    @apply no-underline;
     background-color: var(--btn-warning-background-color-hover);
     color: var(--btn-warning-color-hover);
   }
@@ -91,9 +76,8 @@
   }
 }
 .ds-btn--disabled {
-  @apply opacity-50 hover:bg-opacity-50
-  print:text-base-400 print:border-opacity-50;
   @apply cursor-not-allowed !important;
+  @apply util-btn--disabled util-btn--disabled-text;
 }
 .ds-close-btn {
   @apply flex flex-nowrap text-right w-max float-right items-center;
@@ -110,6 +94,7 @@
   .ds-svg-icon {
     fill: var(--btn-primary-color);
   }
+  /* stylelint-disable-next-line digigov/nest-related-rules */
   .ds-svg-icon--more-vert {
     @apply h-6 w-6 md:h-8 md:w-8;
   }