Browse Source

style(general) Replaced fixed values for font-size and line-height with rem (#15917)

* style(general) Replaced font-size fixed units with rem

* style(general) Replaced font-size fixed units with rem in the tokens

* style(general) Replaced line-height fixed units with rem
j25
raduanastase8x8 6 months ago
parent
commit
6fa94b0bb4
No account linked to committer's email address

+ 2
- 2
css/404.scss View File

4
     text-align: center;
4
     text-align: center;
5
 
5
 
6
     h2 {
6
     h2 {
7
-        font-size: 48px;
7
+        font-size: 3rem;
8
         color : #f2f2f2;
8
         color : #f2f2f2;
9
     }
9
     }
10
 
10
 
11
     &__message {
11
     &__message {
12
-        font-size: 24px;
12
+        font-size: 1.5rem;
13
         margin-top: 20px;
13
         margin-top: 20px;
14
     }
14
     }
15
 }
15
 }

+ 2
- 2
css/_base.scss View File

28
     margin: 0px;
28
     margin: 0px;
29
     width: 100%;
29
     width: 100%;
30
     height: 100%;
30
     height: 100%;
31
-    font-size: 12px;
31
+    font-size: 0.75rem;
32
     font-weight: 400;
32
     font-weight: 400;
33
     overflow: hidden;
33
     overflow: hidden;
34
     color: #F1F1F1;
34
     color: #F1F1F1;
139
     position: absolute;
139
     position: absolute;
140
     left: 25;
140
     left: 25;
141
     bottom: 7;
141
     bottom: 7;
142
-    font-size: 11pt;
142
+    font-size: 0.875rem;
143
     color: rgba(255,255,255,.50);
143
     color: rgba(255,255,255,.50);
144
     text-decoration: none;
144
     text-decoration: none;
145
     z-index: $watermarkZ;
145
     z-index: $watermarkZ;

+ 9
- 9
css/_chat.scss View File

11
 #chatconversation {
11
 #chatconversation {
12
     box-sizing: border-box;
12
     box-sizing: border-box;
13
     flex: 1;
13
     flex: 1;
14
-    font-size: 10pt;
14
+    font-size: 0.75rem;
15
     height: calc(100% - 10px);
15
     height: calc(100% - 10px);
16
-    line-height: 20px;
16
+    line-height: 1.25rem;
17
     overflow: auto;
17
     overflow: auto;
18
     padding: 16px;
18
     padding: 16px;
19
     text-align: left;
19
     text-align: left;
72
 #nickname {
72
 #nickname {
73
     text-align: center;
73
     text-align: center;
74
     color: #9d9d9d;
74
     color: #9d9d9d;
75
-    font-size: 16px;
75
+    font-size: 1rem;
76
     margin: auto 0;
76
     margin: auto 0;
77
     padding: 0 16px;
77
     padding: 0 16px;
78
 
78
 
86
     }
86
     }
87
 
87
 
88
     label {
88
     label {
89
-        line-height: 24px;
89
+        line-height: 1.5rem;
90
     }
90
     }
91
 }
91
 }
92
 
92
 
98
     }
98
     }
99
 
99
 
100
     .chatmessage .usermessage {
100
     .chatmessage .usermessage {
101
-        font-size: 16px;
101
+        font-size: 1rem;
102
     }
102
     }
103
 }
103
 }
104
 
104
 
124
 }
124
 }
125
 
125
 
126
 #smileys {
126
 #smileys {
127
-    font-size: 20pt;
127
+    font-size: 1.625rem;
128
     margin: auto;
128
     margin: auto;
129
     cursor: pointer;
129
     cursor: pointer;
130
 }
130
 }
168
 }
168
 }
169
 
169
 
170
 #smileysContainer .smiley {
170
 #smileysContainer .smiley {
171
-    font-size: 20pt;
171
+    font-size: 1.625rem;
172
 }
172
 }
173
 
173
 
