File tree Expand file tree Collapse file tree 4 files changed +59
-10
lines changed
Expand file tree Collapse file tree 4 files changed +59
-10
lines changed Original file line number Diff line number Diff line change 1818 :class =" inputClasses"
1919 @click =" () => !disabled && togglePopover()"
2020 >
21- <div class =" flex items-center" >
21+ <div class =" flex items-center min-w-0 flex-1 " >
2222 <slot name =" prefix" />
23- <span
24- class =" overflow-hidden text-ellipsis whitespace-nowrap text-base leading-5"
25- v-if =" selectedValue"
26- >
23+ <span class =" text-base leading-5 truncate" v-if =" selectedValue" >
2724 {{ displayValue(selectedValue) }}
2825 </span >
2926 <span class =" text-base leading-5 text-gray-500" v-else >
Original file line number Diff line number Diff line change 55 type =" checkbox"
66 :checked =" props.value"
77 @change.stop =" updateFilter(filter, $event.target.checked)"
8- class =" w-44 "
8+ class =" w-36 "
99 />
1010 <FormControl
1111 v-else-if =" filter.type === 'Select'"
12- class =" form-control cursor-pointer [& _select]:cursor-pointer w-44 "
12+ class =" form-control cursor-pointer [& _select]:cursor-pointer w-36 "
1313 type =" select"
1414 :model-value =" props.value"
1515 :options =" filter.options"
2222 :doctype =" filter.options"
2323 :placeholder =" filter.label"
2424 @change =" (data) => updateFilter(filter, data)"
25- class =" w-44 "
25+ class =" w-36 "
2626 />
2727 <component
2828 v-else-if =" ['Date', 'Datetime'].includes(filter.type)"
29- class =" border-none w-44 "
29+ class =" border-none w-36 "
3030 :is =" filter.type === 'Date' ? DatePicker : DateTimePicker"
3131 :value =" props.value"
3232 @change =" (v) => updateFilter(filter, v)"
Original file line number Diff line number Diff line change 11<template >
2+ <<<<<<< HEAD
23 <div v-if =" !quickFilters.loading" >
34 <FadedScrollableDiv
45 class =" flex flex-1 items-center -ml-1 flex-wrap gap-2"
56 orientation =" horizontal"
7+ =======
8+ <FadedScrollableDiv
9+ class =" quick-filters flex flex-1 items-center -ml-1 overflow-x-auto py-1 gap-2 pr-4"
10+ orientation =" horizontal"
11+ v-if =" !quickFilters.loading"
12+ >
13+ <div
14+ v-for =" filter in quickFilters.data"
15+ :key =" filter.name"
16+ class =" min-w-36 pl-0.5"
17+ >>>>>>> 7c3088de (fix: improve sidepanel scrollbar and fix quick filters)
618 >
719 <div
820 v-for =" filter in quickFilters.data"
@@ -80,4 +92,12 @@ function getValue(quickFilter, filters) {
8092}
8193< / script>
8294
83- < style lang= " scss" scoped>< / style>
95+ < style scoped>
96+ .quick - filters {
97+ scrollbar- width: none; /* Firefox */
98+ - ms- overflow- style: none; /* IE/Edge */
99+ }
100+ .quick - filters: : - webkit- scrollbar {
101+ display: none; /* Chrome/Safari */
102+ }
103+ < / style>
Original file line number Diff line number Diff line change 99 @apply break-normal max-w-none prose prose-code:break-all prose-code:whitespace-pre-wrap prose-img:border prose-img:rounded-lg prose-sm;
1010 }
1111}
12+
1213.tiptap input [placeholder = "Add caption" ] {
1314 display : none !important ;
1415}
1516
1617html ,
1718body {
1819 color : var (--ink-gray-9 );
20+ <<<<<<< HEAD
21+ = = = = = = =
22+ }
23+
24+ /* Modern slim scrollbars */
25+ * {
26+ scrollbar-width : thin;
27+ scrollbar-color : var (--outline-gray-3 ) transparent;
28+ }
29+
30+ * ::-webkit-scrollbar {
31+ width : 6px ;
32+ height : 6px ;
33+ }
34+
35+ * ::-webkit-scrollbar-track {
36+ background : transparent;
37+ }
38+
39+ * ::-webkit-scrollbar-thumb {
40+ background-color : var (--outline-gray-3 );
41+ border-radius : 9999px ;
42+ }
43+
44+ * ::-webkit-scrollbar-thumb : hover {
45+ background-color : var (--outline-gray-4 );
46+ }
47+
48+ * ::-webkit-scrollbar-corner {
49+ background : transparent;
50+ > > > > > > > 7c3088de (fix: improve sidepanel scrollbar and fix quick filters)
1951}
You can’t perform that action at this time.
0 commit comments