瀏覽代碼

Refactor welcome page in prep for branding (#3230)

* fix(welcome-page): css tweaks in prep for branded welcome page

- Watermarks should no longer depend on toolbar size. The left watermark made
  room for the toolbar when the toolbar was on the left side of the screen, but
  the toolbar has been moved to the bottom. The right watermark...well it'll
  clash with the vertical filmstrip but at least the margins will be consistent
  with the left watermark.
- Apply new font-family so fonts are more likely to be consistent across the
  app. Design likes SF UI and keeps requesting it so use it by default.
- Change sizings of welcome page header to be more responsive. This will help
  the header be scrollable when there is no additional content and the header
  overflows.
- Change colors of the welcome page header and remove background image that
  was in the header. Leave in the dom for the background image in case other
  deployments need to continue showing an image.
- Add a period to the title of the welcome page.
- Move watermarks dom location as it is not part of the header; it's part of the
  whole page.

* [squash] Size and font adjustments. Renaming.
master
virtuacoplenny 6 年之前
父節點
當前提交
50ea847905

+ 4
- 3
css/_base.scss 查看文件

108
 }
108
 }
109
 
109
 
110
 .leftwatermark {
110
 .leftwatermark {
111
-    left: $defaultToolbarSize;
112
-    margin-left: 10px;
111
+    left: 32px;
112
+    top: 32px;
113
     background-image: url($defaultWatermarkLink);
113
     background-image: url($defaultWatermarkLink);
114
     background-position: center left;
114
     background-position: center left;
115
 }
115
 }
116
 
116
 
117
 .rightwatermark {
117
 .rightwatermark {
118
-    right: 15;
118
+    right: 32px;
119
+    top: 32px;
119
     background-position: center right;
120
     background-position: center right;
120
 }
121
 }
121
 
122
 

+ 0
- 1
css/_toolbars.scss 查看文件

146
             background: #B8C7E0;
146
             background: #B8C7E0;
147
             border-radius: 2px;
147
             border-radius: 2px;
148
             color: $newToolbarBackgroundColor;
148
             color: $newToolbarBackgroundColor;
149
-            font-family: -apple-system, BlinkMacSystemFont, $baseFontFamily;
150
             font-size: 11px;
149
             font-size: 11px;
151
             font-weight: bold;
150
             font-weight: bold;
152
             margin-left: 8px;
151
             margin-left: 8px;

+ 3
- 3
css/_variables.scss 查看文件

3
 /**
3
 /**
4
  * Style variables
4
  * Style variables
5
  */
5
  */
6
-$baseFontFamily: 'open_sanslight', 'Helvetica Neue', Helvetica, Arial, sans-serif;
6
+$baseFontFamily: -apple-system, BlinkMacSystemFont, 'open_sanslight', 'Helvetica Neue', Helvetica, Arial, sans-serif;
7
 $hangupColor: #bf2117;
7
 $hangupColor: #bf2117;
8
 $hangupFontSize: 2em;
8
 $hangupFontSize: 2em;
9
 
9
 
144
 /**
144
 /**
145
  * Welcome page variables.
145
  * Welcome page variables.
146
  */
146
  */
147
-$welcomePageDescriptionColor: #fff;
147
+$welcomePageDescriptionColor: #E6EDFA;
148
 $welcomePageFontFamily: inherit;
148
 $welcomePageFontFamily: inherit;
149
-$welcomePageHeaderBackground: linear-gradient(#165ecc, #44A5FF);
149
+$welcomePageHeaderBackground: #1D69D4;
150
 $welcomePageTitleColor: #fff;
150
 $welcomePageTitleColor: #fff;

+ 27
- 44
css/_welcome_page.scss 查看文件

4
 }
4
 }
5
 
5
 
