Bladeren bron

fix(subject) remove gradient if no info in topbar

master
Tudor-Ovidiu Avram 4 jaren geleden
bovenliggende
commit
7ff332b2bb
2 gewijzigde bestanden met toevoegingen van 10 en 2 verwijderingen
  1. 4
    1
      css/_subject.scss
  2. 6
    1
      react/features/conference/components/web/Subject.js

+ 4
- 1
css/_subject.scss Bestand weergeven

14
     text-overflow: ellipsis;
14
     text-overflow: ellipsis;
15
     box-sizing: border-box;
15
     box-sizing: border-box;
16
     white-space: nowrap;
16
     white-space: nowrap;
17
-    background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
18
 
17
 
19
     &.visible {
18
     &.visible {
20
         top: 0px;
19
         top: 0px;
21
     }
20
     }
22
 
21
 
22
+    &.gradient {
23
+        background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
24
+    }
25
+
23
     &-text {
26
     &-text {
24
         vertical-align: middle;
27
         vertical-align: middle;
25
     }
28
     }

+ 6
- 1
react/features/conference/components/web/Subject.js Bestand weergeven

57
      */
57
      */
58
     render() {
58
     render() {
59
         const { _hideConferenceTimer, _showParticipantCount, _showSubject, _subject, _visible } = this.props;
59
         const { _hideConferenceTimer, _showParticipantCount, _showSubject, _subject, _visible } = this.props;
60
+        let className = `subject ${_visible ? 'visible' : ''}`;
61
+
62
+        if (!_hideConferenceTimer || _showParticipantCount || _showSubject) {
63
+            className += ' gradient';
64
+        }
60
 
65
 
61
         return (
66
         return (
62
-            <div className = { `subject ${_visible ? 'visible' : ''}` }>
67
+            <div className = { className }>
63
                 { _showSubject && <span className = 'subject-text'>{ _subject }</span>}
68
                 { _showSubject && <span className = 'subject-text'>{ _subject }</span>}
64
                 { _showParticipantCount && <ParticipantsCount /> }
69
                 { _showParticipantCount && <ParticipantsCount /> }
65
                 { !_hideConferenceTimer && <ConferenceTimer /> }
70
                 { !_hideConferenceTimer && <ConferenceTimer /> }

Laden…
Annuleren
Opslaan