ZF/jitsi-meet
1
0
Fork 0
mirror of https://gitcode.com/GitHub_Trending/ji/jitsi-meet.git synced 2025-12-30 11:22:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
This commit is contained in:
raduanastase8x8
2025-04-10 16:06:52 +03:00
committed by GitHub
parent 3f3a074e02
commit 6fa94b0bb4
30 changed files with 152 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
css/404.scss
View File

@@ -4,12 +4,12 @@
text-align: center; text-align: center;
h2 { h2 {
font-size: 48px; font-size: 3rem;
color : #f2f2f2; color : #f2f2f2;
} }
&__message { &__message {
font-size: 24px; font-size: 1.5rem;
margin-top: 20px; margin-top: 20px;
} }
} }

4
css/_base.scss
View File

@@ -28,7 +28,7 @@ body {
margin: 0px; margin: 0px;
width: 100%; width: 100%;
height: 100%; height: 100%;
font-size: 12px; font-size: 0.75rem;
font-weight: 400; font-weight: 400;
overflow: hidden; overflow: hidden;
color: #F1F1F1; color: #F1F1F1;
@@ -139,7 +139,7 @@ form {
position: absolute; position: absolute;
left: 25; left: 25;
bottom: 7; bottom: 7;
font-size: 11pt; font-size: 0.875rem;
color: rgba(255,255,255,.50); color: rgba(255,255,255,.50);
text-decoration: none; text-decoration: none;
z-index: $watermarkZ; z-index: $watermarkZ;

18
css/_chat.scss
View File

@@ -11,9 +11,9 @@
#chatconversation { #chatconversation {
box-sizing: border-box; box-sizing: border-box;
flex: 1; flex: 1;
font-size: 10pt; font-size: 0.75rem;
height: calc(100% - 10px); height: calc(100% - 10px);
line-height: 20px; line-height: 1.25rem;
overflow: auto; overflow: auto;
padding: 16px; padding: 16px;
text-align: left; text-align: left;
@@ -72,7 +72,7 @@
#nickname { #nickname {
text-align: center; text-align: center;
color: #9d9d9d; color: #9d9d9d;
font-size: 16px; font-size: 1rem;
margin: auto 0; margin: auto 0;
padding: 0 16px; padding: 0 16px;
@@ -86,7 +86,7 @@
} }
label { label {
line-height: 24px; line-height: 1.5rem;
} }
} }
@@ -98,7 +98,7 @@
} }
.chatmessage .usermessage { .chatmessage .usermessage {
font-size: 16px; font-size: 1rem;
} }
} }
@@ -124,7 +124,7 @@
} }
#smileys { #smileys {
font-size: 20pt; font-size: 1.625rem;
margin: auto; margin: auto;
cursor: pointer; cursor: pointer;
} }
@@ -168,7 +168,7 @@
} }
#smileysContainer .smiley { #smileysContainer .smiley {
font-size: 20pt; font-size: 1.625rem;
} }
.smileyContainer { .smileyContainer {
@@ -219,8 +219,8 @@
box-sizing: border-box; box-sizing: border-box;
color: #fff; color: #fff;
font-weight: 600; font-weight: 600;
font-size: 24px; font-size: 1.5rem;
line-height: 32px; line-height: 2rem;
.jitsi-icon { .jitsi-icon {
cursor: pointer; cursor: pointer;

12
css/_chrome-extension-banner.scss
View File

@@ -34,8 +34,8 @@
} }
&__checkbox-label { &__checkbox-label {
font-size: 14px; font-size: 0.875rem;
line-height: 18px; line-height: 1.125rem;
display: flex; display: flex;
align-items: center; align-items: center;
letter-spacing: -0.006em; letter-spacing: -0.006em;
@@ -51,8 +51,8 @@
} }
&__text-container { &__text-container {
font-size: 14px; font-size: 0.875rem;
line-height: 18px; line-height: 1.125rem;
display: flex; display: flex;
align-items: center; align-items: center;
letter-spacing: -0.006em; letter-spacing: -0.006em;
@@ -84,8 +84,8 @@
&__button-text { &__button-text {
font-weight: 600; font-weight: 600;
font-size: 14px; font-size: 0.875rem;
line-height: 40px; line-height: 2.5rem;
text-align: center; text-align: center;
letter-spacing: -0.006em; letter-spacing: -0.006em;
color: #FFFFFF; color: #FFFFFF;

6
css/_inlay.scss
View File

@@ -10,7 +10,7 @@
margin: 17px 0; margin: 17px 0;
padding-bottom: 17px; padding-bottom: 17px;
color: #ffffff; color: #ffffff;
font-size: 21px; font-size: 1.25rem;
letter-spacing: 0.3px; letter-spacing: 0.3px;
border-bottom: 1px solid lighten(#FFFFFF, 10%); border-bottom: 1px solid lighten(#FFFFFF, 10%);
} }
@@ -19,12 +19,12 @@
color: #ffffff; color: #ffffff;
display: block; display: block;
margin-top: 22px; margin-top: 22px;
font-size: 16px; font-size: 1rem;
} }
&__icon { &__icon {
margin: 0 10px; margin: 0 10px;
font-size: 50px; font-size: 3.125rem;
} }
} }

20
css/_meetings_list.scss
View File

@@ -1,7 +1,7 @@
.meetings-list { .meetings-list {
font-size: 14px; font-size: 0.875rem;
color: #253858; color: #253858;
line-height: 20px; line-height: 1.25rem;
text-align: left; text-align: left;
text-overflow: ellipsis; text-overflow: ellipsis;
display: flex; display: flex;
@@ -20,8 +20,8 @@
.description { .description {
color: #2f3237; color: #2f3237;
font-size: 14px; font-size: 0.875rem;
line-height: 18px; line-height: 1.125rem;
margin-bottom: 16px; margin-bottom: 16px;
max-width: 436px; max-width: 436px;
} }
@@ -37,8 +37,8 @@
color: #0163FF; color: #0163FF;
cursor: pointer; cursor: pointer;
display: flex; display: flex;
font-size: 14px; font-size: 0.875rem;
line-height: 18px; line-height: 1.125rem;
margin: 24px 0 32px 0; margin: 24px 0 32px 0;
} }
@@ -101,17 +101,17 @@
} }
.title { .title {
font-size: 12px; font-size: 0.75rem;
font-weight: 600; font-weight: 600;
line-height: 16px; line-height: 1rem;
margin-bottom: 4px; margin-bottom: 4px;
} }
.subtitle { .subtitle {
color: #5E6D7A; color: #5E6D7A;
font-weight: normal; font-weight: normal;
font-size: 12px; font-size: 0.75rem;
line-height: 16px; line-height: 1rem;
} }