174
 .smileyContainer {
174
 .smileyContainer {
219
         box-sizing: border-box;
219
         box-sizing: border-box;
220
         color: #fff;
220
         color: #fff;
221
         font-weight: 600;
221
         font-weight: 600;
222
-        font-size: 24px;
223
-        line-height: 32px;
222
+        font-size: 1.5rem;
223
+        line-height: 2rem;
224
 
224
 
225
         .jitsi-icon {
225
         .jitsi-icon {
226
             cursor: pointer;
226
             cursor: pointer;

+ 6
- 6
css/_chrome-extension-banner.scss View File

34
     }
34
     }
35
 
35
 
36
     &__checkbox-label {
36
     &__checkbox-label {
37
-        font-size: 14px;
38
-        line-height: 18px;
37
+        font-size: 0.875rem;
38
+        line-height: 1.125rem;
39
         display: flex;
39
         display: flex;
40
         align-items: center;
40
         align-items: center;
41
         letter-spacing: -0.006em;
41
         letter-spacing: -0.006em;
51
     }
51
     }
52
 
52
 
53
     &__text-container {
53
     &__text-container {
54
-      font-size: 14px;
55
-      line-height: 18px;
54
+      font-size: 0.875rem;
55
+      line-height: 1.125rem;
56
       display: flex;
56
       display: flex;
57
       align-items: center;
57
       align-items: center;
58
       letter-spacing: -0.006em;
58
       letter-spacing: -0.006em;
84
 
84
 
85
     &__button-text {
85
     &__button-text {
86
       font-weight: 600;
86
       font-weight: 600;
87
-      font-size: 14px;
88
-      line-height: 40px;
87
+      font-size: 0.875rem;
88
+      line-height: 2.5rem;
89
       text-align: center;
89
       text-align: center;
90
       letter-spacing: -0.006em;
90
       letter-spacing: -0.006em;
91
       color: #FFFFFF;
91
       color: #FFFFFF;

+ 3
- 3
css/_inlay.scss View File

10
         margin: 17px 0;
10
         margin: 17px 0;
11
         padding-bottom: 17px;
11
         padding-bottom: 17px;
12
         color: #ffffff;
12
         color: #ffffff;
13
-        font-size: 21px;
13
+        font-size: 1.25rem;
14
         letter-spacing: 0.3px;
14
         letter-spacing: 0.3px;
15
         border-bottom: 1px solid lighten(#FFFFFF, 10%);
15
         border-bottom: 1px solid lighten(#FFFFFF, 10%);
16
     }
16
     }
19
         color: #ffffff;
19
         color: #ffffff;
20
         display: block;
20
         display: block;
21
         margin-top: 22px;
21
         margin-top: 22px;
22
-        font-size: 16px;
22
+        font-size: 1rem;
23
     }
23
     }
24
 
24
 
25
     &__icon {
25
     &__icon {
26
         margin: 0 10px;
26
         margin: 0 10px;
27
-        font-size: 50px;
27
+        font-size: 3.125rem;
28
     }
28
     }
29
 
29
 
30
 }
30
 }

+ 10
- 10
css/_meetings_list.scss View File

1
 .meetings-list {
1
 .meetings-list {
2
-    font-size: 14px;
2
+    font-size: 0.875rem;
3
     color: #253858;
3
     color: #253858;
4
-    line-height: 20px;
4
+    line-height: 1.25rem;
5
     text-align: left;
5
     text-align: left;
6
     text-overflow: ellipsis;
6
     text-overflow: ellipsis;
7
     display: flex;
7
     display: flex;
20
 
20
 
21
         .description {
21
         .description {
22
             color: #2f3237;
22
             color: #2f3237;
23
-            font-size: 14px;
24
-            line-height: 18px;
23
+            font-size: 0.875rem;
24
+            line-height: 1.125rem;
25
             margin-bottom: 16px;
25
             margin-bottom: 16px;
26
             max-width: 436px;
26
             max-width: 436px;
27
         }
27
         }
37
         color: #0163FF;
37
         color: #0163FF;
38
         cursor: pointer;
38
         cursor: pointer;
39
         display: flex;
39
         display: flex;
40
-        font-size: 14px;
41
-        line-height: 18px;
40
+        font-size: 0.875rem;
41
+        line-height: 1.125rem;
42
         margin: 24px 0 32px 0;
42
         margin: 24px 0 32px 0;
43
     }
43
     }
44
 
44
 
101
         }
101
         }
102
 
102
 
103
         .title {
103
         .title {
104
-            font-size: 12px;
104
+            font-size: 0.75rem;
105
             font-weight: 600;
105
             font-weight: 600;
106
-            line-height: 16px;
106
+            line-height: 1rem;
107
             margin-bottom: 4px;
107
             margin-bottom: 4px;
108
         }
108
         }
109
 
109
 
110
         .subtitle {
110
         .subtitle {
111
             color: #5E6D7A;
111
             color: #5E6D7A;
112
             font-weight: normal;
112
             font-weight: normal;
113
-            font-size: 12px;
114
-            line-height: 16px;
113
+            font-size: 0.75rem;
114
+            line-height: 1rem;
115
         }
115
         }
116
 
116
 
117
 
117
 

+ 4
- 4
css/_navigate_section_list.scss View File

