@digigov/css 2.0.0-rc.3 → 2.0.0-rc.30

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-rc.3",
+  "version": "2.0.0-rc.30",
   "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,29 +39,32 @@
     ]
   },
   "devDependencies": {
+    "@digigov/cli": "2.0.0-rc.30",
     "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",
+    "tailwindcss": "3.4.13",
     "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-rc.30",
+    "@digigov/cli-build-tailwind": "2.0.0-rc.30",
     "rimraf": "3.0.2",
     "publint": "0.1.8",
-    "@digigov/cli": "1.1.0"
+    "stylelint": "15.11.0",
+    "stylelint-plugin-digigov": "1.1.0-rc.30",
+    "prettier": "3.4.2"
   },
   "dependencies": {
+    "@digigov/theme-default": "1.0.0-rc.30",
     "@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",
@@ -77,6 +80,7 @@
     "start": "next dev",
     "build": "rimraf dist && npm run build-tailwind",
     "publint": "publint",
-    "build-tailwind": "digigov build-tailwind --bundle digigov"
+    "build-tailwind": "digigov build-tailwind --bundle digigov",
+    "lint": "stylelint --fix src/**/*.css; prettier --write src/**/*.css --log-level error"
   }
 }

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/base.css

@@ -1 +1 @@
-@import "./index.css";
+@import './index.css';

package/src/base/index.css

@@ -1,15 +1,16 @@
-@import "tailwindcss/base";
- 
+@import 'tailwindcss/base';
+
 :root {
   accent-color: var(--color-accent);
 }
-html{
+html {
   -webkit-tap-highlight-color: transparent;
   scroll-behavior: smooth;
 }
 body {
   @apply font-sans text-base-content bg-base-100;
 }
-.light, .dark {
+.light,
+.dark {
   @apply font-sans text-base-content bg-base-100;
-}
+}

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.common.css

@@ -0,0 +1,29 @@
+@tailwind utilities;
+
+@layer utilities {
+  .util-accordion__section {
+    @apply border-b border-base-400;
+  }
+  .util-accordion__section-summary {
+    @apply py-4 pr-8 mb-0;
+  }
+  .util-accordion__section-heading {
+    @apply mb-0 transition-all justify-between;
+  }
+  .util-accordion__section-heading-text {
+    @apply no-underline font-semibold;
+  }
+  .util-accordion__section-button {
+    @apply flex justify-between;
+  }
+  .util-accordion__section-button-text {
+    @apply text-base-content;
+  }
+  .util-accordion__section-content {
+    @apply md:pt-2 mb-6 pt-1 mx-0;
+  }
+  .util-accordion__section-button-icon {
+    @apply text-base-content relative ml-2;
+    font-size: var(--text-2xl);
+  }
+}

package/src/components/accordion.css

@@ -1,17 +1,70 @@
+@import './accordion.common.css';
+
 .ds-accordion {
+  &.ds-accordion--no-border {
+    .ds-accordion__section {
+      @apply border-0 !important;
+    }
+  }
+  &.ds-accordion--border-top {
+    .ds-accordion__section {
+      .ds-accordion__section-summary {
+        @apply border-b-0;
+      }
+    }
+  }
+  &.ds-accordion--border-bottom {
+    .ds-accordion__section {
+      @apply border-0;
+      &:first-child {
+        @apply border-0;
+      }
+      .ds-accordion__section-summary {
+        @apply border-b border-base-400;
+      }
+    }
+  }
+  &.ds-accordion--secondary {
+    .ds-accordion__section {
+      .ds-accordion__section-summary {
+        @apply px-4 bg-base-200;
+      }
+      .ds-accordion__section-content {
+        @apply px-4;
+      }
+    }
+    .ds-accordion__section-button {
+      &::after {
+        @apply right-0;
+      }
+    }
+  }
+  &.ds-accordion--dense {
+    .ds-accordion__section {
+      .ds-accordion__section-summary {
+        @apply py-2;
+      }
+      .ds-accordion__section-content {
+        @apply py-2 my-0;
+      }
+    }
+  }
   .ds-accordion__controls {
     @apply text-right;
   }
   .ds-accordion__section {
-    @apply border-b border-base-400;
+    @apply util-accordion__section;
     &:first-child {
       @apply border-t;
     }
   }
   .ds-accordion__section-summary {
-    @apply py-4 pr-8 hover:bg-base-200 transition ease-in-out cursor-pointer;
-    @apply mb-0;
+    @apply util-accordion__section-summary transition ease-in-out cursor-pointer;
+    background: var(--accordion__section-summary-background);
     list-style: none;
+    &:hover {
+      background: var(--accordion__section-summary-background-hover);
+    }
     &::-webkit-details-marker {
       @apply hidden;
     }
@@ -35,18 +88,18 @@
   .ds-accordion__section-header {
   }
   .ds-accordion__section-heading {
+    @apply util-accordion__section-heading util-accordion__section-heading-text cursor-pointer;
     font-size: var(--accordion__section-heading-font-size);
-    @apply no-underline font-semibold 
-    mb-0 transition-all justify-between cursor-pointer;
     &:active {
       @apply ring-link-visited;
     }
   }
   .ds-accordion__section-button {
-    @apply text-base-content focus:underline flex justify-between;
+    @apply util-accordion__section-button util-accordion__section-button-text focus:underline;
     &::after {
-      content: "+";
-      @apply text-2xl text-base-content float-right relative -right-8 ml-2;
+      @apply util-accordion__section-button-icon float-right -right-8;
+      content: '+';
+      line-height: 2rem;
     }
   }
   .ds-accordion__section[open] {
@@ -55,65 +108,17 @@
     }
     .ds-accordion__section-button {
       &::after {
-        content: "\2013";
+        content: '\2013';
       }
     }
   }
   .ds-accordion__section-content {
-    @apply hidden md:pt-2 mb-6 pt-1 mx-0;
+    @apply util-accordion__section-content hidden;
     > *:last-child {
       @apply mb-0;
     }
   }
 }
-.ds-accordion--no-border {
-  .ds-accordion__section {
-    @apply border-0 !important;
-  }
-}
-.ds-accordion--border-top {
-  .ds-accordion__section {
-    .ds-accordion__section-summary {
-      @apply border-b-0;
-    }
-  }
-}
-.ds-accordion--border-bottom {
-  .ds-accordion__section {
-    @apply border-0;
-    &:first-child {
-      @apply border-0;
-    }
-    .ds-accordion__section-summary {
-      @apply border-b border-base-400;
-    }
-  }
-}
-.ds-accordion--secondary {
-  .ds-accordion__section {
-    .ds-accordion__section-summary {
-      @apply px-4 bg-base-200;
-    }
-    .ds-accordion__section-content {
-      @apply px-4;
-    }
-  }
-  .ds-accordion__section-button {
-    &::after {
-      @apply right-0;
-    }
-  }
-}
-.ds-accordion--dense {
-  .ds-accordion__section {
-    .ds-accordion__section-summary {
-      @apply py-2;
-    }
-    .ds-accordion__section-content {
-      @apply py-2 my-0;
-    }
-  }
-}
 
 /* overrides */
 

package/src/components/accordion.native.css

@@ -0,0 +1,27 @@
+@import './accordion.common.css';
+
+.ds-accordion__section {
+  @apply util-accordion__section;
+}
+.ds-accordion__section__first-child {
+  @apply border-t;
+}
+.ds-accordion__section-summary {
+  @apply util-accordion__section-summary flex-1;
+}
+.ds-accordion__section-button {
+  @apply util-accordion__section-button;
+}
+.ds-accordion__section-button__text {
+  @apply util-accordion__section-heading-text util-accordion__section-button-text;
+  font-size: var(--text-xl);
+}
+.ds-accordion__section-content {
+  @apply util-accordion__section-content;
+}
+.ds-accordion__section-content__text {
+  font-size: var(--text-md);
+}
+.ds-accordion__section-button-icon {
+  @apply util-accordion__section-button-icon;
+}

package/src/components/admin-header.css

@@ -1,9 +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;
+  @apply max-w-full !important;
 }
 
 /* overrides */
