Commit b462b11e authored by Andreea Pavel's avatar Andreea Pavel
Browse files

Merge autoland to mozilla-central a=merge

parents 7e90c874 812e9972
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -114,7 +114,9 @@ add_task(async function testWindowCreateFocused() {
    messages,
    {
      expected: [
        /Warning processing focused: Opening inactive windows is not supported./,
        {
          message: /Warning processing focused: Opening inactive windows is not supported/,
        },
      ],
    },
    "Expected warning processing focused"
+53 −3
Original line number Diff line number Diff line
@@ -2,6 +2,11 @@
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

:host,
:root {
  --card-border-zap-gradient: linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%);
}

body {
  display: flex;
  align-items: stretch;
@@ -81,12 +86,57 @@ body > main > aside {
  color: var(--in-content-deemphasized-text)
}

.setup-step {
  padding: var(--card-padding);
  margin: 0 0 8px;
}

/* Bug 1770534 - Only use the zap-gradient for built-in, color-neutral themes */
.setup-step {
  border: none;
  position: relative;
  z-index: 0;
}
.setup-step::before {
  content: "";
  position: absolute;
  z-index: -1;
  inset: 0;
  padding: 1px; /* the "border" thickness */
  border-radius: 4px;
  background-image: var(--card-border-zap-gradient);
  mask: linear-gradient(#fff 0 0) content-box, linear-gradient(#fff 0 0);
  mask-composite: exclude;
}

.setup-step > h2 {
  margin-block: 4px;
  margin-block: 0 8px;
}

.setup-step > .step-body > :is(.step-content, button.primary) {
  flex: 0 1 auto;
.setup-step > .step-body {
  display: flex;
  align-content: space-between;
  align-items: center;
  margin-block: 8px;
  padding-block: 8px;
}

.setup-step > .step-body > .step-content {
  flex: 1 1 auto;
}

.setup-step > .step-body > button.primary {
  white-space: nowrap;
}

.setup-step > footer {
  display: flex;
  flex-direction: column;
  margin-block: 0 8px;
}

.setup-step > footer > progress {
  margin-block: 0 8px;
}

#recently-closed-tabs-container {
+1 −4
Original line number Diff line number Diff line
@@ -2218,10 +2218,7 @@ body.theme_dark .stp_article_list .stp_article_list_link:hover, body.theme_dark
  border-radius: 4px;
  margin-inline-end: 8px;
  background-color: #ECECEE;
}
.stp_article_list .stp_article_list_thumb:-moz-broken,
.stp_article_list .stp_article_list_thumb_placeholder:-moz-broken {
  display: none;
  flex-shrink: 0;
}
.stp_article_list .stp_article_list_header {
  font-style: normal;
+14 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@
 * License, v. 2.0. If a copy of the MPL was not distributed with this file,
 * You can obtain one at http://mozilla.org/MPL/2.0/. */

import React from "react";
import React, { useState } from "react";
import TelemetryLink from "../TelemetryLink/TelemetryLink";

function ArticleUrl(props) {
@@ -34,6 +34,9 @@ function Article(props) {
      : null;
  }

  const [thumbnailLoaded, setThumbnailLoaded] = useState(false);
  const [thumbnailLoadFailed, setThumbnailLoadFailed] = useState(false);

  const {
    article,
    savedArticle,
@@ -82,13 +85,22 @@ function Article(props) {
        utmParams={utmParams}
      >
        <>
          {thumbnail ? (
          {thumbnail && !thumbnailLoadFailed ? (
            <img
              className="stp_article_list_thumb"
              src={thumbnail}
              alt={alt}
              width="40"
              height="40"
              onLoad={() => {
                setThumbnailLoaded(true);
              }}
              onError={() => {
                setThumbnailLoadFailed(true);
              }}
              style={{
                visibility: thumbnailLoaded ? `visible` : `hidden`,
              }}
            />
          ) : (
            <div className="stp_article_list_thumb_placeholder" />
+1 −3
Original line number Diff line number Diff line
@@ -28,9 +28,7 @@
    border-radius: 4px;
    margin-inline-end: 8px;
    background-color: #ECECEE;
    &:-moz-broken {
      display: none;
    }
    flex-shrink: 0;
  }

  .stp_article_list_header {
Loading