1
 %navigate-section-list-text {
1
 %navigate-section-list-text {
2
     width: 100%;
2
     width: 100%;
3
-    font-size: 14px;
4
-    line-height: 20px;
3
+    font-size: 0.875rem;
4
+    line-height: 1.25rem;
5
     color: $welcomePageTitleColor;
5
     color: $welcomePageTitleColor;
6
     text-align: left;
6
     text-align: left;
7
     font-family: 'open_sanslight', Helvetica, sans-serif;
7
     font-family: 'open_sanslight', Helvetica, sans-serif;
52
 .navigate-section-tile-body {
52
 .navigate-section-tile-body {
53
     @extend %navigate-section-list-tile-text;
53
     @extend %navigate-section-list-tile-text;
54
     font-weight: normal;
54
     font-weight: normal;
55
-    line-height: 24px;
55
+    line-height: 1.5rem;
56
 }
56
 }
57
 .navigate-section-list-tile-info {
57
 .navigate-section-list-tile-info {
58
     flex: 1;
58
     flex: 1;
61
 .navigate-section-tile-title {
61
 .navigate-section-tile-title {
62
     @extend %navigate-section-list-tile-text;
62
     @extend %navigate-section-list-tile-text;
63
     font-weight: bold;
63
     font-weight: bold;
64
-    line-height: 24px;
64
+    line-height: 1.5rem;
65
 }
65
 }
66
 .navigate-section-section-header {
66
 .navigate-section-section-header {
67
     @extend %navigate-section-list-text;
67
     @extend %navigate-section-list-text;

+ 2
- 2
css/_policy.scss View File

8
 
8
 
9
     &__text {
9
     &__text {
10
         text-align: center;
10
         text-align: center;
11
-        font-size: 14px;
12
-        line-height: 21px;
11
+        font-size: 0.875rem;
12
+        line-height: 1.25rem;
13
         font-weight: 300;
13
         font-weight: 300;
14
     }
14
     }
15
 }
15
 }

+ 6
- 6
css/_reactions-menu.scss View File

55
 		span.emoji {
55
 		span.emoji {
56
 			width: 40px;
56
 			width: 40px;
57
 			height: 40px;
57
 			height: 40px;
58
-			font-size: 22px;
58
+			font-size: 1.375rem;
59
 			display: flex;
59
 			display: flex;
60
 			align-items: center;
60
 			align-items: center;
61
 			justify-content: center;
61
 			justify-content: center;
63
 
63
 
64
 			@for $i from 1 through 12 {
64
 			@for $i from 1 through 12 {
65
 				&.increase-#{$i}{
65
 				&.increase-#{$i}{
66
-					font-size: calc(20px + #{$i}px);
66
+					font-size: calc(1.25rem + #{$i}px);
67
 				}
67
 				}
68
 			}
68
 			}
69
 		}
69
 		}
96
 			span.text {
96
 			span.text {
97
 				font-style: normal;
97
 				font-style: normal;
98
 				font-weight: 600;
98
 				font-weight: 600;
99
-				font-size: 14px;
100
-				line-height: 24px;
99
+				font-size: 0.875rem;
100
+				line-height: 1.5rem;
101
 				margin-left: 8px;
101
 				margin-left: 8px;
102
 			}
102
 			}
103
 		}
103
 		}
132
 
132
 
133
 .reaction-emoji {
133
 .reaction-emoji {
134
 	position: absolute;
134
 	position: absolute;
135
-	font-size: 24px;
136
-	line-height: 32px;
135
+	font-size: 1.5rem;
136
+	line-height: 2rem;
137
 	width: 32px;
137
 	width: 32px;
138
 	height: 32px;
138
 	height: 32px;
139
 	top: 0;
139
 	top: 0;

+ 6
- 6
css/_recording.scss View File

12
         .recording-title {
12
         .recording-title {
13
             display: inline-flex;
13
             display: inline-flex;
14
             align-items: center;
14
             align-items: center;
15
-            font-size: 14px;
15
+            font-size: 0.875rem;
16
             margin-left: 16px;
16
             margin-left: 16px;
17
             max-width: 70%;
17
             max-width: 70%;
18
 
18
 
35
     .local-recording-warning {
35
     .local-recording-warning {
36
         margin-top: 8px;
36
         margin-top: 8px;
37
         display: block;
37
         display: block;
38
-        font-size: 14px;
39
-        line-height: 20px;
38
+        font-size: 0.875rem;
39
+        line-height: 1.25rem;
40
         padding: 8px 16px;
40
         padding: 8px 16px;
41
 
41
 
42
         &.text {
42
         &.text {
126
 
126
 
127
     .recording-info-title {
127
     .recording-info-title {
128
         display: inline-flex;
128
         display: inline-flex;
129
-        font-size: 14px;
129
+        font-size: 0.875rem;
130
         width: 290px
130
         width: 290px
131
     }
131
     }
132
 
132
 
150
     /**
150
     /**
151
      * Set font-size to be consistent with Atlaskit FieldText.
151
      * Set font-size to be consistent with Atlaskit FieldText.
152
      */
152
      */
153
-    font-size: 14px;
153
+    font-size: 0.875rem;
154
 
154
 
155
     .broadcast-dropdown {
155
     .broadcast-dropdown {
156
         text-align: left;
156
         text-align: left;
194
 
194
 
195
     .warning-text {
195
     .warning-text {
196
         color:#FFD740;
196
         color:#FFD740;
197
-        font-size: 12px;
197
+        font-size: 0.75rem;
198
     }
198
     }
199
 }
199
 }

+ 6
- 6
css/_redirect_page.scss View File

2
     width: 30%;
2
     width: 30%;
3
     margin: 20% auto;
3
     margin: 20% auto;
4
     text-align: center;
4
     text-align: center;
5
-    font-size: 24px;
5
+    font-size: 1.5rem;
6
 
6
 
7
     .thanks-msg {
7
     .thanks-msg {
8
         border-bottom: 1px solid #FFFFFF;
8
         border-bottom: 1px solid #FFFFFF;
10
         padding-right: 30px;
10
         padding-right: 30px;
11
         p {
11
         p {
12
             margin: 30px auto;
12
             margin: 30px auto;
13
-            font-size: 24px;
14
-            line-height: 24px;
13
+            font-size: 1.5rem;
14
+            line-height: 1.5rem;
15
         }
15
         }
16
     }
16
     }
17
     .hint-msg {
17
     .hint-msg {
18
         p {
18
         p {
19
             margin: 26px auto;
19
             margin: 26px auto;
20
             font-weight: 600;
20
             font-weight: 600;
21
-            font-size: 16px;
22
-            line-height: 18px;
21
+            font-size: 1rem;
22
+            line-height: 1.125rem;
23
             .hint-msg__holder{
23
             .hint-msg__holder{
24
                 font-weight: 200;
24
                 font-weight: 200;
25
             }
25
             }
33
     }
33
     }
34
     .forbidden-msg {
34
     .forbidden-msg {
35
         p {
35
         p {
36
-            font-size: 16px;
36
+            font-size: 1rem;
37
             margin-top: 15px;
37
             margin-top: 15px;
38
         }
38
         }
39
     }
39
     }

+ 8
- 8
css/_reset.scss View File

70
 body {
70
 body {
71
   color: #333;
71
   color: #333;
72
   font-family: Arial, sans-serif;
72
   font-family: Arial, sans-serif;
73
-  font-size: 14px;
73
+  font-size: 0.875rem;
74
   line-height: 1.42857142857143;
74
   line-height: 1.42857142857143;
75
 }
75
 }
76
 /* International Font Stacks*/
76
 /* International Font Stacks*/
113
 /* Headings: desired line height in px / font size = unitless line height */
113
 /* Headings: desired line height in px / font size = unitless line height */
114
 h1 {
114
 h1 {
115
   color: #333;
115
   color: #333;
116
-  font-size: 32px;
116
+  font-size: 2rem;
117
   font-weight: normal;
117
   font-weight: normal;
118
   line-height: 1.25;
118
   line-height: 1.25;
119
   text-transform: none;
119
   text-transform: none;
121
 }
121
 }
122
 h2 {
122
 h2 {
123
   color: #333;
123
   color: #333;
124
-  font-size: 24px;
124
+  font-size: 1.5rem;
125
   font-weight: normal;
125
   font-weight: normal;
126
   line-height: 1.25;
126
   line-height: 1.25;
127
   text-transform: none;
127
   text-transform: none;
129
 }
129
 }
130
 h3 {
130
 h3 {
131
   color: #333;
131
   color: #333;
132
-  font-size: 20px;
132
+  font-size: 1.25rem;
133
   font-weight: normal;
133
   font-weight: normal;
134
   line-height: 1.5;
134
   line-height: 1.5;
135
   text-transform: none;
135
   text-transform: none;
136
   margin: 30px 0 0 0;
136
   margin: 30px 0 0 0;
137
 }
137
 }
138
 h4 {
138
 h4 {
139
-  font-size: 16px;
139
+  font-size: 1rem;
140
   font-weight: bold;
140
   font-weight: bold;
141
   line-height: 1.25;
141
   line-height: 1.25;
142
   text-transform: none;
142
   text-transform: none;
144
 }
144
 }
145
 h5 {
145
 h5 {
146
   color: #333;
146
   color: #333;
147
-  font-size: 14px;
147
+  font-size: 0.875rem;
148
   font-weight: bold;
148
   font-weight: bold;
149
   line-height: 1.42857143;
149
   line-height: 1.42857143;
150
   text-transform: none;
150
   text-transform: none;
152
 }
152
 }
153
 h6 {
153
 h6 {
154
   color: #707070;
154
   color: #707070;
155
-  font-size: 12px;
155
+  font-size: 0.75rem;
156
   font-weight: bold;
156
   font-weight: bold;
157
   line-height: 1.66666667;
157
   line-height: 1.66666667;
158
   text-transform: uppercase;
158
   text-transform: uppercase;
179
 /* Other typographical elements */
179
 /* Other typographical elements */
180
 small {
180
 small {
181
   color: #707070;
181
   color: #707070;
182
-  font-size: 12px;
182
+  font-size: 0.75rem;
183
   line-height: 1.33333333333333;
183
   line-height: 1.33333333333333;
184
 }
184
 }
185
 code,
185
 code,

+ 1
- 1
css/_responsive.scss View File

4
 
4
 
5
         #enter_room {
5
         #enter_room {
6
             .welcome-page-button {
6
             .welcome-page-button {
7
-                font-size: 16px;
7
+                font-size: 1rem;
8
                 left: 0;
8
                 left: 0;
9
                 text-align: center;
9
                 text-align: center;
10
                 width: 100%;
10
                 width: 100%;

+ 4
- 4
css/_toolbars.scss View File

9
     // Do not inherit the font-family from the toolbar button, because it's an
9
     // Do not inherit the font-family from the toolbar button, because it's an
10
     // icon style.
10
     // icon style.
11
     font-family: $baseFontFamily;
11
     font-family: $baseFontFamily;
12
-    font-size: 9px;
12
+    font-size: 0.5rem;
13
     font-weight: 700;
13
     font-weight: 700;
14
-    line-height: 13px;
14
+    line-height: 0.75rem;
15
     min-width: 13px;
15
     min-width: 13px;
16
     overflow: hidden;
16
     overflow: hidden;
17
     text-align: center;
17
     text-align: center;
69
 
69
 
70
     .badge-round {
70
     .badge-round {
71
         bottom: -5px;
71
         bottom: -5px;
72
-        font-size: 12px;
73
-        line-height: 20px;
72
+        font-size: 0.75rem;
73
+        line-height: 1.25rem;
74
         min-width: 20px;
74
         min-width: 20px;
75
         pointer-events: none;
75
         pointer-events: none;
76
         position: absolute;
76
         position: absolute;

+ 4
- 4
css/_variables.scss View File

50
 $primaryUnsupportedBrowserButtonBgColor: #0052CC;
50
 $primaryUnsupportedBrowserButtonBgColor: #0052CC;
51
 $unsupportedBrowserButtonBgColor: rgba(9, 30, 66, 0.04);
51
 $unsupportedBrowserButtonBgColor: rgba(9, 30, 66, 0.04);
52
 $unsupportedBrowserTextColor: #4a4a4a;
52
 $unsupportedBrowserTextColor: #4a4a4a;
53
-$unsupportedBrowserTextSmallFontSize: 17px;
53
+$unsupportedBrowserTextSmallFontSize: 1rem;
54
 $unsupportedBrowserTitleColor: #fff;
54
 $unsupportedBrowserTitleColor: #fff;
55
-$unsupportedBrowserTitleFontSize: 24px;
55
+$unsupportedBrowserTitleFontSize: 1.5rem;
56
 $unsupportedDesktopBrowserTextColor: rgba(255, 255, 255, 0.7);
56
 $unsupportedDesktopBrowserTextColor: rgba(255, 255, 255, 0.7);
57
-$unsupportedDesktopBrowserTextFontSize: 21px;
57
+$unsupportedDesktopBrowserTextFontSize: 1.25rem;
58
 
58
 
59
 /**
59
 /**
60
  * The size of the default watermark.
60
  * The size of the default watermark.
89
 $welcomePageHeaderContainerMargin: $welcomePageHeaderContainerMarginTop auto 0;
89
 $welcomePageHeaderContainerMargin: $welcomePageHeaderContainerMarginTop auto 0;
90
 
90
 
91
 $welcomePageHeaderTextTitleMarginBottom: 0;
91
 $welcomePageHeaderTextTitleMarginBottom: 0;
92
-$welcomePageHeaderTextTitleFontSize: 42px;
92
+$welcomePageHeaderTextTitleFontSize: 2.625rem;
93
 $welcomePageHeaderTextTitleFontWeight: normal;
93
 $welcomePageHeaderTextTitleFontWeight: normal;
94
 $welcomePageHeaderTextTitleLineHeight: 50px;
94
 $welcomePageHeaderTextTitleLineHeight: 50px;
95
 $welcomePageHeaderTextTitleOpacity: 1;
95
 $welcomePageHeaderTextTitleOpacity: 1;

+ 3
- 3
css/_videolayout_default.scss View File

160
 }
160
 }
161
 
161
 
162
 #alwaysOnTop .displayname {
162
 #alwaysOnTop .displayname {
163
-    font-size: 15px;
163
+    font-size: 0.875rem;
164
     position: inherit;
164
     position: inherit;
165
     width: 100%;
165
     width: 100%;
166
     left: 0px;
166
     left: 0px;
294
     width: auto;
294
     width: auto;
295
     z-index: $zindex2;
295
     z-index: $zindex2;
296
     font-weight: 600;
296
     font-weight: 600;
297
-    font-size: 14px;
297
+    font-size: 0.875rem;
298
     text-align: center;
298
     text-align: center;
299
     color: #FFF;
299
     color: #FFF;
300
     left: 50%;
300
     left: 50%;
340
 
340
 
341
 .presence-label {
341
 .presence-label {
342
     color: #fff;
342
     color: #fff;
343
-    font-size: 12px;
343
+    font-size: 0.75rem;
344
     font-weight: 100;
344
     font-weight: 100;
345
     left: 0;
345
     left: 0;
346
     margin: 0 auto;
346
     margin: 0 auto;

+ 9
- 9
css/_welcome_page.scss View File

53
 
53
 
54
         .header-text-subtitle {
54
         .header-text-subtitle {
55
             color: #fff;
55
             color: #fff;
56
-            font-size: 20px;
56
+            font-size: 1.25rem;
57
             font-weight: 600;
57
             font-weight: 600;
58
-            line-height: 26px;
58
+            line-height: 1.625rem;
59
             margin: 16px 0 32px 0;
59
             margin: 16px 0 32px 0;
60
             text-align: $welcomePageHeaderTextAlign;
60
             text-align: $welcomePageHeaderTextAlign;
61
 
61
 
64
         .not-allow-title-character-div {
64
         .not-allow-title-character-div {
65
             color: #f03e3e;
65
             color: #f03e3e;
66
             background-color: #fff;
66
             background-color: #fff;
67
-            font-size: 12px;
67
+            font-size: 0.75rem;
68
             font-weight: 600;
68
             font-weight: 600;
69
             margin: 10px 0px 5px 0px;
69
             margin: 10px 0px 5px 0px;
70
             text-align: $welcomePageHeaderTextAlign;
70
             text-align: $welcomePageHeaderTextAlign;
147
                     display: inline-block;
147
                     display: inline-block;
148
                     height: 50px;
148
                     height: 50px;
149
                     width: 100%;
149
                     width: 100%;
150
-                    font-size: 14px;
150
+                    font-size: 0.875rem;
151
                     padding-left: 10px;
151
                     padding-left: 10px;
152
 
152
 
153
                     &.focus-visible {
153
                     &.focus-visible {
172
     }
172
     }
173
 
173
 
174
     .tab-container {
174
     .tab-container {
175
-        font-size: 16px;
175
+        font-size: 1rem;
176
         position: relative;
176
         position: relative;
177
         text-align: left;
177
         text-align: left;
178
         display: $welcomePageTabContainerDisplay;
178
         display: $welcomePageTabContainerDisplay;
191
             background-color: #c7ddff;
191
             background-color: #c7ddff;
192
             border-radius: 6px;
192
             border-radius: 6px;
193
             color: #0163FF;
193
             color: #0163FF;
194
-            font-size: 14px;
195
-            line-height: 18px;
194
+            font-size: 0.875rem;
195
+            line-height: 1.125rem;
196
             margin: 4px;
196
             margin: 4px;
197
             display: $welcomePageTabButtonsDisplay;
197
             display: $welcomePageTabButtonsDisplay;
198
 
198
 
218
 
218
 
219
     .welcome-page-button {
219
     .welcome-page-button {
220
         border: 0;
220
         border: 0;
221
-        font-size: 14px;
221
+        font-size: 0.875rem;
222
         background: $welcomePageButtonBg;
222
         background: $welcomePageButtonBg;
223
         border-radius: 3px;
223
         border-radius: 3px;
224
         color: #FFFFFF;
224
         color: #FFFFFF;
246
 
246
 
247
         * {
247
         * {
248
             cursor: pointer;
248
             cursor: pointer;
249
-            font-size: 32px;
249
+            font-size: 2rem;
250
         }
250
         }
251
 
251
 
252
         .toolbox-icon {
252
         .toolbox-icon {

+ 2
- 2
css/modals/invite/_add-people.scss View File

20
             width: 28px;
20
             width: 28px;
21
 
21
 
22
             i {
22
             i {
23
-                line-height: 28px;
23
+                line-height: 1.75rem;
24
                 margin: auto;
24
                 margin: auto;
25
             }
25
             }
26
         }
26
         }
35
             padding-left: 10px;
35
             padding-left: 10px;
36
 
36
 
37
             i {
37
             i {
38
-                line-height: 20px;
38
+                line-height: 1.25rem;
39
                 margin: auto;
39
                 margin: auto;
40
             }
40
             }
41
         }
41
         }

+ 4
- 4
css/modals/invite/_info.scss View File

1
 .info-dialog {
1
 .info-dialog {
2
     cursor: default;
2
     cursor: default;
3
     display: flex;
3
     display: flex;
4
-    font-size: 14px;
4
+    font-size: 0.875rem;
5
 
5
 
6
     .info-dialog-column {
6
     .info-dialog-column {
7
         margin-right: 10px;
7
         margin-right: 10px;
53
     max-width: 334px;
53
     max-width: 334px;
54
     width: 100%;
54
     width: 100%;
55
     margin-top: 20px;
55
     margin-top: 20px;
56
-    font-size: 12px;
57
-    line-height: 24px;
56
+    font-size: 0.75rem;
57
+    line-height: 1.5rem;
58
     border-collapse: collapse;
58
     border-collapse: collapse;
59
 
59
 
60
     * {
60
     * {
107
     box-sizing: border-box;
107
     box-sizing: border-box;
108
     display: flex;
108
     display: flex;
109
     flex-direction: column;
109
     flex-direction: column;
110
-    font-size: 12px;
110
+    font-size: 0.75rem;
111
     max-height: 100%;
111
     max-height: 100%;
112
     overflow: auto;
112
     overflow: auto;
113
     padding: 15pt;
113
     padding: 15pt;

+ 2
- 2
css/modals/invite/_invite_more.scss View File

1
 .invite-more {
1
 .invite-more {
2
     &-dialog {
2
     &-dialog {
3
         color: #fff;
3
         color: #fff;
4
-        font-size: 15px;
5
-        line-height: 24px;
4
+        font-size: 0.875rem;
5
+        line-height: 1.5rem;
6
 
6
 
7
         &.separator {
7
         &.separator {
8
             margin: 24px 0 24px -20px;
8
             margin: 24px 0 24px -20px;

+ 1
- 1
css/modals/screen-share/_share-screen-warning.scss View File

1
 .share-screen-warn-dialog {
1
 .share-screen-warn-dialog {
2
-    font-size: 14px;
2
+    font-size: 0.875rem;
3
 
3
 
4
     .separator-line {
4
     .separator-line {
5
         margin: 24px 0 24px -20px;
5
         margin: 24px 0 24px -20px;

+ 4
- 4
css/modals/security/_security.scss View File

1
 .security {
1
 .security {
2
     &-dialog {
2
     &-dialog {
3
         color: #fff;
3
         color: #fff;
4
-        font-size: 15px;
5
-        line-height: 24px;
4
+        font-size: 0.875rem;
5
+        line-height: 1.5rem;
6
 
6
 
7
         &.password-section {
7
         &.password-section {
8
             display: flex;
8
             display: flex;
9
             flex-direction: column;
9
             flex-direction: column;
10
 
10
 
11
             .description {
11
             .description {
12
-                font-size: 13px;
12
+                font-size: 0.75rem;
13
             }
13
             }
14
 
14
 
15
             .password {
15
             .password {
24
                     button {
24
                     button {
25
                         cursor: pointer;
25
                         cursor: pointer;
26
                         text-decoration: none;
26
                         text-decoration: none;
27
-                        font-size: 14px;
27
+                        font-size: 0.875rem;
28
                         color: #6FB1EA;
28
                         color: #6FB1EA;
29
                     }
29
                     }
30
 
30
 

+ 8
- 8
css/premeeting/_lobby.scss View File

1
 .lobby-screen {
1
 .lobby-screen {
2
-    font-size: 16px;
2
+    font-size: 1rem;
3
     font-weight: 400;
3
     font-weight: 400;
4
-    line-height: 26px;
4
+    line-height: 1.625rem;
5
 
5
 
6
     &-content {
6
     &-content {
7
         align-items: center;
7
         align-items: center;
43
     flex-direction: column;
43
     flex-direction: column;
44
 
44
 
45
     .description {
45
     .description {
46
-        font-size: 13px;
46
+        font-size: 0.75rem;
47
     }
47
     }
48
 
48
 
49
     .control-row {
49
     .control-row {
53
         margin-top: 15px;
53
         margin-top: 15px;
54
 
54
 
55
         label {
55
         label {
56
-            font-size: 14px;
56
+            font-size: 0.875rem;
57
             font-weight: bold;
57
             font-weight: bold;
58
         }
58
         }
59
     }
59
     }
191
                 .title {
191
                 .title {
192
                     flex: 1;
192
                     flex: 1;
193
                     color: #fff;
193
                     color: #fff;
194
-                    font-size: 20px;
194
+                    font-size: 1.25rem;
195
                     font-weight: 600;
195
                     font-weight: 600;
196
-                    line-height: 28px;
196
+                    line-height: 1.75rem;
197
                     letter-spacing: -1.2%;
197
                     letter-spacing: -1.2%;
198
                 }
198
                 }
199
             }
199
             }
214
     border-radius: 6px;
214
     border-radius: 6px;
215
     box-sizing: border-box;
215
     box-sizing: border-box;
216
     color: white;
216
     color: white;
217
-    font-size: 12px;
218
-    line-height: 16px;
217
+    font-size: 0.75rem;
218
+    line-height: 1rem;
219
     margin-bottom: 16px;
219
     margin-bottom: 16px;
220
     margin-top: -8px;
220
     margin-top: -8px;
221
     padding: 4px;
221
     padding: 4px;

+ 4
- 4
css/premeeting/_premeeting-screens.scss View File

5
         color: #fff;
5
         color: #fff;
6
         cursor: pointer;
6
         cursor: pointer;
7
         display: inline-block;
7
         display: inline-block;
8
-        font-size: 14px;
8
+        font-size: 0.875rem;
9
         font-weight: 600;
9
         font-weight: 600;
10
-        line-height: 24px;
10
+        line-height: 1.5rem;
11
         margin-bottom: 16px;
11
         margin-bottom: 16px;
12
         padding: 7px 16px;
12
         padding: 7px 16px;
13
         position: relative;
13
         position: relative;
26
 
26
 
27
         &.text {
27
         &.text {
28
             width: auto;
28
             width: auto;
29
-            font-size: 13px;
29
+            font-size: 0.75rem;
30
             margin: 0;
30
             margin: 0;
31
             padding: 0;
31
             padding: 0;
32
         }
32
         }
98
         }
98
         }
99
 
99
 
100
         .action-btn {
100
         .action-btn {
101
-            font-size: 16px;
101
+            font-size: 1rem;
102
             margin-bottom: 8px;
102
             margin-bottom: 8px;
103
             padding: 11px 16px;
103
             padding: 11px 16px;
104
         }
104
         }

+ 4
- 4
css/reload_overlay/_reload_overlay.scss View File

1
 .reload_overlay_title {
1
 .reload_overlay_title {
2
     display: block;
2
     display: block;
3
-    font-size: 16px;
4
-    line-height: 20px;
3
+    font-size: 1rem;
4
+    line-height: 1.25rem;
5
 }
5
 }
6
 
6
 
7
 .reload_overlay_text {
7
 .reload_overlay_text {
8
     display: block;
8
     display: block;
9
-    font-size: 12px;
10
-    line-height: 30px;
9
+    font-size: 0.75rem;
10
+    line-height: 1.875rem;
11
 }
11
 }
12
 
12
 
13
 #reloadProgressBar {
13
 #reloadProgressBar {

+ 4
- 4
css/ringing/_ringing.scss View File

34
 
34
 
35
     &__status{
35
     &__status{
36
         margin-top: 15px;
36
         margin-top: 15px;
37
-        font-size: 14px;
38
-        line-height: 20px;
37
+        font-size: 0.875rem;
38
+        line-height: 1.25rem;
39
     }
39
     }
40
 
40
 
41
     &__name {
41
     &__name {
42
-        font-size: 24px;
43
-        line-height: 32px;
42
+        font-size: 1.5rem;
43
+        line-height: 2rem;
44
     }
44
     }
45
 }
45
 }

+ 2
- 2
css/third-party-branding/google.scss View File

8
     cursor: pointer;
8
     cursor: pointer;
9
     display: inline-flex;
9
     display: inline-flex;
10
     font-family: Roboto, arial, sans-serif;
10
     font-family: Roboto, arial, sans-serif;
11
-    font-size: 14px;
11
+    font-size: 0.875rem;
12
     padding: 1px;
12
     padding: 1px;
13
 
13
 
14
     .google-cta {
14
     .google-cta {
17
         /**
17
         /**
18
          * Hack the line height for vertical centering of text.
18
          * Hack the line height for vertical centering of text.
19
          */
19
          */
20
-        line-height: 32px;
20
+        line-height: 2rem;
21
         margin: 0 15px;
21
         margin: 0 15px;
22
     }
22
     }
23
 
23
 

+ 2
- 2
css/third-party-branding/microsoft.scss View File

17
     .microsoft-cta {
17
     .microsoft-cta {
18
         display: inline-block;
18
         display: inline-block;
19
         color: #5E5E5E;
19
         color: #5E5E5E;
20
-        font-size: 15px;
21
-        line-height: 41px;
20
+        font-size: 0.875rem;
21
+        line-height: 2.5rem;
22
     }
22
     }
23
 
23
 
24
     .microsoft-logo {
24
     .microsoft-logo {

+ 26
- 26
react/features/base/ui/Tokens.ts View File

138
     labelBold: 'labelBold01',
138
     labelBold: 'labelBold01',
139
 
139
 
140
     bodyShortRegularSmall: {
140
     bodyShortRegularSmall: {
141
-        fontSize: 10,
142
-        lineHeight: 16,
141
+        fontSize: '0.625rem',
142
+        lineHeight: '1rem',
143
         fontWeight: font.weightRegular,
143
         fontWeight: font.weightRegular,
144
         letterSpacing: 0
144
         letterSpacing: 0
145
     },
145
     },
146
 
146
 
147
     bodyShortRegular: {
147
     bodyShortRegular: {
148
-        fontSize: 14,
149
-        lineHeight: 20,
148
+        fontSize: '0.875rem',
149
+        lineHeight: '1.25rem',
150
         fontWeight: font.weightRegular,
150
         fontWeight: font.weightRegular,
151
         letterSpacing: 0
151
         letterSpacing: 0
152
     },
152
     },
153
 
153
 
154
     bodyShortBold: {
154
     bodyShortBold: {
155
-        fontSize: 14,
156
-        lineHeight: 20,
155
+        fontSize: '0.875rem',
156
+        lineHeight: '1.25rem',
157
         fontWeight: font.weightSemiBold,
157
         fontWeight: font.weightSemiBold,
158
         letterSpacing: 0
158
         letterSpacing: 0
159
     },
159
     },
160
 
160
 
161
     bodyShortRegularLarge: {
161
     bodyShortRegularLarge: {
162
-        fontSize: 16,
163
-        lineHeight: 22,
162
+        fontSize: '1rem',
163
+        lineHeight: '1.375rem',
164
         fontWeight: font.weightRegular,
164
         fontWeight: font.weightRegular,
165
         letterSpacing: 0
165
         letterSpacing: 0
166
     },
166
     },
167
 
167
 
168
     bodyShortBoldLarge: {
168
     bodyShortBoldLarge: {
169
-        fontSize: 16,
170
-        lineHeight: 22,
169
+        fontSize: '1rem',
170
+        lineHeight: '1.375rem',
171
         fontWeight: font.weightSemiBold,
171
         fontWeight: font.weightSemiBold,
172
         letterSpacing: 0
172
         letterSpacing: 0
173
     },
173
     },
174
 
174
 
175
     bodyLongRegular: {
175
     bodyLongRegular: {
176
-        fontSize: 14,
177
-        lineHeight: 24,
176
+        fontSize: '0.875rem',
177
+        lineHeight: '1.5rem',
178
         fontWeight: font.weightRegular,
178
         fontWeight: font.weightRegular,
179
         letterSpacing: 0
179
         letterSpacing: 0
180
     },
180
     },
181
 
181
 
182
     bodyLongRegularLarge: {
182
     bodyLongRegularLarge: {
183
-        fontSize: 16,
184
-        lineHeight: 26,
183
+        fontSize: '1rem',
184
+        lineHeight: '1.625rem',
185
         fontWeight: font.weightRegular,
185
         fontWeight: font.weightRegular,
186
         letterSpacing: 0
186
         letterSpacing: 0
187
     },
187
     },
188
 
188
 
189
     bodyLongBold: {
189
     bodyLongBold: {
190
-        fontSize: 14,
191
-        lineHeight: 24,
190
+        fontSize: '0.875rem',
191
+        lineHeight: '1.5rem',
192
         fontWeight: font.weightSemiBold,
192
         fontWeight: font.weightSemiBold,
193
         letterSpacing: 0
193
         letterSpacing: 0
194
     },
194
     },
195
 
195
 
196
     bodyLongBoldLarge: {
196
     bodyLongBoldLarge: {
197
-        fontSize: 16,
198
-        lineHeight: 26,
197
+        fontSize: '1rem',
198
+        lineHeight: '1.625rem',
199
         fontWeight: font.weightSemiBold,
199
         fontWeight: font.weightSemiBold,
200
         letterSpacing: 0
200
         letterSpacing: 0
201
     },
201
     },
205
     heading2: 'heading02',
205
     heading2: 'heading02',
206
 
206
 
207
     heading3: {
207
     heading3: {
208
-        fontSize: 32,
209
-        lineHeight: 40,
208
+        fontSize: '2rem',
209
+        lineHeight: '2.5rem',
210
         fontWeight: font.weightSemiBold,
210
         fontWeight: font.weightSemiBold,
211
         letterSpacing: 0
211
         letterSpacing: 0
212
     },
212
     },
213
 
213
 
214
     heading4: {
214
     heading4: {
215
-        fontSize: 28,
216
-        lineHeight: 36,
215
+        fontSize: '1.75rem',
216
+        lineHeight: '2.25rem',
217
         fontWeight: font.weightSemiBold,
217
         fontWeight: font.weightSemiBold,
218
         letterSpacing: 0
218
         letterSpacing: 0
219
     },
219
     },
220
 
220
 
221
     heading5: {
221
     heading5: {
222
-        fontSize: 20,
223
-        lineHeight: 28,
222
+        fontSize: '1.25rem',
223
+        lineHeight: '1.75rem',
224
         fontWeight: font.weightSemiBold,
224
         fontWeight: font.weightSemiBold,
225
         letterSpacing: 0
225
         letterSpacing: 0
226
     },
226
     },
227
 
227
 
228
     heading6: {
228
     heading6: {
229
-        fontSize: 16,
230
-        lineHeight: 26,
229
+        fontSize: '1rem',
230
+        lineHeight: '1.625rem',
231
         fontWeight: font.weightSemiBold,
231
         fontWeight: font.weightSemiBold,
232
         letterSpacing: 0
232
         letterSpacing: 0
233
     }
233
     }

+ 4
- 4
static/offline.html View File

21
       align-items: center;
21
       align-items: center;
22
       flex-direction: column;
22
       flex-direction: column;
23
       font-family: Arial, Helvetica, sans-serif;
23
       font-family: Arial, Helvetica, sans-serif;
24
-      font-size: 14px;
24
+      font-size: 0.875rem;
25
       font-weight: 400;
25
       font-weight: 400;
26
-      line-height: 19px;
26
+      line-height: 1.125rem;
27
       margin: auto;
27
       margin: auto;
28
       max-width: 376px;
28
       max-width: 376px;
29
       text-align: center;
29
       text-align: center;
30
     }
30
     }
31
 
31
 
32
     h4 {
32
     h4 {
33
-      font-size: 24px;
33
+      font-size: 1.5rem;
34
       font-weight: 600;
34
       font-weight: 600;
35
-      line-height: 32px;
35
+      line-height: 2rem;
36
       margin: 24px auto;
36
       margin: 24px auto;
37
     }
37
     }
38
 
38
 

Loading…
Cancel
Save