Selaa lähdekoodia

feat(watermark) move static styles into stylesheet file & refactor a tiny bit

factor2
Thomas Egebrand Gram 1 vuosi sitten
vanhempi
commit
bda39ef876
No account linked to committer's email address

+ 6
- 5
css/_base.scss Näytä tiedosto

@@ -115,17 +115,18 @@ form {
115 115
 }
116 116
 
117 117
 .leftwatermark {
118
+    max-width: 140px;
119
+    max-height:70px;
118 120
     left: 32px;
119 121
     top: 32px;
120 122
     background-position: center left;
121 123
     background-repeat: no-repeat;
122 124
     background-size: contain;
123
-}
124 125
 
125
-.leftwatermarknomargin {
126
-    background-position: center left;
127
-    background-repeat: no-repeat;
128
-    background-size: contain;
126
+    &.no-margin {
127
+        left:0;
128
+        top:0;
129
+    }
129 130
 }
130 131
 
131 132
 .rightwatermark {

+ 0
- 5
css/_welcome_page.scss Näytä tiedosto

@@ -260,11 +260,6 @@ body.welcome-page {
260 260
             width: $welcomePageWatermarkWidth;
261 261
             height: $welcomePageWatermarkHeight;
262 262
         }
263
-
264
-        .watermark.leftwatermarknomargin {
265
-            width: $welcomePageWatermarkWidth;
266
-            height: $welcomePageWatermarkHeight;
267
-        }
268 263
     }
269 264
 
270 265
     &.without-content {

+ 1
- 3
react/features/base/react/components/web/Watermarks.tsx Näytä tiedosto

@@ -158,15 +158,13 @@ class Watermarks extends Component<IProps, State> {
158 158
             _showJitsiWatermark
159 159
         } = this.props;
160 160
         const { noMargins, t } = this.props;
161
-        const className = `watermark ${noMargins ? 'leftwatermarknomargin' : 'leftwatermark'}`;
161
+        const className = `watermark leftwatermark ${noMargins ? 'no-margin' : ''}`;
162 162
 
163 163
         let reactElement = null;
164 164
 
165 165
         if (_showJitsiWatermark) {
166 166
             const style = {
167 167
                 backgroundImage: `url(${_logoUrl})`,
168
-                maxWidth: 140,
169
-                maxHeight: 70,
170 168
                 position: _logoLink ? 'static' : 'absolute'
171 169
             } as const;
172 170
 

Loading…
Peruuta
Tallenna