haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8426 from jitsi/tavram/gradient-condition 

fix(subject) remove gradient if no info in topbar
This commit is contained in:
Avram Tudor 2021-01-15 16:26:19 +02:00 committed by GitHub
parent 8aae2065dc 7ff332b2bb
commit 13bc9863cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
css/_subject.scss
View File

@ -14,12 +14,15 @@
text-overflow: ellipsis; text-overflow: ellipsis;
box-sizing: border-box; box-sizing: border-box;
white-space: nowrap; white-space: nowrap;
background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
&.visible { &.visible {
top: 0px; top: 0px;
} }
&.gradient {
background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
}
&-text { &-text {
vertical-align: middle; vertical-align: middle;
} }

7
react/features/conference/components/web/Subject.js
View File

@ -57,9 +57,14 @@ class Subject extends Component<Props> {
*/ */
render() { render() {
const { _hideConferenceTimer, _showParticipantCount, _showSubject, _subject, _visible } = this.props; const { _hideConferenceTimer, _showParticipantCount, _showSubject, _subject, _visible } = this.props;
let className = `subject ${_visible ? 'visible' : ''}`;
if (!_hideConferenceTimer || _showParticipantCount || _showSubject) {
className += ' gradient';
}
return ( return (
<div className = { `subject ${_visible ? 'visible' : ''}` }> <div className = { className }>
{ _showSubject && <span className = 'subject-text'>{ _subject }</span>} { _showSubject && <span className = 'subject-text'>{ _subject }</span>}
{ _showParticipantCount && <ParticipantsCount /> } { _showParticipantCount && <ParticipantsCount /> }
{ !_hideConferenceTimer && <ConferenceTimer /> } { !_hideConferenceTimer && <ConferenceTimer /> }