Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(PublicShareAuthSidebar): fix and refactor styles for video verification sidebar #12853

Merged
merged 6 commits into from
Aug 1, 2024
Merged

fix(PublicShareAuthSidebar): fix and refactor styles for video verification sidebar #12853

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
212cdf0
fix(PublicShareAuthSidebar): fix and refactor styles for video verifi…
Antreesy Jul 30, 2024
e03f9a7
fix(TopBar): remove reserved space for toggles
Antreesy Jul 30, 2024
fef0f97
fix(TopBar): pass correct color to conversation type icon
Antreesy Jul 30, 2024
a970896
fix(CallButton): hide button text when in sidebar (as in mobile)
Antreesy Jul 30, 2024
af3cc0c
fix(PublicShareSidebar): hide duplicated CallButton
Antreesy Jul 30, 2024
57ead93
style: adjust publicshareauth.css to stretch body component to the vi…
Antreesy Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/components/TopBar/CallButton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,15 @@ export default {
},

/**
* Whether the to use text on button at mobile view
* Whether to use text on button (e.g. at sidebar)
*/
hideText: {
type: Boolean,
default: false,
},

/**
* Whether to use text on button at mobile view
Antreesy marked this conversation as resolved.
Show resolved Hide resolved
*/
shrinkOnMobile: {
type: Boolean,
Expand Down Expand Up @@ -217,7 +225,7 @@ export default {
return this.$store.getters.conversation(this.token) || this.$store.getters.dummyConversation
},
showButtonText() {
return !this.isMobile || !this.shrinkOnMobile
return !this.hideText && (!this.isMobile || !this.shrinkOnMobile)
},
showRecordingWarning() {
return [CALL.RECORDING.VIDEO_STARTING, CALL.RECORDING.AUDIO_STARTING,
Expand Down
2 changes: 1 addition & 1 deletion src/components/TopBar/TopBar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
:model="localMediaModel"
@open-breakout-rooms-editor="showBreakoutRoomsEditor = true" />

<CallButton shrink-on-mobile :is-screensharing="!!localMediaModel.attributes.localScreen" />
<CallButton shrink-on-mobile :hide-text="isSidebar" :is-screensharing="!!localMediaModel.attributes.localScreen" />

<!-- Breakout rooms editor -->
<BreakoutRoomsEditor v-if="showBreakoutRoomsEditor"
Expand Down
Loading