6
 .welcome {
6
 .welcome {
7
+    background-color: $welcomePageHeaderBackground;
8
+    display: flex;
9
+    flex-direction: column;
7
     font-family: $welcomePageFontFamily;
10
     font-family: $welcomePageFontFamily;
8
-    height: 100%;
11
+    justify-content: space-between;
12
+    min-height: 100vh;
9
     position: relative;
13
     position: relative;
10
 
14
 
11
     .header {
15
     .header {
12
         align-items: center;
16
         align-items: center;
13
-        background: $welcomePageHeaderBackground;
14
         display: flex;
17
         display: flex;
15
         flex-direction: column;
18
         flex-direction: column;
19
+        min-height: fit-content;
16
         overflow: hidden;
20
         overflow: hidden;
17
         position: relative;
21
         position: relative;
18
         text-align: center;
22
         text-align: center;
20
         .header-text {
24
         .header-text {
21
             display: flex;
25
             display: flex;
22
             flex-direction: column;
26
             flex-direction: column;
23
-            justify-content: space-around;
24
-            margin-top: 120px;
25
-            margin-bottom: 20px;
27
+            margin-top: $watermarkHeight + 80;
28
+            margin-bottom: 36px;
26
             max-width: calc(100% - 40px);
29
             max-width: calc(100% - 40px);
27
-            min-height: 286px;
28
-            width: 645px;
30
+            width: 650px;
31
+            z-index: $zindex2;
29
         }
32
         }
30
 
33
 
31
         .header-text-title {
34
         .header-text-title {
32
             color: $welcomePageTitleColor;
35
             color: $welcomePageTitleColor;
33
-            font-size: 48px;
34
-            letter-spacing: -1px;
35
-            line-height: 58px;
36
-            margin-bottom: 20px;
36
+            font-size: 2.5rem;
37
+            font-weight: 500;
38
+            letter-spacing: 0;
39
+            line-height: 1.18;
40
+            margin-bottom: 16px;
37
         }
41
         }
38
 
42
 
39
         .header-text-description {
43
         .header-text-description {
40
             color: $welcomePageDescriptionColor;
44
             color: $welcomePageDescriptionColor;
41
-            font-size: 20px;
42
-            line-height: 28px;
43
-            opacity: 0.8;
44
-        }
45
-
46
-        .header-image {
47
-            background-image: url(../images/welcome_page/curves.png);
48
-            background-size: contain;
49
-            height: 209px;
50
-            position: absolute;
51
-            width: 1070px;
45
+            font-size: 1rem;
46
+            font-weight: 400;
47
+            line-height: 24px;
52
         }
48
         }
53
 
49
 
54
-        #new_enter_room {
50
+        #enter_room {
55
             align-items: center;
51
             align-items: center;
56
             display: flex;
52
             display: flex;
57
-            margin-bottom: 20px;
58
             max-width: calc(100% - 40px);
53
             max-width: calc(100% - 40px);
54
+            margin-bottom: 20px;
59
             position: relative;
55
             position: relative;
60
-            z-index: 2;
56
+            width: 650px;
57
+            z-index: $zindex2;
61
 
58
 
62
             .enter-room-input {
59
             .enter-room-input {
63
                 display: inline-block;
60
                 display: inline-block;
64
-                margin-right: 15px;
65
-                width: 350px;
61
+                margin-right: 8px;
62
+                width: 100%;
66
             }
63
             }
67
         }
64
         }
68
     }
65
     }
70
     .welcome-page-button {
67
     .welcome-page-button {
71
         font-size: 16px;
68
         font-size: 16px;
72
     }
69
     }
73
-}
74
-
75
-.welcome.with-content {
76
-    .header {
77
-        min-height: 552px;
78
-    }
79
-    .header-image {
80
-        left: -61px;
81
-        top: 401px;
82
-    }
83
-}
84
 
70
 
85
-.welcome.without-content {
86
-    .header {
71
+    .welcome-watermark {
72
+        position: absolute;
73
+        width: 100%;
87
         height: 100%;
74
         height: 100%;
88
     }
75
     }
89
-    .header-image {
90
-        bottom: -20px;
91
-        left: 0;
92
-    }
93
 }
76
 }

+ 0
- 1
css/modals/video-quality/_video-quality.scss 查看文件

