From eed50c2c5fa377d1c2134327335803a68398432d Mon Sep 17 00:00:00 2001 From: coliff Date: Wed, 26 Jun 2024 17:06:34 +0900 Subject: [PATCH 1/5] Updates Labels for forms and Alerts styles --- assets/styles/styles.scss | 13 +++++ content/components/web/alerts/_index.md | 6 +-- content/components/web/alerts/styles.md | 52 ++++++------------- .../web/rich-text-format-editor/styles.md | 4 +- package-lock.json | 16 +++--- package.json | 4 +- 6 files changed, 45 insertions(+), 50 deletions(-) diff --git a/assets/styles/styles.scss b/assets/styles/styles.scss index 032433c0..c7ab4757 100644 --- a/assets/styles/styles.scss +++ b/assets/styles/styles.scss @@ -120,3 +120,16 @@ input[type="search"]::-webkit-search-cancel-button { .nav-tabs { --bs-nav-tabs-border-radius: 0.25rem; } + +[data-bs-theme="light"] .alert-danger i.modus-icons { + color: var(--bs-danger); +} +[data-bs-theme="light"] .alert-primary i.modus-icons { + color: var(--bs-primary); +} +[data-bs-theme="light"] .alert-success i.modus-icons { + color: var(--bs-success); +} +[data-bs-theme="light"] .alert-warning i.modus-icons { + color: var(--bs-warning); +} diff --git a/content/components/web/alerts/_index.md b/content/components/web/alerts/_index.md index 00347b29..acd6f948 100644 --- a/content/components/web/alerts/_index.md +++ b/content/components/web/alerts/_index.md @@ -33,13 +33,13 @@ Alerts display in direct response to a user action (e.g. clicking the Submit but
- +
- + background-color: white; 1px border, 8px indicator line same color as border on the left; Padding: 16px; Margin: 16px) _required_ +- Container (Height: 56px; Radius: 2px; 1px border, 12px indicator line same color as border on the left; Padding: 16px; Margin: 16px) _required_ - Alert text (Font: Open Sans Bold 14px) _required_ - Leading Non-Interactive Icon/ Charm (16x16px) _optional_ -- Button (text only, right aligned) or trailing close icon (16px16px) _optional_ +- Button (text only, right aligned) or trailing close icon (16px16px) - Link (underlined, only one per alert) _optional_



@@ -65,77 +67,57 @@ document.addEventListener('DOMContentLoaded', function() { ### Examples
-
- +
- +
diff --git a/package-lock.json b/package-lock.json index fa1b970f..7bdd8e59 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,13 +10,13 @@ "license": "private", "devDependencies": { "@fullhuman/postcss-purgecss": "6.0.0", - "@trimble-oss/modus-bootstrap": "2.0.0-alpha32", + "@trimble-oss/modus-bootstrap": "2.0.0-alpha33", "@trimble-oss/modus-icons": "1.14.0", "autoprefixer": "10.4.19", "bootstrap-print-css": "1.0.1", "cross-env": "7.0.3", "htmlhint": "1.1.4", - "hugo-bin": "0.124.0", + "hugo-bin": "0.125.0", "list.js": "2.3.1", "npm-run-all": "4.1.5", "popover-css-inspector": "1.0.0-beta14", @@ -775,9 +775,9 @@ "dev": true }, "node_modules/@trimble-oss/modus-bootstrap": { - "version": "2.0.0-alpha32", - "resolved": "https://registry.npmjs.org/@trimble-oss/modus-bootstrap/-/modus-bootstrap-2.0.0-alpha32.tgz", - "integrity": "sha512-eWSwyMLMB7GwL1KtgT2axEbnlMy3A2rfug2+f5uG3aX+b/KuX7l3mW2eisWyhSqEZ5KjqO3+6p0W5yiv5xtT6g==", + "version": "2.0.0-alpha33", + "resolved": "https://registry.npmjs.org/@trimble-oss/modus-bootstrap/-/modus-bootstrap-2.0.0-alpha33.tgz", + "integrity": "sha512-3snYk1YXdp3l6/1uw9pAWYpCgqUo49+nCaxJPNahNh0j+G1wXZY6N2XwZsJClX696zoBUZlbfNRmzttjy6qbyw==", "dev": true, "dependencies": { "bootstrap": "5.3.3" @@ -2849,9 +2849,9 @@ } }, "node_modules/hugo-bin": { - "version": "0.124.0", - "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.124.0.tgz", - "integrity": "sha512-5Vi0XZ0wJS8tmp+RzYwhfAS6gBtU9ZcaVmGHVl7RSiYzbuFVA8YDhsdFry2kZPf2ZOlA3uZuVDJmVCRVzit7xw==", + "version": "0.125.0", + "resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.125.0.tgz", + "integrity": "sha512-cTvHzQdK04KrBaW3jPdd/JAQXCOdXT1GiPHaMxe0YtLTVCV0ElgxkvXn6eQJUDl4QqM8+IlsFg/b2ofz6XS//A==", "dev": true, "funding": [ { diff --git a/package.json b/package.json index accc796f..4e6076f2 100644 --- a/package.json +++ b/package.json @@ -44,13 +44,13 @@ }, "devDependencies": { "@fullhuman/postcss-purgecss": "6.0.0", - "@trimble-oss/modus-bootstrap": "2.0.0-alpha32", + "@trimble-oss/modus-bootstrap": "2.0.0-alpha33", "@trimble-oss/modus-icons": "1.14.0", "autoprefixer": "10.4.19", "bootstrap-print-css": "1.0.1", "cross-env": "7.0.3", "htmlhint": "1.1.4", - "hugo-bin": "0.124.0", + "hugo-bin": "0.125.0", "list.js": "2.3.1", "npm-run-all": "4.1.5", "popover-css-inspector": "1.0.0-beta14", From bf55de17af3ed31ca5627335aa384109c11db09e Mon Sep 17 00:00:00 2001 From: coliff Date: Wed, 26 Jun 2024 18:02:43 +0900 Subject: [PATCH 2/5] Update styles.scss --- assets/styles/styles.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/assets/styles/styles.scss b/assets/styles/styles.scss index c7ab4757..348766a1 100644 --- a/assets/styles/styles.scss +++ b/assets/styles/styles.scss @@ -124,12 +124,15 @@ input[type="search"]::-webkit-search-cancel-button { [data-bs-theme="light"] .alert-danger i.modus-icons { color: var(--bs-danger); } + [data-bs-theme="light"] .alert-primary i.modus-icons { color: var(--bs-primary); } + [data-bs-theme="light"] .alert-success i.modus-icons { color: var(--bs-success); } + [data-bs-theme="light"] .alert-warning i.modus-icons { color: var(--bs-warning); } From e0c5deea11a99c6e0f8b35ac5cb0209ce3fc4438 Mon Sep 17 00:00:00 2001 From: coliff Date: Wed, 26 Jun 2024 18:24:38 +0900 Subject: [PATCH 3/5] Update styles.md --- content/components/web/alerts/styles.md | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/content/components/web/alerts/styles.md b/content/components/web/alerts/styles.md index 20099aee..8936b8ae 100644 --- a/content/components/web/alerts/styles.md +++ b/content/components/web/alerts/styles.md @@ -34,13 +34,13 @@ popoverCSSInspector: true data-bs-placement="right" data-bs-custom-class="popover-css-inspector" data-css-inspector-hide="b-width margin width" - data-css-inspector-show="b-color b-width b-left-width " + data-css-inspector-show="b-color b-width b-left-width" data-bs-container="td">
You have completed a task.
-

@@ -67,9 +67,6 @@ document.addEventListener('DOMContentLoaded', function() { ### Examples