Browse Source

Naming conventions; Add variables

factor2
Mihai Uscat 5 years ago
parent
commit
3c25a4c08c

+ 37
- 1
css/_variables.scss View File

164
  */
164
  */
165
 $welcomePageDescriptionColor: #fff;
165
 $welcomePageDescriptionColor: #fff;
166
 $welcomePageFontFamily: inherit;
166
 $welcomePageFontFamily: inherit;
167
-$welcomePageHeaderBackground: linear-gradient(-90deg, #1251AE 0%, #0074FF 50%, #1251AE 100%);
167
+$welcomePageBackground: linear-gradient(-90deg, #1251AE 0%, #0074FF 50%, #1251AE 100%);
168
 $welcomePageTitleColor: #fff;
168
 $welcomePageTitleColor: #fff;
169
 
169
 
170
+$welcomePageHeaderBackground: none;
171
+$welcomePageHeaderBackgroundSmall: none;
172
+$welcomePageHeaderBackgroundPosition: none;
173
+$welcomePageHeaderBackgroundRepeat: none;
174
+$welcomePageHeaderBackgroundSize: none;
175
+$welcomePageHeaderPaddingBottom: 0px;
176
+
177
+$welcomePageHeaderTextMarginTop: 35px;
178
+$welcomePageHeaderTextMarginBottom: 35px;
179
+
180
+$welcomePageHeaderTextTitleMarginBottom: 16px;
181
+
182
+$welcomePageHeaderTextDescriptionDisplay: inherit;
183
+
184
+$welcomePageEnterRoomWidth: 680px;
185
+$welcomePageEnterRoomPadding: 25px 30px;
186
+$welcomePageEnterRoomBorderRadius: 0px;
187
+
188
+$welcomePageEnterRoomInputContainerPadding: 0 8px 5px 0px;
189
+$welcomePageEnterRoomInputContainerBorderWidth: 0px 0px 2px 0px;
190
+$welcomePageEnterRoomInputContainerBorderStyle: solid;
191
+$welcomePageEnterRoomInputContainerBorderImage: linear-gradient(to right, #dee1e6, #fff) 1;
192
+
193
+$welcomePageEnterRoomTitleDisplay: inherit;
194
+
195
+$welcomePageTabContainerDisplay: flex;
196
+$welcomePageTabContentDisplay: inherit;
197
+$welcomePageTabButtonsDisplay: flex;
198
+$welcomePageTabDisplay: inherit;
199
+
200
+$welcomePageButtonWidth: 51px;
201
+$welcomePageButtonHeight: 35px;
202
+$welcomePageButtonFontWeight: inherit;
203
+$welcomePageButtonBorderRadius: 4px;
204
+$welcomePageButtonLineHeight: 35px;
205
+
170
 /**
206
 /**
171
  * Deep-linking page variables.
207
  * Deep-linking page variables.
172
  */
208
  */

+ 27
- 17
css/_welcome_page.scss View File

4
 }
4
 }
5
 
5
 
6
 .welcome {
6
 .welcome {
7
-    background-image: $welcomePageHeaderBackground;
7
+    background-image: $welcomePageBackground;
8
     display: flex;
8
     display: flex;
9
     flex-direction: column;
9
     flex-direction: column;
10
     font-family: $welcomePageFontFamily;
10
     font-family: $welcomePageFontFamily;
13
     position: relative;
13
     position: relative;
14
 
14
 
15
     .header {
15
     .header {
16
+        background-image: $welcomePageHeaderBackground;
17
+        background-position: $welcomePageHeaderBackgroundPosition;
18
+        background-repeat: $welcomePageHeaderBackgroundRepeat;
19
+        background-size: $welcomePageHeaderBackgroundSize;
20
+        padding-bottom: $welcomePageHeaderPaddingBottom;
16
         align-items: center;
21
         align-items: center;
17
         display: flex;
22
         display: flex;
18
         flex-direction: column;
23
         flex-direction: column;
24
         .header-text {
29
         .header-text {
25
             display: flex;
30
             display: flex;
26
             flex-direction: column;
31
             flex-direction: column;
27
-            margin-top: $watermarkHeight + 35;
28
-            margin-bottom: 35px;
32
+            margin-top: $watermarkHeight + $welcomePageHeaderTextMarginTop;
33
+            margin-bottom: $welcomePageHeaderTextMarginBottom;
29
             max-width: calc(100% - 40px);
34
             max-width: calc(100% - 40px);
30
             width: 650px;
35
             width: 650px;
31
             z-index: $zindex2;
36
             z-index: $zindex2;
36
             font-size: 2.5rem;
41
             font-size: 2.5rem;
37
             font-weight: 500;
42
             font-weight: 500;
38
             line-height: 1.18;
43
             line-height: 1.18;
39
-            margin-bottom: 16px;
44
+            margin-bottom: $welcomePageHeaderTextTitleMarginBottom;
40
         }
45
         }
41
 
46
 
42
         .header-text-description {
47
         .header-text-description {
48
+            display: $welcomePageHeaderTextDescriptionDisplay;
43
             color: $welcomePageDescriptionColor;
49
             color: $welcomePageDescriptionColor;
44
             font-size: 1rem;
50
             font-size: 1rem;
45
             font-weight: 400;
51
             font-weight: 400;
51
             display: flex;
57
             display: flex;
52
             align-items: center;
58
             align-items: center;
53
             max-width: calc(100% - 40px);
59
             max-width: calc(100% - 40px);
54
-            width: 680px;
60
+            width: $welcomePageEnterRoomWidth;
55
             z-index: $zindex2;
61
             z-index: $zindex2;
56
             background-color: #fff;
62
             background-color: #fff;
57
-            padding: 25px 30px;
63
+            padding: $welcomePageEnterRoomPadding;
64
+            border-radius: $welcomePageEnterRoomBorderRadius;
58
 
65
 
59
             .enter-room-input-container {
66
             .enter-room-input-container {
60
                 width: 100%;
67
                 width: 100%;
61
-                padding-right: 8px;
62
-                padding-bottom: 5px;
68
+                padding: $welcomePageEnterRoomInputContainerPadding;
63
                 text-align: left;
69
                 text-align: left;
64
                 color: #253858;
70
                 color: #253858;
65
                 height: fit-content;
71
                 height: fit-content;
66
-                border-width: 0px 0px 2px 0px;
67
-                border-style: solid;
68
-                border-image: linear-gradient(to right, #dee1e6, #fff) 1;
72
+                border-width: $welcomePageEnterRoomInputContainerBorderWidth;
73
+                border-style: $welcomePageEnterRoomInputContainerBorderStyle;
74
+                border-image: $welcomePageEnterRoomInputContainerBorderImage;
69
 
75
 
70
                 .enter-room-title {
76
                 .enter-room-title {
77
+                    display: $welcomePageEnterRoomTitleDisplay;
71
                     font-size: 18px;
78
                     font-size: 18px;
72
                     font-weight: bold;
79
                     font-weight: bold;
73
                     padding-bottom: 5px;
80
                     padding-bottom: 5px;
94
             min-height: 354px;
101
             min-height: 354px;
95
             width: 710px;
102
             width: 710px;
96
             background: #75A7E7;
103
             background: #75A7E7;
97
-            display: flex;
104
+            display: $welcomePageTabContainerDisplay;
98
             flex-direction: column;
105
             flex-direction: column;
99
 
106
 
100
             .tab-content{
107
             .tab-content{
108
+                display: $welcomePageTabContentDisplay;
101
                 margin: 5px 0px;
109
                 margin: 5px 0px;
102
                 overflow: hidden;
110
                 overflow: hidden;
103
                 flex-grow: 1;
111
                 flex-grow: 1;
111
             .tab-buttons {
119
             .tab-buttons {
112
                 font-size: 18px;
120
                 font-size: 18px;
113
                 color: #FFFFFF;
121
                 color: #FFFFFF;
114
-                display: flex;
122
+                display: $welcomePageTabButtonsDisplay;
115
                 flex-grow: 0;
123
                 flex-grow: 0;
116
                 flex-direction: row;
124
                 flex-direction: row;
117
                 min-height: 54px;
125
                 min-height: 54px;
118
                 width: 100%;
126
                 width: 100%;
119
 
127
 
120
                 .tab {
128
                 .tab {
129
+                    display: $welcomePageTabDisplay;
121
                     text-align: center;
130
                     text-align: center;
122
                     background: rgba(9,30,66,0.37);
131
                     background: rgba(9,30,66,0.37);
123
                     height: 55px;
132
                     height: 55px;
138
     }
147
     }
139
 
148
 
140
     .welcome-page-button {
149
     .welcome-page-button {
141
-        width: 51px;
142
-        height: 35px;
150
+        width: $welcomePageButtonWidth;
151
+        height: $welcomePageButtonHeight;
143
         font-size: 14px;
152
         font-size: 14px;
153
+        font-weight: $welcomePageButtonFontWeight;
144
         background: #0074E0;
154
         background: #0074E0;
145
-        border-radius: 4px;
155
+        border-radius: $welcomePageButtonBorderRadius;
146
         color: #FFFFFF;
156
         color: #FFFFFF;
147
         text-align: center;
157
         text-align: center;
148
         vertical-align: middle;
158
         vertical-align: middle;
149
-        line-height: 35px;
159
+        line-height: $welcomePageButtonLineHeight;
150
         cursor: pointer;
160
         cursor: pointer;
151
     }
161
     }
152
 
162
 

css/_settings_toolbar.scss → css/_welcome_page_settings_toolbar.scss View File


+ 1
- 1
interface_config.js View File

27
     SHOW_DEEP_LINKING_IMAGE: false,
27
     SHOW_DEEP_LINKING_IMAGE: false,
28
     GENERATE_ROOMNAMES_ON_WELCOME_PAGE: true,
28
     GENERATE_ROOMNAMES_ON_WELCOME_PAGE: true,
29
     DISPLAY_WELCOME_PAGE_CONTENT: true,
29
     DISPLAY_WELCOME_PAGE_CONTENT: true,
30
-    DISPLAY_WELCOME_PAGE_TOOLBAR_CONTENT: false,
30
+    DISPLAY_WELCOME_PAGE_TOOLBAR_ADDITIONAL_CONTENT: false,
31
     APP_NAME: 'Jitsi Meet',
31
     APP_NAME: 'Jitsi Meet',
32
     NATIVE_APP_NAME: 'Jitsi Meet',
32
     NATIVE_APP_NAME: 'Jitsi Meet',
33
     PROVIDER_NAME: 'Jitsi',
33
     PROVIDER_NAME: 'Jitsi',

+ 1
- 1
react/features/welcome/components/WelcomePage.web.js View File

333
      * @returns {boolean}
333
      * @returns {boolean}
334
      */
334
      */
335
     _shouldShowAdditionalToolbarContent() {
335
     _shouldShowAdditionalToolbarContent() {
336
-        return interfaceConfig.DISPLAY_WELCOME_PAGE_TOOLBAR_CONTENT
336
+        return interfaceConfig.DISPLAY_WELCOME_PAGE_TOOLBAR_ADDITIONAL_CONTENT
337
             && this._additionalToolbarContentTemplate
337
             && this._additionalToolbarContentTemplate
338
             && this._additionalToolbarContentTemplate.content
338
             && this._additionalToolbarContentTemplate.content
339
             && this._additionalToolbarContentTemplate.innerHTML.trim();
339
             && this._additionalToolbarContentTemplate.innerHTML.trim();

Loading…
Cancel
Save