8
css/_navigate_section_list.scss
View File

@@ -1,7 +1,7 @@
%navigate-section-list-text { %navigate-section-list-text {
width: 100%; width: 100%;
font-size: 14px; font-size: 0.875rem;
line-height: 20px; line-height: 1.25rem;
color: $welcomePageTitleColor; color: $welcomePageTitleColor;
text-align: left; text-align: left;
font-family: 'open_sanslight', Helvetica, sans-serif; font-family: 'open_sanslight', Helvetica, sans-serif;
@@ -52,7 +52,7 @@
.navigate-section-tile-body { .navigate-section-tile-body {
@extend %navigate-section-list-tile-text; @extend %navigate-section-list-tile-text;
font-weight: normal; font-weight: normal;
line-height: 24px; line-height: 1.5rem;
} }
.navigate-section-list-tile-info { .navigate-section-list-tile-info {
flex: 1; flex: 1;
@@ -61,7 +61,7 @@
.navigate-section-tile-title { .navigate-section-tile-title {
@extend %navigate-section-list-tile-text; @extend %navigate-section-list-tile-text;
font-weight: bold; font-weight: bold;
line-height: 24px; line-height: 1.5rem;
} }
.navigate-section-section-header { .navigate-section-section-header {
@extend %navigate-section-list-text; @extend %navigate-section-list-text;

4
css/_policy.scss
View File

@@ -8,8 +8,8 @@
&__text { &__text {
text-align: center; text-align: center;
font-size: 14px; font-size: 0.875rem;
line-height: 21px; line-height: 1.25rem;
font-weight: 300; font-weight: 300;
} }
} }

12
css/_reactions-menu.scss
View File

@@ -55,7 +55,7 @@
span.emoji { span.emoji {
width: 40px; width: 40px;
height: 40px; height: 40px;
font-size: 22px; font-size: 1.375rem;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
@@ -63,7 +63,7 @@
@for $i from 1 through 12 { @for $i from 1 through 12 {
&.increase-#{$i}{ &.increase-#{$i}{
font-size: calc(20px + #{$i}px); font-size: calc(1.25rem + #{$i}px);
} }
} }
} }
@@ -96,8 +96,8 @@
span.text { span.text {
font-style: normal; font-style: normal;
font-weight: 600; font-weight: 600;
font-size: 14px; font-size: 0.875rem;
line-height: 24px; line-height: 1.5rem;
margin-left: 8px; margin-left: 8px;
} }
} }
@@ -132,8 +132,8 @@ $reactionCount: 20;
.reaction-emoji { .reaction-emoji {
position: absolute; position: absolute;
font-size: 24px; font-size: 1.5rem;
line-height: 32px; line-height: 2rem;
width: 32px; width: 32px;
height: 32px; height: 32px;
top: 0; top: 0;

12
css/_recording.scss
View File

@@ -12,7 +12,7 @@
.recording-title { .recording-title {
display: inline-flex; display: inline-flex;
align-items: center; align-items: center;
font-size: 14px; font-size: 0.875rem;
margin-left: 16px; margin-left: 16px;
max-width: 70%; max-width: 70%;
@@ -35,8 +35,8 @@
.local-recording-warning { .local-recording-warning {
margin-top: 8px; margin-top: 8px;
display: block; display: block;
font-size: 14px; font-size: 0.875rem;
line-height: 20px; line-height: 1.25rem;
padding: 8px 16px; padding: 8px 16px;
&.text { &.text {
@@ -126,7 +126,7 @@
.recording-info-title { .recording-info-title {
display: inline-flex; display: inline-flex;
font-size: 14px; font-size: 0.875rem;
width: 290px width: 290px
} }
@@ -150,7 +150,7 @@
/** /**
* Set font-size to be consistent with Atlaskit FieldText. * Set font-size to be consistent with Atlaskit FieldText.
*/ */
font-size: 14px; font-size: 0.875rem;
.broadcast-dropdown { .broadcast-dropdown {
text-align: left; text-align: left;
@@ -194,6 +194,6 @@
.warning-text { .warning-text {
color:#FFD740; color:#FFD740;
font-size: 12px; font-size: 0.75rem;
} }
} }

12
css/_redirect_page.scss
View File

@@ -2,7 +2,7 @@
width: 30%; width: 30%;
margin: 20% auto; margin: 20% auto;
text-align: center; text-align: center;
font-size: 24px; font-size: 1.5rem;
.thanks-msg { .thanks-msg {
border-bottom: 1px solid #FFFFFF; border-bottom: 1px solid #FFFFFF;
@@ -10,16 +10,16 @@
padding-right: 30px; padding-right: 30px;
p { p {
margin: 30px auto; margin: 30px auto;
font-size: 24px; font-size: 1.5rem;
line-height: 24px; line-height: 1.5rem;
} }
} }
.hint-msg { .hint-msg {
p { p {
margin: 26px auto; margin: 26px auto;
font-weight: 600; font-weight: 600;
font-size: 16px; font-size: 1rem;
line-height: 18px; line-height: 1.125rem;
.hint-msg__holder{ .hint-msg__holder{
font-weight: 200; font-weight: 200;
} }
@@ -33,7 +33,7 @@
} }
.forbidden-msg { .forbidden-msg {
p { p {
font-size: 16px; font-size: 1rem;
margin-top: 15px; margin-top: 15px;
} }
} }

16
css/_reset.scss
View File

@@ -70,7 +70,7 @@ input[type="reset"] {
body { body {
color: #333; color: #333;
font-family: Arial, sans-serif; font-family: Arial, sans-serif;
font-size: 14px; font-size: 0.875rem;
line-height: 1.42857142857143; line-height: 1.42857142857143;
} }
/* International Font Stacks*/ /* International Font Stacks*/
@@ -113,7 +113,7 @@ pre:first-child {
/* Headings: desired line height in px / font size = unitless line height */ /* Headings: desired line height in px / font size = unitless line height */
h1 { h1 {
color: #333; color: #333;
font-size: 32px; font-size: 2rem;
font-weight: normal; font-weight: normal;
line-height: 1.25; line-height: 1.25;
text-transform: none; text-transform: none;
@@ -121,7 +121,7 @@ h1 {
} }
h2 { h2 {
color: #333; color: #333;
font-size: 24px; font-size: 1.5rem;
font-weight: normal; font-weight: normal;
line-height: 1.25; line-height: 1.25;
text-transform: none; text-transform: none;
@@ -129,14 +129,14 @@ h2 {
} }
h3 { h3 {
color: #333; color: #333;
font-size: 20px; font-size: 1.25rem;
font-weight: normal; font-weight: normal;
line-height: 1.5; line-height: 1.5;
text-transform: none; text-transform: none;
margin: 30px 0 0 0; margin: 30px 0 0 0;
} }
h4 { h4 {
font-size: 16px; font-size: 1rem;
font-weight: bold; font-weight: bold;
line-height: 1.25; line-height: 1.25;
text-transform: none; text-transform: none;
@@ -144,7 +144,7 @@ h4 {
} }
h5 { h5 {
color: #333; color: #333;
font-size: 14px; font-size: 0.875rem;
font-weight: bold; font-weight: bold;
line-height: 1.42857143; line-height: 1.42857143;
text-transform: none; text-transform: none;
@@ -152,7 +152,7 @@ h5 {
} }
h6 { h6 {
color: #707070; color: #707070;
font-size: 12px; font-size: 0.75rem;
font-weight: bold; font-weight: bold;
line-height: 1.66666667; line-height: 1.66666667;
text-transform: uppercase; text-transform: uppercase;
@@ -179,7 +179,7 @@ h5 + h6 {
/* Other typographical elements */ /* Other typographical elements */
small { small {
color: #707070; color: #707070;
font-size: 12px; font-size: 0.75rem;
line-height: 1.33333333333333; line-height: 1.33333333333333;
} }
code, code,

2
css/_responsive.scss
View File

@@ -4,7 +4,7 @@
#enter_room { #enter_room {
.welcome-page-button { .welcome-page-button {
font-size: 16px; font-size: 1rem;
left: 0; left: 0;
text-align: center; text-align: center;
width: 100%; width: 100%;

8
css/_toolbars.scss
View File

@@ -9,9 +9,9 @@
// Do not inherit the font-family from the toolbar button, because it's an // Do not inherit the font-family from the toolbar button, because it's an
// icon style. // icon style.
font-family: $baseFontFamily; font-family: $baseFontFamily;
font-size: 9px; font-size: 0.5rem;
font-weight: 700; font-weight: 700;
line-height: 13px; line-height: 0.75rem;
min-width: 13px; min-width: 13px;
overflow: hidden; overflow: hidden;
text-align: center; text-align: center;
@@ -69,8 +69,8 @@
.badge-round { .badge-round {
bottom: -5px; bottom: -5px;
font-size: 12px; font-size: 0.75rem;
line-height: 20px; line-height: 1.25rem;
min-width: 20px; min-width: 20px;
pointer-events: none; pointer-events: none;
position: absolute; position: absolute;

8
css/_variables.scss
View File

@@ -50,11 +50,11 @@ $filmstripVideosZ: $toolbarZ + 1;
$primaryUnsupportedBrowserButtonBgColor: #0052CC; $primaryUnsupportedBrowserButtonBgColor: #0052CC;
$unsupportedBrowserButtonBgColor: rgba(9, 30, 66, 0.04); $unsupportedBrowserButtonBgColor: rgba(9, 30, 66, 0.04);
$unsupportedBrowserTextColor: #4a4a4a; $unsupportedBrowserTextColor: #4a4a4a;
$unsupportedBrowserTextSmallFontSize: 17px; $unsupportedBrowserTextSmallFontSize: 1rem;
$unsupportedBrowserTitleColor: #fff; $unsupportedBrowserTitleColor: #fff;
$unsupportedBrowserTitleFontSize: 24px; $unsupportedBrowserTitleFontSize: 1.5rem;
$unsupportedDesktopBrowserTextColor: rgba(255, 255, 255, 0.7); $unsupportedDesktopBrowserTextColor: rgba(255, 255, 255, 0.7);
$unsupportedDesktopBrowserTextFontSize: 21px; $unsupportedDesktopBrowserTextFontSize: 1.25rem;
/** /**
* The size of the default watermark. * The size of the default watermark.
@@ -89,7 +89,7 @@ $welcomePageHeaderContainerDisplay: flex;
$welcomePageHeaderContainerMargin: $welcomePageHeaderContainerMarginTop auto 0; $welcomePageHeaderContainerMargin: $welcomePageHeaderContainerMarginTop auto 0;
$welcomePageHeaderTextTitleMarginBottom: 0; $welcomePageHeaderTextTitleMarginBottom: 0;
$welcomePageHeaderTextTitleFontSize: 42px; $welcomePageHeaderTextTitleFontSize: 2.625rem;
$welcomePageHeaderTextTitleFontWeight: normal; $welcomePageHeaderTextTitleFontWeight: normal;
$welcomePageHeaderTextTitleLineHeight: 50px; $welcomePageHeaderTextTitleLineHeight: 50px;
$welcomePageHeaderTextTitleOpacity: 1; $welcomePageHeaderTextTitleOpacity: 1;

6
css/_videolayout_default.scss
View File

@@ -160,7 +160,7 @@
} }
#alwaysOnTop .displayname { #alwaysOnTop .displayname {
font-size: 15px; font-size: 0.875rem;
position: inherit; position: inherit;
width: 100%; width: 100%;
left: 0px; left: 0px;
@@ -294,7 +294,7 @@
width: auto; width: auto;
z-index: $zindex2; z-index: $zindex2;
font-weight: 600; font-weight: 600;
font-size: 14px; font-size: 0.875rem;
text-align: center; text-align: center;
color: #FFF; color: #FFF;
left: 50%; left: 50%;
@@ -340,7 +340,7 @@
.presence-label { .presence-label {
color: #fff; color: #fff;
font-size: 12px; font-size: 0.75rem;
font-weight: 100; font-weight: 100;
left: 0; left: 0;
margin: 0 auto; margin: 0 auto;

18
css/_welcome_page.scss
View File

@@ -53,9 +53,9 @@ body.welcome-page {
.header-text-subtitle { .header-text-subtitle {
color: #fff; color: #fff;
font-size: 20px; font-size: 1.25rem;
font-weight: 600; font-weight: 600;
line-height: 26px; line-height: 1.625rem;
margin: 16px 0 32px 0; margin: 16px 0 32px 0;
text-align: $welcomePageHeaderTextAlign; text-align: $welcomePageHeaderTextAlign;
@@ -64,7 +64,7 @@ body.welcome-page {
.not-allow-title-character-div { .not-allow-title-character-div {
color: #f03e3e; color: #f03e3e;
background-color: #fff; background-color: #fff;
font-size: 12px; font-size: 0.75rem;
font-weight: 600; font-weight: 600;
margin: 10px 0px 5px 0px; margin: 10px 0px 5px 0px;
text-align: $welcomePageHeaderTextAlign; text-align: $welcomePageHeaderTextAlign;
@@ -147,7 +147,7 @@ body.welcome-page {
display: inline-block; display: inline-block;
height: 50px; height: 50px;
width: 100%; width: 100%;
font-size: 14px; font-size: 0.875rem;
padding-left: 10px; padding-left: 10px;
&.focus-visible { &.focus-visible {
@@ -172,7 +172,7 @@ body.welcome-page {
} }
.tab-container { .tab-container {
font-size: 16px; font-size: 1rem;
position: relative; position: relative;
text-align: left; text-align: left;
display: $welcomePageTabContainerDisplay; display: $welcomePageTabContainerDisplay;
@@ -191,8 +191,8 @@ body.welcome-page {
background-color: #c7ddff; background-color: #c7ddff;
border-radius: 6px; border-radius: 6px;
color: #0163FF; color: #0163FF;
font-size: 14px; font-size: 0.875rem;
line-height: 18px; line-height: 1.125rem;
margin: 4px; margin: 4px;
display: $welcomePageTabButtonsDisplay; display: $welcomePageTabButtonsDisplay;
@@ -218,7 +218,7 @@ body.welcome-page {
.welcome-page-button { .welcome-page-button {
border: 0; border: 0;
font-size: 14px; font-size: 0.875rem;
background: $welcomePageButtonBg; background: $welcomePageButtonBg;
border-radius: 3px; border-radius: 3px;
color: #FFFFFF; color: #FFFFFF;
@@ -246,7 +246,7 @@ body.welcome-page {
* { * {
cursor: pointer; cursor: pointer;
font-size: 32px; font-size: 2rem;
} }
.toolbox-icon { .toolbox-icon {

4
css/modals/invite/_add-people.scss
View File

@@ -20,7 +20,7 @@
width: 28px; width: 28px;
i { i {
line-height: 28px; line-height: 1.75rem;
margin: auto; margin: auto;
} }
} }
@@ -35,7 +35,7 @@
padding-left: 10px; padding-left: 10px;
i { i {
line-height: 20px; line-height: 1.25rem;
margin: auto; margin: auto;
} }
} }

8
css/modals/invite/_info.scss
View File

@@ -1,7 +1,7 @@
.info-dialog { .info-dialog {
cursor: default; cursor: default;
display: flex; display: flex;
font-size: 14px; font-size: 0.875rem;
.info-dialog-column { .info-dialog-column {
margin-right: 10px; margin-right: 10px;
@@ -53,8 +53,8 @@
max-width: 334px; max-width: 334px;
width: 100%; width: 100%;
margin-top: 20px; margin-top: 20px;
font-size: 12px; font-size: 0.75rem;
line-height: 24px; line-height: 1.5rem;
border-collapse: collapse; border-collapse: collapse;
* { * {
@@ -107,7 +107,7 @@
box-sizing: border-box; box-sizing: border-box;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
font-size: 12px; font-size: 0.75rem;
max-height: 100%; max-height: 100%;
overflow: auto; overflow: auto;
padding: 15pt; padding: 15pt;

4
css/modals/invite/_invite_more.scss
View File

@@ -1,8 +1,8 @@
.invite-more { .invite-more {
&-dialog { &-dialog {
color: #fff; color: #fff;
font-size: 15px; font-size: 0.875rem;
line-height: 24px; line-height: 1.5rem;
&.separator { &.separator {
margin: 24px 0 24px -20px; margin: 24px 0 24px -20px;

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

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

8
css/modals/security/_security.scss
View File

@@ -1,15 +1,15 @@
.security { .security {
&-dialog { &-dialog {
color: #fff; color: #fff;
font-size: 15px; font-size: 0.875rem;
line-height: 24px; line-height: 1.5rem;
&.password-section { &.password-section {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.description { .description {
font-size: 13px; font-size: 0.75rem;
} }
.password { .password {
@@ -24,7 +24,7 @@
button { button {
cursor: pointer; cursor: pointer;
text-decoration: none; text-decoration: none;
font-size: 14px; font-size: 0.875rem;
color: #6FB1EA; color: #6FB1EA;
} }

16
css/premeeting/_lobby.scss
View File

@@ -1,7 +1,7 @@
.lobby-screen { .lobby-screen {
font-size: 16px; font-size: 1rem;
font-weight: 400; font-weight: 400;
line-height: 26px; line-height: 1.625rem;
&-content { &-content {
align-items: center; align-items: center;
@@ -43,7 +43,7 @@
flex-direction: column; flex-direction: column;
.description { .description {
font-size: 13px; font-size: 0.75rem;
} }
.control-row { .control-row {
@@ -53,7 +53,7 @@
margin-top: 15px; margin-top: 15px;
label { label {
font-size: 14px; font-size: 0.875rem;
font-weight: bold; font-weight: bold;
} }
} }
@@ -191,9 +191,9 @@
.title { .title {
flex: 1; flex: 1;
color: #fff; color: #fff;
font-size: 20px; font-size: 1.25rem;
font-weight: 600; font-weight: 600;
line-height: 28px; line-height: 1.75rem;
letter-spacing: -1.2%; letter-spacing: -1.2%;
} }
} }
@@ -214,8 +214,8 @@
border-radius: 6px; border-radius: 6px;
box-sizing: border-box; box-sizing: border-box;
color: white; color: white;
font-size: 12px; font-size: 0.75rem;
line-height: 16px; line-height: 1rem;
margin-bottom: 16px; margin-bottom: 16px;
margin-top: -8px; margin-top: -8px;
padding: 4px; padding: 4px;

8
css/premeeting/_premeeting-screens.scss
View File

@@ -5,9 +5,9 @@
color: #fff; color: #fff;
cursor: pointer; cursor: pointer;
display: inline-block; display: inline-block;
font-size: 14px; font-size: 0.875rem;
font-weight: 600; font-weight: 600;
line-height: 24px; line-height: 1.5rem;
margin-bottom: 16px; margin-bottom: 16px;
padding: 7px 16px; padding: 7px 16px;
position: relative; position: relative;
@@ -26,7 +26,7 @@
&.text { &.text {
width: auto; width: auto;
font-size: 13px; font-size: 0.75rem;
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
@@ -98,7 +98,7 @@
} }
.action-btn { .action-btn {
font-size: 16px; font-size: 1rem;
margin-bottom: 8px; margin-bottom: 8px;
padding: 11px 16px; padding: 11px 16px;
} }

8
css/reload_overlay/_reload_overlay.scss
View File

@@ -1,13 +1,13 @@
.reload_overlay_title { .reload_overlay_title {
display: block; display: block;
font-size: 16px; font-size: 1rem;
line-height: 20px; line-height: 1.25rem;
} }
.reload_overlay_text { .reload_overlay_text {
display: block; display: block;
font-size: 12px; font-size: 0.75rem;
line-height: 30px; line-height: 1.875rem;
} }
#reloadProgressBar { #reloadProgressBar {

8
css/ringing/_ringing.scss
View File

@@ -34,12 +34,12 @@
&__status{ &__status{
margin-top: 15px; margin-top: 15px;
font-size: 14px; font-size: 0.875rem;
line-height: 20px; line-height: 1.25rem;
} }
&__name { &__name {
font-size: 24px; font-size: 1.5rem;
line-height: 32px; line-height: 2rem;
} }
} }

4
css/third-party-branding/google.scss
View File

@@ -8,7 +8,7 @@
cursor: pointer; cursor: pointer;
display: inline-flex; display: inline-flex;
font-family: Roboto, arial, sans-serif; font-family: Roboto, arial, sans-serif;
font-size: 14px; font-size: 0.875rem;
padding: 1px; padding: 1px;
.google-cta { .google-cta {
@@ -17,7 +17,7 @@
/** /**
* Hack the line height for vertical centering of text. * Hack the line height for vertical centering of text.
*/ */
line-height: 32px; line-height: 2rem;
margin: 0 15px; margin: 0 15px;
} }

4
css/third-party-branding/microsoft.scss
View File

@@ -17,8 +17,8 @@
.microsoft-cta { .microsoft-cta {
display: inline-block; display: inline-block;
color: #5E5E5E; color: #5E5E5E;
font-size: 15px; font-size: 0.875rem;
line-height: 41px; line-height: 2.5rem;
} }
.microsoft-logo { .microsoft-logo {

52
react/features/base/ui/Tokens.ts
View File

@@ -138,64 +138,64 @@ export const typography = {
labelBold: 'labelBold01', labelBold: 'labelBold01',
bodyShortRegularSmall: { bodyShortRegularSmall: {
fontSize: 10, fontSize: '0.625rem',
lineHeight: 16, lineHeight: '1rem',
fontWeight: font.weightRegular, fontWeight: font.weightRegular,
letterSpacing: 0 letterSpacing: 0
}, },
bodyShortRegular: { bodyShortRegular: {
fontSize: 14, fontSize: '0.875rem',
lineHeight: 20, lineHeight: '1.25rem',
fontWeight: font.weightRegular, fontWeight: font.weightRegular,
letterSpacing: 0 letterSpacing: 0
}, },
bodyShortBold: { bodyShortBold: {
fontSize: 14, fontSize: '0.875rem',
lineHeight: 20, lineHeight: '1.25rem',
fontWeight: font.weightSemiBold, fontWeight: font.weightSemiBold,
letterSpacing: 0 letterSpacing: 0
}, },
bodyShortRegularLarge: { bodyShortRegularLarge: {
fontSize: 16, fontSize: '1rem',
lineHeight: 22, lineHeight: '1.375rem',
fontWeight: font.weightRegular, fontWeight: font.weightRegular,
letterSpacing: 0 letterSpacing: 0
}, },
bodyShortBoldLarge: { bodyShortBoldLarge: {
fontSize: 16, fontSize: '1rem',
lineHeight: 22, lineHeight: '1.375rem',
fontWeight: font.weightSemiBold, fontWeight: font.weightSemiBold,
letterSpacing: 0 letterSpacing: 0
}, },
bodyLongRegular: { bodyLongRegular: {
fontSize: 14, fontSize: '0.875rem',
lineHeight: 24, lineHeight: '1.5rem',
fontWeight: font.weightRegular, fontWeight: font.weightRegular,
letterSpacing: 0 letterSpacing: 0
}, },
bodyLongRegularLarge: { bodyLongRegularLarge: {
fontSize: 16, fontSize: '1rem',
lineHeight: 26, lineHeight: '1.625rem',
fontWeight: font.weightRegular, fontWeight: font.weightRegular,
letterSpacing: 0 letterSpacing: 0
}, },
bodyLongBold: { bodyLongBold: {
fontSize: 14, fontSize: '0.875rem',
lineHeight: 24, lineHeight: '1.5rem',
fontWeight: font.weightSemiBold, fontWeight: font.weightSemiBold,
letterSpacing: 0 letterSpacing: 0
}, },
bodyLongBoldLarge: { bodyLongBoldLarge: {
fontSize: 16, fontSize: '1rem',
lineHeight: 26, lineHeight: '1.625rem',
fontWeight: font.weightSemiBold, fontWeight: font.weightSemiBold,
letterSpacing: 0 letterSpacing: 0
}, },
@@ -205,29 +205,29 @@ export const typography = {
heading2: 'heading02', heading2: 'heading02',
heading3: { heading3: {
fontSize: 32, fontSize: '2rem',
lineHeight: 40, lineHeight: '2.5rem',
fontWeight: font.weightSemiBold, fontWeight: font.weightSemiBold,
letterSpacing: 0 letterSpacing: 0
}, },
heading4: { heading4: {
fontSize: 28, fontSize: '1.75rem',
lineHeight: 36, lineHeight: '2.25rem',
fontWeight: font.weightSemiBold, fontWeight: font.weightSemiBold,
letterSpacing: 0 letterSpacing: 0
}, },
heading5: { heading5: {
fontSize: 20, fontSize: '1.25rem',
lineHeight: 28, lineHeight: '1.75rem',
fontWeight: font.weightSemiBold, fontWeight: font.weightSemiBold,
letterSpacing: 0 letterSpacing: 0
}, },
heading6: { heading6: {
fontSize: 16, fontSize: '1rem',
lineHeight: 26, lineHeight: '1.625rem',
fontWeight: font.weightSemiBold, fontWeight: font.weightSemiBold,
letterSpacing: 0 letterSpacing: 0
} }

8
static/offline.html
View File

@@ -21,18 +21,18 @@
align-items: center; align-items: center;
flex-direction: column; flex-direction: column;
font-family: Arial, Helvetica, sans-serif; font-family: Arial, Helvetica, sans-serif;
font-size: 14px; font-size: 0.875rem;
font-weight: 400; font-weight: 400;
line-height: 19px; line-height: 1.125rem;
margin: auto; margin: auto;
max-width: 376px; max-width: 376px;
text-align: center; text-align: center;
} }
h4 { h4 {
font-size: 24px; font-size: 1.5rem;
font-weight: 600; font-weight: 600;
line-height: 32px; line-height: 2rem;
margin: 24px auto; margin: 24px auto;
} }