@@ -13,21 +11,6 @@
     @apply print:hidden;
   }
   .ds-dropdown__button.ds-link {
-    @apply text-lg text-white focus:text-base-content print:text-base-800;
-  }
-  .ds-link {
-    .ds-svg-icon {
-      fill: var(--color-white);
-    }
-    &:hover {
-      .ds-svg-icon {
-        fill: var(--color-white);
-      }
-    }
-    &:focus {
-      .ds-svg-icon {
-        fill: var(--color-link-active);
-      }
-    }
+    @apply text-lg text-white focus:text-base-content print:text-base-800 text-right;
   }
 }

package/src/components/admin-layout.css

@@ -1,26 +1,17 @@
-.ds-admin-layout-wrapper {
-  display: flex;
-  flex-direction: column;
-  flex-wrap: wrap;
-  min-height: 100vh;
+.ds-admin-layout {
 }
-.ds-admin-top-section {}
-.ds-admin-top-section--secondary {
-  @apply bg-base-200 px-4 py-2;
+.ds-admin-top-section {
+  &.ds-admin-top-section--secondary {
+    @apply bg-base-200 px-4 py-2;
+  }
+  &.ds-admin-top-section--border {
+    @apply border border-base-300 px-4 py-2;
+  }
 }
-.ds-admin-top-section--border {
-  @apply border border-base-300 px-4 py-2;
+.ds-admin-main {
 }
-.ds-admin-width-container {
-  @apply px-4 py-8 m-0 w-full mx-auto;
-  flex: 1 1 0%;
-}
-.ds-admin-main-wrapper {
-  @apply grid p-4 md:grid-cols-12 gap-x-8 md:gap-x-10 gap-y-4 grid-cols-1 print:grid-cols-1;
-}
-.ds-admin-main-content {
-  @apply lg:col-span-8 md:col-span-7;
-}
-.ds-admin-side-content {
-  @apply lg:col-span-4 md:col-span-5 print:order-1;
+.ds-admin-aside {
+  &.ds-aside {
+    @apply block;
+  }
 }