[tor-browser/tor-browser-91.6.0esr-11.0-1] fixup! Bug 26961: New user onboarding. - tbb-commits

17 Feb 2022

commit f89667d8b0e89920dee7a82dc02e6c4c414de937
Author: Richard Pospesel richard@torproject.org
Date:   Tue Dec 7 16:20:20 2021 +0100
fixup! Bug 26961: New user onboarding.
fixes tor-browser#40684
---
 browser/base/content/main-popupset.inc.xhtml |  1 +
 browser/themes/linux/browser.css             |  9 ------
 browser/themes/shared/UITour.inc.css         | 48 +++++++++++++++-------------
 browser/themes/windows/browser.css           |  9 ------
 4 files changed, 27 insertions(+), 40 deletions(-)

diff --git a/browser/base/content/main-popupset.inc.xhtml b/browser/base/content/main-popupset.inc.xhtml
index f627b97cba3f..a96aaa9c187d 100644
--- a/browser/base/content/main-popupset.inc.xhtml
+++ b/browser/base/content/main-popupset.inc.xhtml
@@ -242,6 +242,7 @@
             <toolbarbutton id="UITourTooltipClose" class="close-icon"
                            tooltiptext="&uiTour.infoPanel.close;"/>
           </hbox>
+          <toolbarseparator id="UITourTooltipToolbarSeparator"/>
           <description id="UITourTooltipDescription" flex="1"/>
         </vbox>
       </hbox>
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index a14abba4c209..03ddd497bb2d 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -355,15 +355,6 @@ menuitem.bookmark-item {
   margin-inline-end: -4px;
 }
-/**
- * Override the --arrowpanel-padding so the background extends
- * to the sides and bottom of the panel.
- */
-#UITourTooltipButtons {
-  margin-inline-start: -10px;
-  margin-bottom: -10px;
-}
-
 %include ../shared/contextmenu.inc.css
#context-navigation > .menuitem-iconic > .menu-iconic-left {
diff --git a/browser/themes/shared/UITour.inc.css b/browser/themes/shared/UITour.inc.css
index cda91243f6d5..730d47ce13af 100644
--- a/browser/themes/shared/UITour.inc.css
+++ b/browser/themes/shared/UITour.inc.css
@@ -39,7 +39,6 @@
#UITourTooltipTitleContainer {
   -moz-box-align: start;
-  margin-bottom: 10px;
 }
#UITourTooltipIcon {
@@ -54,17 +53,25 @@
 }
#UITourTooltipTitle {
-  color: #420C5D;
-  font-size: 16px;
-  font-weight: bold;
+  font-size: 1.25em;
+  font-weight: 600;
   margin: 0;
 }
+#UITourTooltipToolbarSeparator {
+  appearance: none;
+  min-height: 0;
+  border-top: 1px solid var(--panel-separator-color);
+  border-bottom: none;
+  margin: var(--panel-separator-margin);
+  margin-inline: 0;
+  padding: 0;
+}
+
 #UITourTooltipDescription {
   margin-inline: 0;
-  color: #4A4A4A;
-  font-size: 13px;
-  line-height: 1.8rem;
+  font-size: 1.11em;
+  line-height: normal;
   margin-bottom: 0; /* Override global.css */
 }
@@ -84,9 +91,7 @@
#UITourTooltipButtons {
   -moz-box-pack: end;
-  background-color: var(--arrowpanel-dimmed);
-  margin: 10px -16px -16px;
-  padding: 16px;
+  padding-block-start: 16px;
 }
#UITourTooltipButtons > label,
@@ -112,17 +117,14 @@
#UITourTooltipButtons > label,
 #UITourTooltipButtons > button .button-text {
-  font-size: 1.15rem;
+  font-weight: 600;
+  margin-inline: 0;
 }
#UITourTooltipButtons > button:not(.button-link) {
   appearance: none;
-  background-color: rgb(251,251,251);
-  border-radius: 2px;
-  color: rgb(71,71,71);
-  padding: 6px 30px;
-  transition-property: background-color, border-color;
-  transition-duration: 150ms;
+  border-radius: 4px;
+  padding: 8px 16px;
 }
#UITourTooltipButtons > label,
@@ -131,16 +133,18 @@
   background: transparent;
   border: none;
   box-shadow: none;
-  color: #4A4A4A;
   padding-inline: 10px;
 }
#UITourTooltipButtons > button.button-primary {
-  background-color: #420C5D;
-  color: white;
-  padding-inline: 28px;
+  background-color: var(--button-primary-bgcolor);
+  color: var(--button-primary-color);
+}
+
+#UITourTooltipButtons > button.button-primary:active {
+  background-color: var(--button-primary-active-bgcolor);
 }
#UITourTooltipButtons > button.button-primary:not(:active):hover {
-  background-color: #410A4E;
+  background-color: var(--button-primary-hover-bgcolor);
 }
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 7f4eb881cc9e..b60e9143fc86 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -624,15 +624,6 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
%include ../shared/UITour.inc.css
-#UITourTooltipButtons {
-  /**
-   * Override the --arrowpanel-padding so the background extends
-   * to the sides and bottom of the panel.
-   */
-  margin-inline: -10px;
-  margin-bottom: -10px;
-}
-
 %include ../shared/contextmenu.inc.css
/* Make menu items larger when opened through touch. */

    