diff --git a/packages/primevue/src/datatable/style/DataTableStyle.js b/packages/primevue/src/datatable/style/DataTableStyle.js index 8562c97c4..39806ee87 100644 --- a/packages/primevue/src/datatable/style/DataTableStyle.js +++ b/packages/primevue/src/datatable/style/DataTableStyle.js @@ -520,23 +520,23 @@ p-datatable-gridlines .p-datatable-tbody > tr:last-child > td { } .p-datatable.p-datatable-lg .p-datatable-header { - padding: 0.9375rem 1.25rem; + padding: 1rem 1.25rem; } .p-datatable.p-datatable-lg .p-datatable-thead > tr > th { - padding: 0.9375rem 1.25rem; + padding: 1rem 1.25rem; } .p-datatable.p-datatable-lg .p-datatable-tbody>tr>td { - padding: 0.9375rem 1.25rem; + padding: 1rem 1.25rem; } .p-datatable.p-datatable-lg .p-datatable-tfoot>tr>td { - padding: 0.9375rem 1.25rem; + padding: 1rem 1.25rem; } .p-datatable.p-datatable-lg .p-datatable-footer { - padding: 0.9375rem 1.25rem; + padding: 1rem 1.25rem; } .p-datatable-row-toggle-button { diff --git a/packages/themes/src/presets/material/organizationchart/index.js b/packages/themes/src/presets/material/organizationchart/index.js index d883f2c9a..397a728f4 100644 --- a/packages/themes/src/presets/material/organizationchart/index.js +++ b/packages/themes/src/presets/material/organizationchart/index.js @@ -11,8 +11,8 @@ export default { color: '{content.color}', selectedColor: '{highlight.color}', hoverColor: '{content.hover.color}', - padding: '0.75rem 1rem', - toggleablePadding: '0.75rem 1rem 1.25rem 1rem', + padding: '1rem 1.25rem', + toggleablePadding: '1rem 1.25rem 1.5rem 1.25rem', borderRadius: '{content.border.radius}' }, nodeToggleButton: { @@ -21,7 +21,7 @@ export default { borderColor: '{content.border.color}', color: '{text.muted.color}', hoverColor: '{text.color}', - size: '1.5rem', + size: '1.75rem', borderRadius: '50%', focusRing: { width: '{focus.ring.width}', diff --git a/packages/themes/src/presets/material/timeline/index.js b/packages/themes/src/presets/material/timeline/index.js index 9058486e5..4359a724c 100644 --- a/packages/themes/src/presets/material/timeline/index.js +++ b/packages/themes/src/presets/material/timeline/index.js @@ -13,20 +13,31 @@ export default { } }, eventMarker: { - size: '1.125rem', + size: '1.5rem', borderRadius: '50%', borderWidth: '2px', - background: '{content.background}', - borderColor: '{content.border.color}', + background: '{primary.color}', content: { borderRadius: '50%', - size: '0.375rem', + size: '0', background: '{primary.color}', - insetShadow: '0px 0.5px 0px 0px rgba(0, 0, 0, 0.06), 0px 1px 1px 0px rgba(0, 0, 0, 0.12)' + insetShadow: 'none' } }, eventConnector: { color: '{content.border.color}', size: '2px' + }, + colorScheme: { + light: { + eventMarker: { + borderColor: '{surface.0}' + } + }, + dark: { + eventMarker: { + borderColor: '{surface.900}' + } + } } }; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4389fa184..2fd9eb822 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -194,7 +194,7 @@ importers: devDependencies: '@nuxt/devtools': specifier: ^0.8.5 - version: 0.8.5(nuxt@3.3.2(@types/node@18.19.54)(encoding@0.1.13)(eslint@8.57.1)(ioredis@5.4.1)(magicast@0.3.5)(optionator@0.9.4)(rollup@4.23.0)(sass@1.79.4)(terser@5.34.1)(typescript@5.6.2)(webpack-sources@3.2.3))(rollup@4.23.0)(webpack-sources@3.2.3) + version: 0.8.5(nuxt@3.3.2(@types/node@18.19.54)(encoding@0.1.13)(eslint@8.57.1)(ioredis@5.4.1)(magicast@0.3.5)(optionator@0.9.4)(rollup@4.23.0)(sass@1.79.4)(terser@5.34.1)(typescript@5.6.2)(webpack-sources@3.2.3))(rollup@4.23.0)(vite@5.4.8(@types/node@18.19.54)(sass@1.79.4)(terser@5.34.1))(webpack-sources@3.2.3) '@nuxt/eslint-config': specifier: ^0.2.0 version: 0.2.0(eslint@8.57.1) @@ -206,7 +206,7 @@ importers: version: 3.13.2(rollup@4.23.0)(webpack-sources@3.2.3) '@nuxt/test-utils': specifier: ^3.7.3 - version: 3.14.2(@vue/test-utils@2.4.6)(h3@1.12.0)(magicast@0.3.5)(nitropack@2.9.7(encoding@0.1.13)(magicast@0.3.5)(webpack-sources@3.2.3))(rollup@4.23.0)(vitest@1.6.0(@types/node@18.19.54)(sass@1.79.4)(terser@5.34.1))(vue-router@4.4.5(vue@3.5.10(typescript@5.6.2)))(vue@3.5.10(typescript@5.6.2))(webpack-sources@3.2.3) + version: 3.14.2(@vue/test-utils@2.4.6)(h3@1.12.0)(magicast@0.3.5)(nitropack@2.9.7(encoding@0.1.13)(magicast@0.3.5)(webpack-sources@3.2.3))(rollup@4.23.0)(vite@5.4.8(@types/node@18.19.54)(sass@1.79.4)(terser@5.34.1))(vitest@1.6.0(@types/node@18.19.54)(sass@1.79.4)(terser@5.34.1))(vue-router@4.4.5(vue@3.5.10(typescript@5.6.2)))(vue@3.5.10(typescript@5.6.2))(webpack-sources@3.2.3) '@primevue/themes': specifier: workspace:* version: link:../themes @@ -8426,12 +8426,13 @@ snapshots: '@nuxt/devalue@2.0.2': {} - '@nuxt/devtools-kit@0.8.5(magicast@0.3.5)(nuxt@3.3.2(@types/node@18.19.54)(encoding@0.1.13)(eslint@8.57.1)(ioredis@5.4.1)(magicast@0.3.5)(optionator@0.9.4)(rollup@4.23.0)(sass@1.79.4)(terser@5.34.1)(typescript@5.6.2)(webpack-sources@3.2.3))(rollup@4.23.0)(webpack-sources@3.2.3)': + '@nuxt/devtools-kit@0.8.5(magicast@0.3.5)(nuxt@3.3.2(@types/node@18.19.54)(encoding@0.1.13)(eslint@8.57.1)(ioredis@5.4.1)(magicast@0.3.5)(optionator@0.9.4)(rollup@4.23.0)(sass@1.79.4)(terser@5.34.1)(typescript@5.6.2)(webpack-sources@3.2.3))(rollup@4.23.0)(vite@5.4.8(@types/node@18.19.54)(sass@1.79.4)(terser@5.34.1))(webpack-sources@3.2.3)': dependencies: '@nuxt/kit': 3.13.2(magicast@0.3.5)(rollup@4.23.0)(webpack-sources@3.2.3) '@nuxt/schema': 3.13.2(rollup@4.23.0)(webpack-sources@3.2.3) execa: 7.2.0 nuxt: 3.3.2(@types/node@18.19.54)(encoding@0.1.13)(eslint@8.57.1)(ioredis@5.4.1)(magicast@0.3.5)(optionator@0.9.4)(rollup@4.23.0)(sass@1.79.4)(terser@5.34.1)(typescript@5.6.2)(webpack-sources@3.2.3) + vite: 5.4.8(@types/node@18.19.54)(sass@1.79.4)(terser@5.34.1) transitivePeerDependencies: - magicast - rollup @@ -8451,10 +8452,10 @@ snapshots: rc9: 2.1.2 semver: 7.6.3 - '@nuxt/devtools@0.8.5(nuxt@3.3.2(@types/node@18.19.54)(encoding@0.1.13)(eslint@8.57.1)(ioredis@5.4.1)(magicast@0.3.5)(optionator@0.9.4)(rollup@4.23.0)(sass@1.79.4)(terser@5.34.1)(typescript@5.6.2)(webpack-sources@3.2.3))(rollup@4.23.0)(webpack-sources@3.2.3)': + '@nuxt/devtools@0.8.5(nuxt@3.3.2(@types/node@18.19.54)(encoding@0.1.13)(eslint@8.57.1)(ioredis@5.4.1)(magicast@0.3.5)(optionator@0.9.4)(rollup@4.23.0)(sass@1.79.4)(terser@5.34.1)(typescript@5.6.2)(webpack-sources@3.2.3))(rollup@4.23.0)(vite@5.4.8(@types/node@18.19.54)(sass@1.79.4)(terser@5.34.1))(webpack-sources@3.2.3)': dependencies: '@antfu/utils': 0.7.10 - '@nuxt/devtools-kit': 0.8.5(magicast@0.3.5)(nuxt@3.3.2(@types/node@18.19.54)(encoding@0.1.13)(eslint@8.57.1)(ioredis@5.4.1)(magicast@0.3.5)(optionator@0.9.4)(rollup@4.23.0)(sass@1.79.4)(terser@5.34.1)(typescript@5.6.2)(webpack-sources@3.2.3))(rollup@4.23.0)(webpack-sources@3.2.3) + '@nuxt/devtools-kit': 0.8.5(magicast@0.3.5)(nuxt@3.3.2(@types/node@18.19.54)(encoding@0.1.13)(eslint@8.57.1)(ioredis@5.4.1)(magicast@0.3.5)(optionator@0.9.4)(rollup@4.23.0)(sass@1.79.4)(terser@5.34.1)(typescript@5.6.2)(webpack-sources@3.2.3))(rollup@4.23.0)(vite@5.4.8(@types/node@18.19.54)(sass@1.79.4)(terser@5.34.1))(webpack-sources@3.2.3) '@nuxt/devtools-wizard': 0.8.5 '@nuxt/kit': 3.13.2(magicast@0.3.5)(rollup@4.23.0)(webpack-sources@3.2.3) birpc: 0.2.17 @@ -8485,8 +8486,9 @@ snapshots: simple-git: 3.27.0 sirv: 2.0.4 unimport: 3.13.1(rollup@4.23.0)(webpack-sources@3.2.3) - vite-plugin-inspect: 0.7.42(@nuxt/kit@3.13.2(magicast@0.3.5)(rollup@4.23.0)(webpack-sources@3.2.3))(rollup@4.23.0) - vite-plugin-vue-inspector: 3.7.2 + vite: 5.4.8(@types/node@18.19.54)(sass@1.79.4)(terser@5.34.1) + vite-plugin-inspect: 0.7.42(@nuxt/kit@3.13.2(magicast@0.3.5)(rollup@4.23.0)(webpack-sources@3.2.3))(rollup@4.23.0)(vite@5.4.8(@types/node@18.19.54)(sass@1.79.4)(terser@5.34.1)) + vite-plugin-vue-inspector: 3.7.2(vite@5.4.8(@types/node@18.19.54)(sass@1.79.4)(terser@5.34.1)) wait-on: 7.2.0 which: 3.0.1 ws: 8.18.0 @@ -8771,7 +8773,7 @@ snapshots: - supports-color - webpack-sources - '@nuxt/test-utils@3.14.2(@vue/test-utils@2.4.6)(h3@1.12.0)(magicast@0.3.5)(nitropack@2.9.7(encoding@0.1.13)(magicast@0.3.5)(webpack-sources@3.2.3))(rollup@4.23.0)(vitest@1.6.0(@types/node@18.19.54)(sass@1.79.4)(terser@5.34.1))(vue-router@4.4.5(vue@3.5.10(typescript@5.6.2)))(vue@3.5.10(typescript@5.6.2))(webpack-sources@3.2.3)': + '@nuxt/test-utils@3.14.2(@vue/test-utils@2.4.6)(h3@1.12.0)(magicast@0.3.5)(nitropack@2.9.7(encoding@0.1.13)(magicast@0.3.5)(webpack-sources@3.2.3))(rollup@4.23.0)(vite@5.4.8(@types/node@18.19.54)(sass@1.79.4)(terser@5.34.1))(vitest@1.6.0(@types/node@18.19.54)(sass@1.79.4)(terser@5.34.1))(vue-router@4.4.5(vue@3.5.10(typescript@5.6.2)))(vue@3.5.10(typescript@5.6.2))(webpack-sources@3.2.3)': dependencies: '@nuxt/kit': 3.13.2(magicast@0.3.5)(rollup@4.23.0)(webpack-sources@3.2.3) '@nuxt/schema': 3.13.2(rollup@4.23.0)(webpack-sources@3.2.3) @@ -8797,7 +8799,8 @@ snapshots: ufo: 1.5.4 unenv: 1.10.0 unplugin: 1.14.1(webpack-sources@3.2.3) - vitest-environment-nuxt: 1.0.1(@vue/test-utils@2.4.6)(h3@1.12.0)(magicast@0.3.5)(nitropack@2.9.7(encoding@0.1.13)(magicast@0.3.5)(webpack-sources@3.2.3))(rollup@4.23.0)(vitest@1.6.0(@types/node@18.19.54)(sass@1.79.4)(terser@5.34.1))(vue-router@4.4.5(vue@3.5.10(typescript@5.6.2)))(vue@3.5.10(typescript@5.6.2))(webpack-sources@3.2.3) + vite: 5.4.8(@types/node@18.19.54)(sass@1.79.4)(terser@5.34.1) + vitest-environment-nuxt: 1.0.1(@vue/test-utils@2.4.6)(h3@1.12.0)(magicast@0.3.5)(nitropack@2.9.7(encoding@0.1.13)(magicast@0.3.5)(webpack-sources@3.2.3))(rollup@4.23.0)(vite@5.4.8(@types/node@18.19.54)(sass@1.79.4)(terser@5.34.1))(vitest@1.6.0(@types/node@18.19.54)(sass@1.79.4)(terser@5.34.1))(vue-router@4.4.5(vue@3.5.10(typescript@5.6.2)))(vue@3.5.10(typescript@5.6.2))(webpack-sources@3.2.3) vue: 3.5.10(typescript@5.6.2) vue-router: 4.4.5(vue@3.5.10(typescript@5.6.2)) optionalDependencies: @@ -14110,7 +14113,7 @@ snapshots: optionator: 0.9.4 typescript: 5.6.2 - vite-plugin-inspect@0.7.42(@nuxt/kit@3.13.2(magicast@0.3.5)(rollup@4.23.0)(webpack-sources@3.2.3))(rollup@4.23.0): + vite-plugin-inspect@0.7.42(@nuxt/kit@3.13.2(magicast@0.3.5)(rollup@4.23.0)(webpack-sources@3.2.3))(rollup@4.23.0)(vite@5.4.8(@types/node@18.19.54)(sass@1.79.4)(terser@5.34.1)): dependencies: '@antfu/utils': 0.7.10 '@rollup/pluginutils': 5.1.2(rollup@4.23.0) @@ -14120,13 +14123,14 @@ snapshots: open: 9.1.0 picocolors: 1.1.0 sirv: 2.0.4 + vite: 5.4.8(@types/node@18.19.54)(sass@1.79.4)(terser@5.34.1) optionalDependencies: '@nuxt/kit': 3.13.2(magicast@0.3.5)(rollup@4.23.0)(webpack-sources@3.2.3) transitivePeerDependencies: - rollup - supports-color - vite-plugin-vue-inspector@3.7.2: + vite-plugin-vue-inspector@3.7.2(vite@5.4.8(@types/node@18.19.54)(sass@1.79.4)(terser@5.34.1)): dependencies: '@babel/core': 7.25.2 '@babel/plugin-proposal-decorators': 7.24.7(@babel/core@7.25.2) @@ -14137,6 +14141,7 @@ snapshots: '@vue/compiler-dom': 3.5.10 kolorist: 1.8.0 magic-string: 0.30.11 + vite: 5.4.8(@types/node@18.19.54)(sass@1.79.4)(terser@5.34.1) transitivePeerDependencies: - supports-color @@ -14174,9 +14179,9 @@ snapshots: sass: 1.79.4 terser: 5.34.1 - vitest-environment-nuxt@1.0.1(@vue/test-utils@2.4.6)(h3@1.12.0)(magicast@0.3.5)(nitropack@2.9.7(encoding@0.1.13)(magicast@0.3.5)(webpack-sources@3.2.3))(rollup@4.23.0)(vitest@1.6.0(@types/node@18.19.54)(sass@1.79.4)(terser@5.34.1))(vue-router@4.4.5(vue@3.5.10(typescript@5.6.2)))(vue@3.5.10(typescript@5.6.2))(webpack-sources@3.2.3): + vitest-environment-nuxt@1.0.1(@vue/test-utils@2.4.6)(h3@1.12.0)(magicast@0.3.5)(nitropack@2.9.7(encoding@0.1.13)(magicast@0.3.5)(webpack-sources@3.2.3))(rollup@4.23.0)(vite@5.4.8(@types/node@18.19.54)(sass@1.79.4)(terser@5.34.1))(vitest@1.6.0(@types/node@18.19.54)(sass@1.79.4)(terser@5.34.1))(vue-router@4.4.5(vue@3.5.10(typescript@5.6.2)))(vue@3.5.10(typescript@5.6.2))(webpack-sources@3.2.3): dependencies: - '@nuxt/test-utils': 3.14.2(@vue/test-utils@2.4.6)(h3@1.12.0)(magicast@0.3.5)(nitropack@2.9.7(encoding@0.1.13)(magicast@0.3.5)(webpack-sources@3.2.3))(rollup@4.23.0)(vitest@1.6.0(@types/node@18.19.54)(sass@1.79.4)(terser@5.34.1))(vue-router@4.4.5(vue@3.5.10(typescript@5.6.2)))(vue@3.5.10(typescript@5.6.2))(webpack-sources@3.2.3) + '@nuxt/test-utils': 3.14.2(@vue/test-utils@2.4.6)(h3@1.12.0)(magicast@0.3.5)(nitropack@2.9.7(encoding@0.1.13)(magicast@0.3.5)(webpack-sources@3.2.3))(rollup@4.23.0)(vite@5.4.8(@types/node@18.19.54)(sass@1.79.4)(terser@5.34.1))(vitest@1.6.0(@types/node@18.19.54)(sass@1.79.4)(terser@5.34.1))(vue-router@4.4.5(vue@3.5.10(typescript@5.6.2)))(vue@3.5.10(typescript@5.6.2))(webpack-sources@3.2.3) transitivePeerDependencies: - '@cucumber/cucumber' - '@jest/globals'