Skip to content

Commit d8d267c

Browse files
committed
Fix user status message input
Signed-off-by: Christopher Ng <chrng8@gmail.com>
1 parent 5e3a3c0 commit d8d267c

6 files changed

Lines changed: 44 additions & 40 deletions

File tree

apps/user_status/src/components/CustomMessageInput.vue

Lines changed: 38 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,27 @@
1919
-
2020
-->
2121
<template>
22-
<div class="custom-input__form">
23-
<NcEmojiPicker container=".custom-input__form" @select="setIcon">
24-
<NcButton class="custom-input__emoji-button" type="tertiary-no-background">
22+
<div class="custom-input">
23+
<NcEmojiPicker container=".custom-input" @select="setIcon">
24+
<NcButton class="custom-input__emoji-button" type="secondary">
2525
{{ visibleIcon }}
2626
</NcButton>
2727
</NcEmojiPicker>
28-
<label class="hidden-visually" for="user_status_message">
29-
{{ t('user_status', 'What is your status?') }}
30-
</label>
31-
<input id="user_status_message"
32-
ref="input"
33-
maxlength="80"
34-
:disabled="disabled"
35-
:placeholder="$t('user_status', 'What is your status?')"
36-
type="text"
37-
:value="message"
38-
@change="onChange"
39-
@keyup="onKeyup"
40-
@paste="onKeyup">
28+
<div class="custom-input__container">
29+
<label class="hidden-visually" for="user_status_message">
30+
{{ t('user_status', 'What is your status?') }}
31+
</label>
32+
<input id="user_status_message"
33+
ref="input"
34+
maxlength="80"
35+
:disabled="disabled"
36+
:placeholder="$t('user_status', 'What is your status?')"
37+
type="text"
38+
:value="message"
39+
@change="onChange"
40+
@keyup="onKeyup"
41+
@paste="onKeyup">
42+
</div>
4143
</div>
4244
</template>
4345

@@ -112,18 +114,30 @@ export default {
112114
</script>
113115

114116
<style lang="scss" scoped>
115-
.custom-input__form {
116-
flex-grow: 1;
117-
position: relative;
117+
.custom-input {
118+
display: flex;
119+
width: 100%;
118120
119-
.v-popper {
120-
position: absolute;
121+
&__emoji-button {
122+
min-height: 36px;
123+
padding: 0;
124+
border: 2px solid var(--color-border-maxcontrast);
125+
border-right: none;
126+
border-radius: var(--border-radius) 0 0 var(--border-radius);
127+
128+
&:hover {
129+
border-color: var(--color-primary-element);
130+
}
121131
}
122132
123-
input {
133+
&__container {
124134
width: 100%;
125-
border-radius: 0 var(--border-radius) var(--border-radius) 0;
126-
padding-left: 44px !important;
135+
136+
input {
137+
width: 100%;
138+
margin: 0;
139+
border-radius: 0 var(--border-radius) var(--border-radius) 0;
140+
}
127141
}
128142
}
129143
</style>

apps/user_status/src/components/SetStatusModal.vue

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -246,16 +246,6 @@ export default {
246246
display: flex;
247247
width: 100%;
248248
margin-bottom: 10px;
249-
250-
.custom-input__emoji-button {
251-
flex-basis: 40px;
252-
flex-grow: 0;
253-
width: 40px;
254-
height: 34px;
255-
margin-right: 0;
256-
border-right: none;
257-
border-radius: var(--border-radius) 0 0 var(--border-radius);
258-
}
259249
}
260250
261251
.status-buttons {

dist/user-status-modal-8299.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/user-status-modal-8299.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/user_status-menu.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/user_status-menu.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)