Skip to content

Fix hover effects for buttons in TopBar #8771

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

Merged
Antreesy merged 3 commits into from
Feb 21, 2023
Merged

Fix hover effects for buttons in TopBar #8771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab232d0
move BreakoutRoomsEditor to parent component
Antreesy Feb 17, 2023
e0e1278
apply hover styles for buttons except CallButton
Antreesy Feb 17, 2023
6395392
change emit naming
Antreesy Feb 21, 2023
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
32 changes: 21 additions & 11 deletions src/components/TopBar/TopBar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,13 @@

<!-- Call time -->
<CallTime v-if="isInCall"
:start="conversation.callStartTime" />
:start="conversation.callStartTime"
class="dark-hover" />

<!-- Participants counter -->
<NcButton v-if="isInCall && !isOneToOneConversation && isModeratorOrUser"
v-tooltip="t('spreed', 'Participants in call')"
class="top-bar__button"
class="top-bar__button dark-hover"
type="tertiary"
@click="openSidebar('participants')">
<template #icon>
Expand All @@ -73,7 +74,7 @@

<!-- Local media controls -->
<LocalMediaControls v-if="isInCall"
class="local-media-controls"
class="local-media-controls dark-hover"
:token="token"
:model="localMediaModel"
:show-actions="!isSidebar"
Expand All @@ -82,16 +83,18 @@

<!-- TopBar menu -->
<TopBarMenu :token="token"
class="top-bar__button dark-hover"
:show-actions="!isSidebar"
:is-sidebar="isSidebar"
:model="localMediaModel" />
:model="localMediaModel"
@open-breakout-rooms-editor="showBreakoutRoomsEditor = true" />

<CallButton class="top-bar__button" />

<template v-if="showOpenSidebarButton">
<!-- sidebar toggle -->
<NcButton v-if="!isInCall"
class="top-bar__button"
class="top-bar__button dark-hover"
close-after-click="true"
type="tertiary"
@click="openSidebar">
Expand All @@ -103,7 +106,7 @@
<!-- chat button -->
<div v-if="isInCall"
class="chat-button">
<NcActions class="top-bar__button"
<NcActions class="top-bar__button dark-hover"
close-after-click="true"
:container="container">
<NcActionButton key="openSideBarButtonMessageText"
Expand All @@ -121,6 +124,11 @@
</NcCounterBubble>
</div>
</template>

<!-- Breakout rooms editor -->
<BreakoutRoomsEditor v-if="showBreakoutRoomsEditor"
:token="token"
@close="showBreakoutRoomsEditor = false" />
</div>
</template>

Expand All @@ -147,6 +155,7 @@ import TopBarMenu from './TopBarMenu.vue'
import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
import CallTime from './CallTime.vue'
import MenuIcon from 'vue-material-design-icons/Menu.vue'
import BreakoutRoomsEditor from '../BreakoutRoomsEditor/BreakoutRoomsEditor.vue'

export default {
name: 'TopBar',
Expand All @@ -156,6 +165,7 @@ export default {
},

components: {
BreakoutRoomsEditor,
NcActionButton,
NcActions,
NcCounterBubble,
Expand Down Expand Up @@ -194,6 +204,7 @@ export default {
data: () => {
return {
unreadNotificationHandle: null,
showBreakoutRoomsEditor: false,
localCallParticipantModel,
localMediaModel,
}
Expand Down Expand Up @@ -404,11 +415,10 @@ export default {
color: #fff;
}

& button.top-bar__button:hover,
:deep(.action-item--open .action-item__menutoggle),
:deep(.action-item__menutoggle:hover),
:deep(.action-item--single:hover),
:deep(.buttons-bar button:hover) {
:deep(button.dark-hover:hover),
.dark-hover :deep(button:hover),
.dark-hover :deep(.action-item--open button),
:deep(.action-item--open.dark-hover button) {
background-color: rgba(0, 0, 0, 0.2);
}
}
Expand Down
Loading