Merge develop into feat/voice-channel
- Resolved merge conflicts in Vue components - Updated color scheme to use new n-slate tokens - Preserved voice channel functionality including isPrivateNoteOnly - Removed files that were deleted in develop - Fixed ESLint errors in App.vue - Fixed SCSS imports in CollaboratorsPage.vue - Fixed duplicate voice channel entries in ChannelList and ChannelItem - Moved voice channel to end of channel list - Integrated with new component structure
This commit is contained in:
@@ -74,7 +74,7 @@ const action = computed(() => ({
|
||||
|
||||
<style lang="scss">
|
||||
.join-call-button {
|
||||
margin: var(--space-small) 0;
|
||||
margin: 0.5rem 0;
|
||||
}
|
||||
|
||||
.video-call--container {
|
||||
@@ -83,9 +83,9 @@ const action = computed(() => ({
|
||||
right: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
z-index: var(--z-index-high);
|
||||
padding: var(--space-smaller);
|
||||
background: var(--b-800);
|
||||
z-index: 1000;
|
||||
padding: 0.25rem;
|
||||
@apply bg-n-background;
|
||||
|
||||
iframe {
|
||||
width: 100%;
|
||||
@@ -95,7 +95,7 @@ const action = computed(() => ({
|
||||
|
||||
button {
|
||||
position: absolute;
|
||||
top: var(--space-smaller);
|
||||
top: 0.25rem;
|
||||
right: 10rem;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -34,7 +34,7 @@ const displayFileName = computed(() => {
|
||||
const textColorClass = computed(() => {
|
||||
const colorMap = {
|
||||
'7z': 'dark:text-[#EDEEF0] text-[#2F265F]',
|
||||
csv: 'text-amber-12',
|
||||
csv: 'text-n-amber-12',
|
||||
doc: 'dark:text-[#D6E1FF] text-[#1F2D5C]', // indigo-12
|
||||
docx: 'dark:text-[#D6E1FF] text-[#1F2D5C]', // indigo-12
|
||||
json: 'text-n-slate-12',
|
||||
|
||||
Reference in New Issue
Block a user