Skip to content

[stable23] Fix topbar buttons design and mobile layout #6489

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
nickvergessen merged 5 commits into from
Nov 12, 2021
Merged

[stable23] Fix topbar buttons design and mobile layout #6489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a965b35
Remove background in topbar buttons
marcoambrosini Nov 11, 2021
1831774
Fix buttons layout
marcoambrosini Nov 11, 2021
1fc4196
Fix actions active background
marcoambrosini Nov 11, 2021
aadeda0
Wrap LocalMediaControls so that they're visible on mobile
marcoambrosini Nov 11, 2021
76fa490
Fix localmediacontrols overlapping with sidebar toggle
marcoambrosini Nov 12, 2021
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
2 changes: 0 additions & 2 deletions src/assets/variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@ $message-utils-width: 100px;
//message form max height
$message-form-max-height: 180px;

$top-bar-height: 61px;

$color-call-background: #444444;
$color-guests-avatar: #ffffff;
$color-background-guests-avatar: #b9b9b9;
Expand Down
5 changes: 5 additions & 0 deletions src/components/CallView/shared/LocalMediaControls.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -885,6 +885,11 @@ export default {
border: none;
margin: 0;
padding: 0 12px;
width: $clickable-area;
height: $clickable-area;
&:active {
background: transparent;
}
}

.buttons-bar #screensharing-menu button {
Expand Down
15 changes: 8 additions & 7 deletions src/components/TopBar/TopBar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<!-- sidebar toggle -->
<Actions
v-shortkey.once="['f']"
class="top-bar__button forced-background"
class="top-bar__button"
menu-align="right"
:aria-label="t('spreed', 'Conversation actions')"
:container="container"
Expand Down Expand Up @@ -133,7 +133,7 @@
</ActionButton>
</Actions>
<Actions v-if="showOpenSidebarButton"
class="top-bar__button forced-background"
class="top-bar__button"
close-after-click="true"
:container="container">
<ActionButton
Expand Down Expand Up @@ -474,7 +474,6 @@ export default {
@import '../../assets/variables';

.top-bar {
height: $top-bar-height;
right: 12px; /* needed so we can still use the scrollbar */
display: flex;
z-index: 10;
Expand All @@ -491,10 +490,8 @@ export default {
top: 0;
left:0;
background-color: $color-call-background;
.forced-background {
background-color: rgba(0,0,0,0.1) !important;
border-radius: var(--border-radius-pill);
}
display: flex;
flex-wrap: wrap-reverse;
}

&__buttons {
Expand Down Expand Up @@ -562,4 +559,8 @@ export default {
color: var(--color-text-lighter);
}
}

.local-media-controls {
padding-left: $clickable-area;
}
</style>