Troplo/Colubrina
1
0
Fork 0
mirror of https://github.com/Troplo/Colubrina.git synced 2024-11-22 19:27:55 +11:00
Code Issues Projects Releases Packages Wiki Activity

Re-add scrollbars

Browse source
This commit is contained in:
Troplo 2022-08-31 22:06:04 +10:00
parent d6f64de95e
commit 3721453d75
3 changed files with 19 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
frontend/src/assets/styles.css
View file

@ -80,14 +80,6 @@ img.emoji {
.v-btn { .v-btn {
text-transform: capitalize; text-transform: capitalize;
} }
::-webkit-scrollbar {
display: none;
}
* {
-ms-overflow-style: none;
scrollbar-width: none; /* Firefox */
}
.troplo-nav { .troplo-nav {
font-family: "Inter", sans-serif; font-family: "Inter", sans-serif;
@ -156,39 +148,28 @@ div .theme--dark.v-calendar-daily .v-calendar-daily__day {
border: 1px transparent !important; border: 1px transparent !important;
} }
.light::-webkit-scrollbar {
width: 15px !important;
}
.light::-webkit-scrollbar-track {
background: #e6e6e6 !important;
border-left: 1px solid #dadada !important;
}
.light::-webkit-scrollbar-thumb {
background: #b0b0b0 !important;
border: solid 3px #e6e6e6 !important;
border-radius: 7px !important;
}
.light::-webkit-scrollbar-thumb:hover {
background: black !important;
}
::-webkit-scrollbar { ::-webkit-scrollbar {
width: 15px !important; width: 10px !important;
} }
::-webkit-scrollbar-track { ::-webkit-scrollbar-track {
background: #151515 !important; background: transparent !important;
} }
::-webkit-scrollbar-thumb { ::-webkit-scrollbar-thumb {
background: #3e3e3e !important; background: var(--v-text-lighten3) !important;
border: solid 3px #202020 !important; border: solid 3px var(--v-bg-base) !important;
border-radius: 7px !important; border-radius: 7px !important;
} }
::-webkit-scrollbar-thumb:hover { ::-webkit-scrollbar-thumb:hover {
background: white !important; background: var(--v-text-lighten4) !important;
}
::-webkit-scrollbar-corner {
background-color: var(--v-bg-base);
}
:root {
overflow-y: auto !important;
} }

2
frontend/src/components/Message.vue
View file

@ -184,8 +184,6 @@
> >
<v-progress-circular <v-progress-circular
indeterminate indeterminate
width="500"
height="500"
color="grey lighten-5" color="grey lighten-5"
></v-progress-circular> ></v-progress-circular>
</v-row> </v-row>

11
frontend/src/views/Communications/CommunicationsChat.vue
View file

@ -4,7 +4,7 @@
:position-x="$store.state.context.pins.x" :position-x="$store.state.context.pins.x"
:position-y="60" :position-y="60"
v-model="$store.state.context.pins.value" v-model="$store.state.context.pins.value"
class="rounded-l" class="rounded-l elevation-7"
absolute absolute
transition="scroll-y-transition" transition="scroll-y-transition"
:close-on-content-click="false" :close-on-content-click="false"
@ -18,9 +18,9 @@
</v-toolbar> </v-toolbar>
<v-divider></v-divider> <v-divider></v-divider>
<v-container> <v-container>
<v-list dense v-if="pins.length"> <v-list dense v-if="pins.length" :max-height="600">
<v-list-item <v-list-item
@click.self="jumpToMessage(pin.message.id)" @click="jumpToMessage(pin.message.id)"
v-for="(pin, index) in pins" v-for="(pin, index) in pins"
:key="index" :key="index"
> >
@ -30,7 +30,7 @@
:key="pin.message.keyId" :key="pin.message.keyId"
></SimpleMessage> ></SimpleMessage>
<v-spacer></v-spacer> <v-spacer></v-spacer>
<v-btn icon text @click="removePin(pin.messageId)"> <v-btn icon text @click.stop="removePin(pin.messageId)">
<v-icon> mdi-close </v-icon> <v-icon> mdi-close </v-icon>
</v-btn> </v-btn>
</v-list-item> </v-list-item>
@ -228,7 +228,8 @@
messages[index - 1]?.createdAt, messages[index - 1]?.createdAt,
'minute' 'minute'
) < 10 && ) < 10 &&
!message.replyId !message.replyId &&
!message.type
" "
></Message> ></Message>
<div <div