155
 
155
 
156
     .circular-label {
156
     .circular-label {
157
         color: white;
157
         color: white;
158
-        font-family: -apple-system, BlinkMacSystemFont, $baseFontFamily;
159
         font-weight: bold;
158
         font-weight: bold;
160
         margin-left: 8px;
159
         margin-left: 8px;
161
         opacity: 0.8;
160
         opacity: 0.8;

二進制
images/welcome_page/curves.png 查看文件


+ 1
- 1
lang/main.json 查看文件

64
         "roomnameHint": "Enter the name or URL of the room you want to join. You may make a name up, just let the people you are meeting know it so that they enter the same name.",
64
         "roomnameHint": "Enter the name or URL of the room you want to join. You may make a name up, just let the people you are meeting know it so that they enter the same name.",
65
         "sendFeedback": "Send feedback",
65
         "sendFeedback": "Send feedback",
66
         "terms": "Terms",
66
         "terms": "Terms",
67
-        "title": "More secure, more flexible, and completely free video conferencing"
67
+        "title": "More secure, more flexible, and completely free video conferencing."
68
     },
68
     },
69
     "startupoverlay": {
69
     "startupoverlay": {
70
         "policyText": " ",
70
         "policyText": " ",

+ 8
- 6
react/features/welcome/components/WelcomePage.web.js 查看文件

35
 
35
 
36
         /**
36
         /**
37
          * The HTML Element used as the container for additional content. Used
37
          * The HTML Element used as the container for additional content. Used
38
-         * for directly appending the additional content template to the dom
38
+         * for directly appending the additional content template to the dom.
39
          *
39
          *
40
          * @private
40
          * @private
41
          * @type {HTMLTemplateElement|null}
41
          * @type {HTMLTemplateElement|null}
107
                 <div
107
                 <div
108
                     className = { `welcome ${showAdditionalContent
108
                     className = { `welcome ${showAdditionalContent
109
                         ? 'with-content' : 'without-content'}` }
109
                         ? 'with-content' : 'without-content'}` }
110
-                    id = 'new_welcome_page'>
110
+                    id = 'welcome_page'>
111
+                    <div className = 'welcome-watermark'>
112
+                        <Watermarks />
113
+                    </div>
111
                     <div className = 'header'>
114
                     <div className = 'header'>
112
                         <div className = 'header-image' />
115
                         <div className = 'header-image' />
113
-                        <Watermarks />
114
                         <div className = 'header-text'>
116
                         <div className = 'header-text'>
115
                             <h1 className = 'header-text-title'>
117
                             <h1 className = 'header-text-title'>
116
                                 { t('welcomepage.title') }
118
                                 { t('welcomepage.title') }
120
                                     { app: APP_NAME }) }
122
                                     { app: APP_NAME }) }
121
                             </p>
123
                             </p>
122
                         </div>
124
                         </div>
123
-                        <div id = 'new_enter_room'>
125
+                        <div id = 'enter_room'>
124
                             <form
126
                             <form
125
                                 className = 'enter-room-input'
127
                                 className = 'enter-room-input'
126
                                 onSubmit = { this._onFormSubmit }>
128
                                 onSubmit = { this._onFormSubmit }>
156
     }
158
     }
157
 
159
 
158
     /**
160
     /**
159
-     * Prevents submission of the form and delagates join logic.
161
+     * Prevents submission of the form and delegates join logic.
160
      *
162
      *
161
      * @param {Event} event - The HTML Event which details the form submission.
163
      * @param {Event} event - The HTML Event which details the form submission.
162
      * @private
164
      * @private
196
     }
198
     }
197
 
199
 
198
     /**
200
     /**
199
-     * Returns whether or not additional content should be displayed belowed
201
+     * Returns whether or not additional content should be displayed below
200
      * the welcome page's header for entering a room name.
202
      * the welcome page's header for entering a room name.
201
      *
203
      *
202
      * @private
204
      * @private

Loading…
取消
儲存