+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -70,7 +114,9 @@ export default {
diff --git a/apps/showcase/pages/select/index.vue b/apps/showcase/pages/select/index.vue
index 9a1772516..c43003590 100755
--- a/apps/showcase/pages/select/index.vue
+++ b/apps/showcase/pages/select/index.vue
@@ -13,6 +13,7 @@ import FilledDoc from '@/doc/select/FilledDoc.vue';
import FilterDoc from '@/doc/select/FilterDoc.vue';
import FloatLabelDoc from '@/doc/select/FloatLabelDoc.vue';
import GroupDoc from '@/doc/select/GroupDoc.vue';
+import IftaLabelDoc from '@/doc/select/IftaLabelDoc.vue';
import ImportDoc from '@/doc/select/ImportDoc.vue';
import InvalidDoc from '@/doc/select/InvalidDoc.vue';
import LazyVirtualScrollDoc from '@/doc/select/LazyVirtualScrollDoc.vue';
@@ -86,6 +87,11 @@ export default {
label: 'Float Label',
component: FloatLabelDoc
},
+ {
+ id: 'iftalabel',
+ label: 'Ifta Label',
+ component: IftaLabelDoc
+ },
{
id: 'filled',
label: 'Filled',
diff --git a/packages/primevue/src/floatlabel/style/FloatLabelStyle.js b/packages/primevue/src/floatlabel/style/FloatLabelStyle.js
index 510e5dbc1..c9fa64b83 100644
--- a/packages/primevue/src/floatlabel/style/FloatLabelStyle.js
+++ b/packages/primevue/src/floatlabel/style/FloatLabelStyle.js
@@ -36,10 +36,10 @@ const theme = ({ dt }) => `
.p-floatlabel:has(textarea.p-filled) label,
.p-floatlabel:has(.p-inputwrapper-focus) label,
.p-floatlabel:has(.p-inputwrapper-filled) label {
- top: ${dt('floatlabel.over.focus.top')};
+ top: ${dt('floatlabel.over.active.top')};
transform: translateY(0);
- font-size: ${dt('floatlabel.focus.font.size')};
- font-weight: ${dt('floatlabel.label.focus.font.weight')};
+ font-size: ${dt('floatlabel.active.font.size')};
+ font-weight: ${dt('floatlabel.label.active.font.weight')};
}
.p-floatlabel:has(input.p-filled) label,
@@ -55,7 +55,7 @@ const theme = ({ dt }) => `
color: ${dt('floatlabel.focus.color')};
}
-.p-floatlabel .p-placeholder,
+/*.p-floatlabel .p-placeholder,
.p-floatlabel input::placeholder,
.p-floatlabel .p-inputtext::placeholder {
opacity: 0;
@@ -69,10 +69,11 @@ const theme = ({ dt }) => `
opacity: 1;
transition-property: all;
transition-timing-function: ease;
-}
+}*/
.p-floatlabel-in .p-inputtext,
-.p-floatlabel-in .p-textarea {
+.p-floatlabel-in .p-textarea,
+.p-floatlabel-in .p-select-label {
padding-top: ${dt('floatlabel.in.input.padding.top')};
}
@@ -83,10 +84,11 @@ const theme = ({ dt }) => `
.p-floatlabel-in:has(textarea.p-filled) label,
.p-floatlabel-in:has(.p-inputwrapper-focus) label,
.p-floatlabel-in:has(.p-inputwrapper-filled) label {
- top: ${dt('floatlabel.in.focus.top')};
+ top: ${dt('floatlabel.in.active.top')};
}
-.p-floatlabel-on .p-inputtext {
+.p-floatlabel-on .p-inputtext,
+.p-floatlabel-on .p-select-label {
padding-top: ${dt('floatlabel.on.input.padding.top')};
padding-bottom: ${dt('floatlabel.on.input.padding.bottom')};
}
@@ -100,8 +102,8 @@ const theme = ({ dt }) => `
.p-floatlabel-on:has(.p-inputwrapper-filled) label {
top: 0;
transform: translateY(-50%);
- background: ${dt('floatlabel.on.focus.background')};
- padding: ${dt('floatlabel.on.focus.padding')};
+ background: ${dt('floatlabel.on.active.background')};
+ padding: ${dt('floatlabel.on.active.padding')};
}
`;
diff --git a/packages/primevue/src/iftalabel/style/IftaLabelStyle.js b/packages/primevue/src/iftalabel/style/IftaLabelStyle.js
index 7fbac4ca2..30f830879 100644
--- a/packages/primevue/src/iftalabel/style/IftaLabelStyle.js
+++ b/packages/primevue/src/iftalabel/style/IftaLabelStyle.js
@@ -21,7 +21,8 @@ const theme = ({ dt }) => `
}
.p-iftalabel .p-inputtext,
-.p-iftalabel .p-textarea {
+.p-iftalabel .p-textarea,
+.p-iftalabel .p-select-label {
padding-top: ${dt('iftalabel.input.padding.top')};
}
@@ -36,7 +37,7 @@ const theme = ({ dt }) => `
color: ${dt('iftalabel.focus.color')};
}
-.p-iftalabel .p-placeholder,
+/*.p-iftalabel .p-placeholder,
.p-iftalabel input::placeholder,
.p-iftalabel .p-inputtext::placeholder {
opacity: 0;
@@ -50,7 +51,7 @@ const theme = ({ dt }) => `
opacity: 1;
transition-property: all;
transition-timing-function: ease;
-}
+}*/
`;
const classes = {
diff --git a/packages/themes/src/presets/aura/floatlabel/index.js b/packages/themes/src/presets/aura/floatlabel/index.js
index 1bab854db..37dbd914c 100644
--- a/packages/themes/src/presets/aura/floatlabel/index.js
+++ b/packages/themes/src/presets/aura/floatlabel/index.js
@@ -8,13 +8,13 @@ export default {
positionX: '{form.field.padding.x}',
positionY: '{form.field.padding.y}',
fontWeight: '500',
- focus: {
+ active: {
fontSize: '0.75rem',
fontWeight: '400'
}
},
over: {
- focus: {
+ active: {
top: '-1.25rem'
}
},
@@ -22,7 +22,7 @@ export default {
input: {
paddingTop: '1.5rem'
},
- focus: {
+ active: {
top: '{form.field.padding.y}'
}
},
@@ -31,7 +31,7 @@ export default {
paddingTop: '1rem',
paddingBottom: '1rem'
},
- focus: {
+ active: {
background: '{form.field.background}',
padding: '0 0.125rem'
}
diff --git a/packages/themes/src/presets/lara/floatlabel/index.js b/packages/themes/src/presets/lara/floatlabel/index.js
index 3c962fab6..a231707b5 100644
--- a/packages/themes/src/presets/lara/floatlabel/index.js
+++ b/packages/themes/src/presets/lara/floatlabel/index.js
@@ -8,13 +8,13 @@ export default {
positionX: '{form.field.padding.x}',
positionY: '{form.field.padding.y}',
fontWeight: '500',
- focus: {
- fontSize: '0.875rem',
+ active: {
+ fontSize: '0.75rem',
fontWeight: '400'
}
},
over: {
- focus: {
+ active: {
top: '-1.375rem'
}
},
@@ -22,7 +22,7 @@ export default {
input: {
paddingTop: '1.875rem'
},
- focus: {
+ active: {
top: '{form.field.padding.y}'
}
},
@@ -31,7 +31,7 @@ export default {
paddingTop: '1.25rem',
paddingBottom: '1.25rem'
},
- focus: {
+ active: {
background: '{form.field.background}',
padding: '0 0.125rem'
}
diff --git a/packages/themes/src/presets/nora/floatlabel/index.js b/packages/themes/src/presets/nora/floatlabel/index.js
index 1bab854db..37dbd914c 100644
--- a/packages/themes/src/presets/nora/floatlabel/index.js
+++ b/packages/themes/src/presets/nora/floatlabel/index.js
@@ -8,13 +8,13 @@ export default {
positionX: '{form.field.padding.x}',
positionY: '{form.field.padding.y}',
fontWeight: '500',
- focus: {
+ active: {
fontSize: '0.75rem',
fontWeight: '400'
}
},
over: {
- focus: {
+ active: {
top: '-1.25rem'
}
},
@@ -22,7 +22,7 @@ export default {
input: {
paddingTop: '1.5rem'
},
- focus: {
+ active: {
top: '{form.field.padding.y}'
}
},
@@ -31,7 +31,7 @@ export default {
paddingTop: '1rem',
paddingBottom: '1rem'
},
- focus: {
+ active: {
background: '{form.field.background}',
padding: '0 0.125rem'
}