diff --git a/packages/opendesign/src/components/breadcrumb/OBreadcrumbItem.vue b/packages/opendesign/src/components/breadcrumb/OBreadcrumbItem.vue index 8f37f5cdb3a4bd7d65bc287164a742bf18bc1d3f..a3eb0ecc3dfb0b21a34226cc6633423fb7e725bc 100644 --- a/packages/opendesign/src/components/breadcrumb/OBreadcrumbItem.vue +++ b/packages/opendesign/src/components/breadcrumb/OBreadcrumbItem.vue @@ -15,7 +15,7 @@ const breadcrumbInjection = inject(breadcrumbInjectKey, null); - + diff --git a/packages/opendesign/src/components/breadcrumb/style/index.scss b/packages/opendesign/src/components/breadcrumb/style/index.scss index e712d4512c9828a81c8ffe6615d58f89c5510e97..4e5e16c386d7df938e83d5cc9a8926479e621212 100644 --- a/packages/opendesign/src/components/breadcrumb/style/index.scss +++ b/packages/opendesign/src/components/breadcrumb/style/index.scss @@ -6,6 +6,7 @@ color: var(--breadcrumb-color); font-size: var(--breadcrumb-text-size); line-height: var(--breadcrumb-text-height); + a { color: inherit; text-decoration: none; @@ -15,8 +16,10 @@ .o-breadcrumb-item { display: inline-flex; align-items: center; + &:last-child { color: var(--breadcrumb-color-active); + font-weight: 500; .o-breadcrumb-item-label { cursor: default; @@ -30,8 +33,17 @@ .o-breadcrumb-item-label { cursor: pointer; + &:hover { + color: var(--breadcrumb-color-active); + } } .o-breadcrumb-item-separator { + display: inline-flex; + align-items: center; + justify-content: center; + min-width: var(--breadcrumb-seperator-size); + font-size: var(--breadcrumb-seperator-size); + line-height: 1; margin: 0 var(--breadcrumb-gap); } diff --git a/packages/opendesign/src/components/breadcrumb/style/var.scss b/packages/opendesign/src/components/breadcrumb/style/var.scss index 9da8ad6f3ef82be00b0180c2892dfb3445fc83fa..0318102cd6f445b344947f6ec4c7901c19641f49 100644 --- a/packages/opendesign/src/components/breadcrumb/style/var.scss +++ b/packages/opendesign/src/components/breadcrumb/style/var.scss @@ -6,4 +6,5 @@ --breadcrumb-text-height: var(--o-line_height-text1); --breadcrumb-gap: var(--o-gap-1); + --breadcrumb-seperator-size: var(--o-icon_size-xs); } diff --git a/packages/opendesign/src/components/checkbox-group/style/index.scss b/packages/opendesign/src/components/checkbox-group/style/index.scss index 5a8c148c7c02e65486c1eed4d9264155dd2de387..80be7f6a536da02895a71f29a3bbc79430a4bb66 100644 --- a/packages/opendesign/src/components/checkbox-group/style/index.scss +++ b/packages/opendesign/src/components/checkbox-group/style/index.scss @@ -3,17 +3,9 @@ .o-checkbox-group { display: inline-flex; flex-wrap: wrap; -} - -.o-checkbox-group-direction-horizontal { - .o-checkbox + .o-checkbox { - margin-left: var(--checkbox-group-gap); - } + gap: var(--checkbox-group-gap); } .o-checkbox-group-direction-vertical { flex-direction: column; - .o-checkbox + .o-checkbox { - margin-top: var(--checkbox-group-gap); - } } diff --git a/packages/opendesign/src/components/checkbox-group/style/var.scss b/packages/opendesign/src/components/checkbox-group/style/var.scss index 2b50918dde3ad77007ae9ed916551507eaf80525..42ca62cebaa5968ea7bd1ac453a8252ce9659cac 100644 --- a/packages/opendesign/src/components/checkbox-group/style/var.scss +++ b/packages/opendesign/src/components/checkbox-group/style/var.scss @@ -1,3 +1,3 @@ .o-checkbox-group { - --checkbox-group-gap: var(--o-gap-2); + --checkbox-group-gap: var(--o-gap-5); } diff --git a/packages/opendesign/src/components/checkbox/OCheckbox.vue b/packages/opendesign/src/components/checkbox/OCheckbox.vue index 3aa68fe3dcf7af842f7ea05e3ec573f86c3dcfbc..f3d6eec65bd86176989960c4dba255f81f251016 100644 --- a/packages/opendesign/src/components/checkbox/OCheckbox.vue +++ b/packages/opendesign/src/components/checkbox/OCheckbox.vue @@ -98,8 +98,10 @@ defineExpose({ - - + + + + diff --git a/packages/opendesign/src/components/checkbox/style/index.scss b/packages/opendesign/src/components/checkbox/style/index.scss index 37d3df4cdb176d53f05505afbadd1fc45fe2302a..9603fe7a2edacc2ba807e601e7a70c999c6340af 100644 --- a/packages/opendesign/src/components/checkbox/style/index.scss +++ b/packages/opendesign/src/components/checkbox/style/index.scss @@ -32,19 +32,20 @@ align-items: center; width: var(--checkbox-input-size); height: var(--checkbox-input-size); - background-color: var(--checkbox-input-bg); + background-color: var(--checkbox-input-bg-color); color: var(--checkbox-input-color); border: 1px solid var(--checkbox-input-bd-color); + border-radius: var(--checkbox-radius); } .o-checkbox-label { - margin-left: 8px; + margin-left: 12px; } .o-checkbox-checked, .o-checkbox-indeterminate { .o-checkbox-input { - background-color: var(--checkbox-input-bg-checked); + background-color: var(--checkbox-input-bg-color-checked); border-color: var(--checkbox-input-bd-color-checked); } } @@ -53,6 +54,7 @@ cursor: not-allowed; color: var(--checkbox-color-disabled); .o-checkbox-input { + background-color: var(--checkbox-input-bg-color-disabled); border-color: var(--checkbox-input-bd-color-disabled); } } @@ -60,7 +62,7 @@ .o-checkbox-checked.o-checkbox-disabled, .o-checkbox-indeterminate.o-checkbox-disabled { .o-checkbox-input { - background-color: var(--checkbox-input-bg-checked-disabled); - border-color: var(--checkbox-input-bg-checked-disabled); + background-color: var(--checkbox-input-bg-color-checked-disabled); + border-color: var(--checkbox-input-bg-color-checked-disabled); } } diff --git a/packages/opendesign/src/components/checkbox/style/var.scss b/packages/opendesign/src/components/checkbox/style/var.scss index 2d1f8a4cc11947c722b62b2e907fcf9e07632c6e..145ca80163df64987585c68cecac43e5c2b40ffd 100644 --- a/packages/opendesign/src/components/checkbox/style/var.scss +++ b/packages/opendesign/src/components/checkbox/style/var.scss @@ -1,20 +1,23 @@ .o-checkbox { + --checkbox-text-size: var(--o-font_size-text1); + --checkbox-text-height: var(--o-line_height-text1); + + --checkbox-input-size: calc(var(--o-size-s) / 2); + + --checkbox-radius: var(--o-radius-control-s); + --checkbox-color: var(--o-color-info1); --checkbox-color-disabled: var(--o-color-info4); - --checkbox-text-size: var(--o-font_size-text1); - --checkbox-text-height: var(--o-line_height-text1); + --checkbox-input-color: rgb(var(--o-color-white)); - --checkbox-input-color: var(--o-color-fill1); + --checkbox-input-bg-color: var(--o-color-control-light); + --checkbox-input-bg-color-checked: var(--o-color-primary1); + --checkbox-input-bg-color-disabled: var(--o-color-control4-light); + --checkbox-input-bg-color-checked-disabled: var(--o-color-primary4); --checkbox-input-bd-color: var(--o-color-control1); - --checkbox-input-bd-color-disabled: var(--o-color-control4); --checkbox-input-bd-color-checked: var(--o-color-primary1); + --checkbox-input-bd-color-disabled: var(--o-color-control4); --checkbox-input-bd-color-checked-disabled: var(--o-color-primary4); - - --checkbox-input-bg: var(--o-color-fill1); - --checkbox-input-bg-checked: var(--o-color-primary1); - --checkbox-input-bg-checked-disabled: var(--o-color-primary4); - - --checkbox-input-size: 16px; } diff --git a/packages/opendesign/src/components/divider/style/var.scss b/packages/opendesign/src/components/divider/style/var.scss index a5c57156c2089ca6ff72c2829744b0694143aaf9..bfcfaf384c519366a965995c9516c03abfef96fa 100644 --- a/packages/opendesign/src/components/divider/style/var.scss +++ b/packages/opendesign/src/components/divider/style/var.scss @@ -1,16 +1,16 @@ .o-divider { --o-divider-color: var(--o-color-info1); - --o-divider-bd-color: var(--o-color-control1); + --o-divider-bd-color: var(--o-color-control1-light); --o-divider-text-size: var(--o-font_size-text1); --o-divider-text-height: var(--o-line_height-text1); } .o-divider-horizontal { - --o-divider-gap: var(--o-gap-4); + --o-divider-gap: var(--o-gap-5); } .o-divider-vertical { - --o-divider-gap: var(--o-gap-2); + --o-divider-gap: var(--o-gap-5); } diff --git a/packages/opendesign/src/components/menu/OSubMenu.vue b/packages/opendesign/src/components/menu/OSubMenu.vue index 6b62001dd3e2abaacc27a19822f6268f7157b720..67b57ce2d07fd0b91299061d9ab73f3754c03798 100644 --- a/packages/opendesign/src/components/menu/OSubMenu.vue +++ b/packages/opendesign/src/components/menu/OSubMenu.vue @@ -100,17 +100,10 @@ const onLeave = (el: HTMLUListElement) => { - +
-
+
diff --git a/packages/opendesign/src/components/menu/__demo__/MenuAccordion.vue b/packages/opendesign/src/components/menu/__demo__/MenuAccordion.vue index 72787147519d249cca24e507be329cb6d48a489c..7ace3bb585dce2f6757492e23222192145819d72 100644 --- a/packages/opendesign/src/components/menu/__demo__/MenuAccordion.vue +++ b/packages/opendesign/src/components/menu/__demo__/MenuAccordion.vue @@ -1,6 +1,6 @@