Merge remote-tracking branch 'origin/tracking' into custom

This commit is contained in:
roytam1 2023-10-06 10:48:24 +08:00
commit 879ab0d7dc
72 changed files with 81921 additions and 71421 deletions

View file

@ -289,9 +289,7 @@ description > html|a {
margin-inline-end: 4px; /* add the 4px end-margin of other elements */
}
#telemetryLearnMore,
#FHRLearnMore,
#crashReporterLearnMore {
#FHRLearnMore {
/* provide some margin between the links and the label text */
/* !important is needed to override the rules defined in common.css */
margin-inline-start: 20px !important;
@ -542,11 +540,6 @@ description > html|a {
margin-inline-end: 14px;
}
.fxaMobilePromo {
margin-bottom: 20px;
margin-top: 25px;
}
#fxaLoginRejectedWarning {
list-style-image: url(chrome://browser/skin/warning.svg);
filter: drop-shadow(0 1px 0 hsla(206, 50%, 10%, .15));
@ -557,36 +550,12 @@ description > html|a {
margin-bottom: 27.5px;
}
.androidLink {
background-image: url("chrome://browser/skin/fxa/android.png");
}
.iOSLink {
background-image: url("chrome://browser/skin/fxa/ios.png");
}
.androidLink,
.iOSLink {
margin: 0 0 0 2px;
padding-left: 28px;
padding-top: 6px;
height: 28px;
background-repeat: no-repeat;
background-size: 24px 28px;
}
#tosPP-small {
margin-top: 20px;
margin-bottom: 20px;
}
@media (min-resolution: 1.1dppx) {
.androidLink {
background-image: url("chrome://browser/skin/fxa/android@2x.png");
}
.iOSLink {
background-image: url("chrome://browser/skin/fxa/ios@2x.png");
}
.fxaSyncIllustration {
list-style-image: url(chrome://browser/skin/fxa/sync-illustration@2x.png)
}