From 16db95bfc71cab5691e679225e364b1a0cab0265 Mon Sep 17 00:00:00 2001 From: Cagatay Civici Date: Tue, 2 Apr 2024 10:59:39 +0300 Subject: [PATCH 1/3] Do not render header if slot is empty --- components/lib/listbox/Listbox.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/lib/listbox/Listbox.vue b/components/lib/listbox/Listbox.vue index 8d9efbd82..6d5e874f1 100755 --- a/components/lib/listbox/Listbox.vue +++ b/components/lib/listbox/Listbox.vue @@ -11,7 +11,7 @@ :data-p-hidden-accessible="true" :data-p-hidden-focusable="true" > -
+
From dc32bea56d2bad5776e3ebc7aea7ae7c8adfcaff Mon Sep 17 00:00:00 2001 From: Cagatay Civici Date: Tue, 2 Apr 2024 11:08:50 +0300 Subject: [PATCH 2/3] Removed unused css from picklist orderlist --- components/lib/orderlist/OrderList.vue | 8 --- components/lib/picklist/PickList.vue | 8 --- .../themes/primeone/base/orderlist/index.js | 67 ------------------- .../themes/primeone/base/picklist/index.js | 63 ----------------- .../primeone/presets/aura/orderlist/index.js | 35 +--------- .../primeone/presets/aura/picklist/index.js | 35 +--------- 6 files changed, 2 insertions(+), 214 deletions(-) diff --git a/components/lib/orderlist/OrderList.vue b/components/lib/orderlist/OrderList.vue index c63dfe706..3f4a36d7c 100755 --- a/components/lib/orderlist/OrderList.vue +++ b/components/lib/orderlist/OrderList.vue @@ -271,14 +271,6 @@ export default { .p-orderlist[${this.attributeSelector}] .p-orderlist-controls { flex-direction: row; } - - .p-orderlist[${this.attributeSelector}] .p-orderlist-controls .p-button { - margin-bottom: 0; - } - - .p-orderlist[${this.attributeSelector}] .p-orderlist-controls .p-button:last-child { - margin-right: 0; - } } `; diff --git a/components/lib/picklist/PickList.vue b/components/lib/picklist/PickList.vue index b0b61e1a1..880c4c12a 100755 --- a/components/lib/picklist/PickList.vue +++ b/components/lib/picklist/PickList.vue @@ -573,14 +573,6 @@ export default { .p-picklist[${this.attributeSelector}] .p-picklist-buttons { flex-direction: row; } - - .p-picklist[${this.attributeSelector}] .p-picklist-buttons .p-button { - margin-bottom: 0; - } - - .p-picklist[${this.attributeSelector}] .p-picklist-buttons .p-button:last-child { - margin-right: 0; - } } `; diff --git a/components/lib/themes/primeone/base/orderlist/index.js b/components/lib/themes/primeone/base/orderlist/index.js index a58ed5506..f417e8555 100644 --- a/components/lib/themes/primeone/base/orderlist/index.js +++ b/components/lib/themes/primeone/base/orderlist/index.js @@ -11,72 +11,5 @@ export default { justify-content: center; gap: 0.5rem; } - -.p-orderlist-list-container { - flex: 1 1 auto; - background: ${dt('orderlist.list.background')}; - border: 1px solid ${dt('orderlist.list.border.color')}; - border-radius: ${dt('rounded.base')}; -} - -.p-orderlist .p-orderlist-header { - color: ${dt('orderlist.header.color')}; - border: 0 none; - padding: 0.75rem 1rem 0.5rem 1rem; - font-weight: 600; -} - -.p-orderlist-list { - list-style-type: none; - margin: 0; - padding: 0; - overflow: auto; - min-height: 12rem; - max-height: 24rem; - padding: 0.25rem 0.25rem; - outline: 0 none; -} - -.p-orderlist-item { - cursor: pointer; - overflow: hidden; - position: relative; - padding: 0.5rem 0.75rem; - margin: 2px 0; - border-radius: ${dt('rounded.base')}; - border: 0 none; - color: ${dt('orderlist.item.color')}; - background: ${dt('orderlist.item.background')}; - outline-color: transparent; - transition: transform ${dt('transition.duration')}, background-color ${dt('transition.duration')}, color ${dt('transition.duration')}, outline-color ${dt('transition.duration')}; -} - -.p-orderlist-item:first-child { - margin-top: 0; -} - -.p-orderlist-item:last-child { - margin-bottom: 0; -} - -.p-orderlist-item:not(.p-highlight):hover { - color: ${dt('orderlist.item.focus.color')}; - background: ${dt('orderlist.item.focus.background')}; -} - -.p-orderlist-item.p-focus { - color: ${dt('orderlist.item.focus.color')}; - background: ${dt('orderlist.item.focus.background')}; -} - -.p-orderlist-item.p-highlight { - color: ${dt('highlight.color')}; - background: ${dt('highlight.background')}; -} - -.p-orderlist-item.p-highlight.p-focus { - color: ${dt('highlight.focus.color')}; - background: ${dt('highlight.focus.background')}; -} ` }; diff --git a/components/lib/themes/primeone/base/picklist/index.js b/components/lib/themes/primeone/base/picklist/index.js index 16ce40b7e..76d51145f 100644 --- a/components/lib/themes/primeone/base/picklist/index.js +++ b/components/lib/themes/primeone/base/picklist/index.js @@ -14,69 +14,6 @@ export default { .p-picklist-list-wrapper { flex: 1 1 50%; - background: ${dt('picklist.list.background')}; - border: 1px solid ${dt('picklist.list.border.color')}; - border-radius: ${dt('rounded.base')}; -} - -.p-picklist .p-picklist-header { - color: ${dt('picklist.header.color')}; - border: 0 none; - padding: 0.75rem 1rem 0.5rem 1rem; - font-weight: 600; -} - -.p-picklist-list { - list-style-type: none; - margin: 0; - padding: 0; - overflow: auto; - min-height: 12rem; - max-height: 24rem; - padding: 0.25rem 0.25rem; - outline: 0 none; -} - -.p-picklist-item { - cursor: pointer; - overflow: hidden; - position: relative; - padding: 0.5rem 0.75rem; - margin: 2px 0; - border-radius: ${dt('rounded.base')}; - border: 0 none; - color: ${dt('picklist.item.color')}; - background: ${dt('picklist.item.background')}; - outline-color: transparent; - transition: transform ${dt('transition.duration')}, background-color ${dt('transition.duration')}, color ${dt('transition.duration')}, outline-color ${dt('transition.duration')}; -} - -.p-picklist-item:first-child { - margin-top: 0; -} - -.p-picklist-item:last-child { - margin-bottom: 0; -} - -.p-picklist-item:not(.p-highlight):hover { - color: ${dt('picklist.item.focus.color')}; - background: ${dt('picklist.item.focus.background')}; -} - -.p-picklist-item.p-focus { - color: ${dt('picklist.item.focus.color')}; - background: ${dt('picklist.item.focus.background')}; -} - -.p-picklist-item.p-highlight { - color: ${dt('highlight.color')}; - background: ${dt('highlight.background')}; -} - -.p-picklist-item.p-highlight.p-focus { - color: ${dt('highlight.focus.color')}; - background: ${dt('highlight.focus.background')}; } ` }; diff --git a/components/lib/themes/primeone/presets/aura/orderlist/index.js b/components/lib/themes/primeone/presets/aura/orderlist/index.js index d0540c399..ff8b4c563 100644 --- a/components/lib/themes/primeone/presets/aura/orderlist/index.js +++ b/components/lib/themes/primeone/presets/aura/orderlist/index.js @@ -1,34 +1 @@ -export default { - colorScheme: { - light: { - list: { - background: '{surface.0}', - borderColor: '{surface.200}' - }, - header: { - color: '{surface.500}' - }, - item: { - background: 'transparent', - focusBackground: '{surface.100}', - color: '{surface.700}', - focusColor: '{surface.800}' - } - }, - dark: { - list: { - background: '{surface.900}', - borderColor: '{surface.700}' - }, - header: { - color: '{surface.400}' - }, - item: { - background: 'transparent', - focusBackground: '{surface.800}', - color: '{surface.0}', - focusColor: '{surface.0}' - } - } - } -}; +export default {}; diff --git a/components/lib/themes/primeone/presets/aura/picklist/index.js b/components/lib/themes/primeone/presets/aura/picklist/index.js index d0540c399..ff8b4c563 100644 --- a/components/lib/themes/primeone/presets/aura/picklist/index.js +++ b/components/lib/themes/primeone/presets/aura/picklist/index.js @@ -1,34 +1 @@ -export default { - colorScheme: { - light: { - list: { - background: '{surface.0}', - borderColor: '{surface.200}' - }, - header: { - color: '{surface.500}' - }, - item: { - background: 'transparent', - focusBackground: '{surface.100}', - color: '{surface.700}', - focusColor: '{surface.800}' - } - }, - dark: { - list: { - background: '{surface.900}', - borderColor: '{surface.700}' - }, - header: { - color: '{surface.400}' - }, - item: { - background: 'transparent', - focusBackground: '{surface.800}', - color: '{surface.0}', - focusColor: '{surface.0}' - } - } - } -}; +export default {}; From d135ddb69650fa4ef01a8a5c421e1ccdee592fd8 Mon Sep 17 00:00:00 2001 From: Cagatay Civici Date: Tue, 2 Apr 2024 11:12:36 +0300 Subject: [PATCH 3/3] Fixed alignment --- doc/scrolltop/ElementDoc.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/scrolltop/ElementDoc.vue b/doc/scrolltop/ElementDoc.vue index ae26de8e8..75b2bf6fb 100644 --- a/doc/scrolltop/ElementDoc.vue +++ b/doc/scrolltop/ElementDoc.vue @@ -18,7 +18,7 @@ :pt="{ root: 'w-2rem h-2rem border-round-sm bg-primary', icon: { - class: 'text-base' + class: 'text-base w-1rem h-1rem' } }" /> @@ -48,7 +48,7 @@ export default { :pt="{ root: 'w-2rem h-2rem border-round-sm bg-primary', icon: { - class: 'text-base' + class: 'text-base w-1rem h-1rem' } }" /> @@ -72,7 +72,7 @@ export default { :pt="{ root: 'w-2rem h-2rem border-round-sm bg-primary', icon: { - class: 'text-base' + class: 'text-base w-1rem h-1rem' } }" /> @@ -98,7 +98,7 @@ export default { :pt="{ root: 'w-2rem h-2rem border-round-sm bg-primary', icon: { - class: 'text-base' + class: 'text-base w-1rem h-1rem' } }" />