Przeglądaj źródła

fix(welcome): Align meeting list at the top when no footer

j8
Vlad Piersec 4 lat temu
rodzic
commit
5fd9dc74e4

+ 4
- 0
css/_welcome_page.scss Wyświetl plik

233
         }
233
         }
234
     }
234
     }
235
 
235
 
236
+    &.without-footer {
237
+        justify-content: start;
238
+    }
239
+
236
     .welcome-cards-container {
240
     .welcome-cards-container {
237
         color:#131519;
241
         color:#131519;
238
         padding-top: 40px;
242
         padding-top: 40px;

+ 3
- 2
react/features/welcome/components/WelcomePage.web.js Wyświetl plik

176
         const showAdditionalCard = this._shouldShowAdditionalCard();
176
         const showAdditionalCard = this._shouldShowAdditionalCard();
177
         const showAdditionalContent = this._shouldShowAdditionalContent();
177
         const showAdditionalContent = this._shouldShowAdditionalContent();
178
         const showAdditionalToolbarContent = this._shouldShowAdditionalToolbarContent();
178
         const showAdditionalToolbarContent = this._shouldShowAdditionalToolbarContent();
179
+        const contentClassName = showAdditionalContent ? 'with-content' : 'without-content';
180
+        const footerClassName = DISPLAY_WELCOME_FOOTER ? 'with-footer' : 'without-footer';
179
 
181
 
180
         return (
182
         return (
181
             <div
183
             <div
182
-                className = { `welcome ${showAdditionalContent
183
-                    ? 'with-content' : 'without-content'}` }
184
+                className = { `welcome ${contentClassName} ${footerClassName}` }
184
                 id = 'welcome_page'>
185
                 id = 'welcome_page'>
185
                 <div className = 'welcome-watermark'>
186
                 <div className = 'welcome-watermark'>
186
                     <Watermarks defaultJitsiLogoURL = { DEFAULT_WELCOME_PAGE_LOGO_URL } />
187
                     <Watermarks defaultJitsiLogoURL = { DEFAULT_WELCOME_PAGE_LOGO_URL } />

Ładowanie…
Anuluj
Zapisz