diff --git a/src/dropdown/src/DropdownMenu.js b/src/dropdown/src/DropdownMenu.js index 5e9f5d319..5fc4565bf 100644 --- a/src/dropdown/src/DropdownMenu.js +++ b/src/dropdown/src/DropdownMenu.js @@ -32,13 +32,17 @@ export default { render () { const { NDropdown: { - size + size, + mergedTheme } } = this return h('div', { class: [ 'n-dropdown-menu', - `n-dropdown-menu--${size}-size` + `n-dropdown-menu--${size}-size`, + { + [`n-${mergedTheme}-theme`]: mergedTheme + } ] }, [ diff --git a/src/dropdown/src/styles/themed-base.cssr.js b/src/dropdown/src/styles/themed-base.cssr.js index 87b932523..498d4550e 100644 --- a/src/dropdown/src/styles/themed-base.cssr.js +++ b/src/dropdown/src/styles/themed-base.cssr.js @@ -5,6 +5,7 @@ export default c([ ({ props }) => { const local = props.$local const { + color, prefixColor, suffixColor, dividerColor, @@ -16,7 +17,7 @@ export default c([ return [ cTB('dropdown-menu', { padding, - background: 'white', + backgroundColor: color, borderRadius, boxShadow }, [ diff --git a/src/dropdown/styles/dark.js b/src/dropdown/styles/dark.js index 0b1473793..cc7a122f1 100644 --- a/src/dropdown/styles/dark.js +++ b/src/dropdown/styles/dark.js @@ -8,15 +8,17 @@ export default create({ const { textColor2, popoverBoxShadow, - dividerColor, - hoverColorOverlay + dividerColorOverlay, + hoverColorOverlay, + popoverColor } = derived const { borderRadius } = base return { ...commonVariables, - dividerColor, + color: popoverColor, + dividerColor: dividerColorOverlay, borderRadius, boxShadow: popoverBoxShadow, suffixColor: textColor2, diff --git a/src/dropdown/styles/light.js b/src/dropdown/styles/light.js index 94d63de23..a0d11e4ac 100644 --- a/src/dropdown/styles/light.js +++ b/src/dropdown/styles/light.js @@ -9,13 +9,15 @@ export default create({ textColor2, popoverBoxShadow, dividerColor, - hoverColorOverlay + hoverColorOverlay, + popoverColor } = derived const { borderRadius } = base return { ...commonVariables, + color: popoverColor, dividerColor, borderRadius, boxShadow: popoverBoxShadow,