Skip to content

Commit c1a084c

Browse files
susnuxbackportbot[bot]
authored andcommitted
refactor(NcTextArea): use shared scss mixin for input border
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
1 parent ed28bd3 commit c1a084c

File tree

1 file changed

+5
-32
lines changed

1 file changed

+5
-32
lines changed

src/components/NcTextArea/NcTextArea.vue

Lines changed: 5 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,8 @@ export default {
357357
</script>
358358

359359
<style lang="scss" scoped>
360+
@use '../../assets/input-border.scss' as border;
361+
360362
.textarea {
361363
--input-border-color: var(--color-border-maxcontrast);
362364
--input-border-width-offset: calc(var(--border-width-input-focused, 2px) - var(--border-width-input, 2px));
@@ -373,19 +375,14 @@ export default {
373375
374376
&__main-wrapper {
375377
height: calc(var(--default-clickable-area) * 2);
376-
padding: var(--border-width-input, 2px);
378+
padding: var(--border-width-input-focused, 2px);
377379
position: relative;
378-
379-
&:not(:has([disabled])):has(textarea:focus),
380-
&:not(:has([disabled])):has(textarea:active) {
381-
padding: 0;
382-
}
383380
}
384381
385382
&__input {
386383
margin: 0;
387-
padding-block: calc(10px + var(--input-border-width-offset));
388-
padding-inline: calc(12px - var(--border-width-input, 2px) + var(--input-border-width-offset)); // align with label 8px margin label + 4px padding label - 2px border input
384+
padding-block: var(--border-radius-element);
385+
padding-inline: 10px; // align with label 8px margin label + 4px padding label - 2px border input
389386
width: 100%;
390387
font-size: var(--default-font-size);
391388
text-overflow: ellipsis;
@@ -400,15 +397,10 @@ export default {
400397
0 -1px var(--input-border-color),
401398
0 0 0 1px color-mix(in srgb, var(--input-border-color), 65% transparent);
402399
403-
&:hover:not([disabled]) {
404-
box-shadow: 0 0 0 1px var(--input-border-color);
405-
}
406400
&:active:not([disabled]),
407401
&:focus:not([disabled]) {
408402
--input-border-width-offset: 0px;
409403
--input-border-color: var(--color-main-text);
410-
border: var(--border-width-input-focused, 2px) solid var(--input-border-color);
411-
box-shadow: 0 0 0 2px var(--color-main-background) !important;
412404
}
413405
414406
// Hide placeholder while not focussed -> show label instead (only if internal label is used)
@@ -492,24 +484,5 @@ export default {
492484
color: var(--color-success-text);
493485
}
494486
}
495-
496-
// for Nextcloud 31 and older we need the old design with only one color
497-
&--legacy {
498-
.textarea__input {
499-
box-shadow: 0 0 0 1px var(--input-border-color);
500-
}
501-
502-
.textarea__main-wrapper:hover:not(:has([disabled])) {
503-
padding: 0;
504-
505-
.textarea__input {
506-
--input-border-color: var(--color-main-text);
507-
// Reset padding offset when focused
508-
--input-border-width-offset: 0px;
509-
border: var(--border-width-input-focused, 2px) solid var(--input-border-color);
510-
box-shadow: 0 0 0 2px var(--color-main-background) !important;
511-
}
512-
}
513-
}
514487
}
515488
</style>

0 commit comments

Comments
 (0)