From fba401aee89b5c466ab7d9df23113fcba428f8a6 Mon Sep 17 00:00:00 2001
From: Ken Powers <ken@signal.org>
Date: Fri, 7 Feb 2020 15:19:35 -0500
Subject: [PATCH] Add sanitize.css to all windows and styleguide

---
 about.html                | 1 +
 background.html           | 1 +
 debug_log.html            | 1 +
 permissions_popup.html    | 1 +
 settings.html             | 1 +
 styleguide.config.js      | 5 +++++
 stylesheets/_emoji.scss   | 1 +
 stylesheets/_global.scss  | 4 ----
 stylesheets/_modules.scss | 1 +
 9 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/about.html b/about.html
index f291edfd832f..23e7a54ad6f2 100644
--- a/about.html
+++ b/about.html
@@ -13,6 +13,7 @@
             script-src 'self';
             style-src 'self' 'unsafe-inline';"
   >
+  <link href="node_modules/sanitize.css/sanitize.css" rel="stylesheet" type="text/css" />
   <link href="stylesheets/manifest.css" rel="stylesheet" type="text/css" />
   <style>
     body {
diff --git a/background.html b/background.html
index 2727bebd4d92..df383bf32c33 100644
--- a/background.html
+++ b/background.html
@@ -21,6 +21,7 @@
   >
   <title>Signal</title>
   <link href='images/icon_128.png' rel='shortcut icon'>
+  <link href="node_modules/sanitize.css/sanitize.css" rel="stylesheet" type="text/css" />
   <link href="stylesheets/manifest.css" rel="stylesheet" type="text/css" />
   <link href="node_modules/draft-js/dist/Draft.css" rel="stylesheet" type="text/css" />
 
diff --git a/debug_log.html b/debug_log.html
index 34c0ec950df3..dff42777a12e 100644
--- a/debug_log.html
+++ b/debug_log.html
@@ -13,6 +13,7 @@
             script-src 'self';
             style-src 'self' 'unsafe-inline';"
   >
+  <link href="node_modules/sanitize.css/sanitize.css" rel="stylesheet" type="text/css" />
   <link href="stylesheets/manifest.css" rel="stylesheet" type="text/css" />
 <style>
 </style>
diff --git a/permissions_popup.html b/permissions_popup.html
index e95b75ef0643..421f9d2b15da 100644
--- a/permissions_popup.html
+++ b/permissions_popup.html
@@ -13,6 +13,7 @@
             script-src 'self';
             style-src 'self' 'unsafe-inline';"
   >
+  <link href="node_modules/sanitize.css/sanitize.css" rel="stylesheet" type="text/css" />
   <link href="stylesheets/manifest.css" rel="stylesheet" type="text/css" />
 <style>
 </style>
diff --git a/settings.html b/settings.html
index 184b117a211c..bdef5810cff2 100644
--- a/settings.html
+++ b/settings.html
@@ -13,6 +13,7 @@
             script-src 'self';
             style-src 'self' 'unsafe-inline';"
   >
+  <link href="node_modules/sanitize.css/sanitize.css" rel="stylesheet" type="text/css" />
   <link href="stylesheets/manifest.css" rel="stylesheet" type="text/css" />
 <style>
 </style>
diff --git a/styleguide.config.js b/styleguide.config.js
index 4d670f5f1cf1..2135203e87fe 100644
--- a/styleguide.config.js
+++ b/styleguide.config.js
@@ -64,6 +64,11 @@ module.exports = {
   template: {
     head: {
       links: [
+        {
+          rel: 'stylesheet',
+          type: 'text/css',
+          href: '/node_modules/sanitize.css/sanitize.css',
+        },
         {
           rel: 'stylesheet',
           type: 'text/css',
diff --git a/stylesheets/_emoji.scss b/stylesheets/_emoji.scss
index a3211264e3bb..53c6ec4582e2 100644
--- a/stylesheets/_emoji.scss
+++ b/stylesheets/_emoji.scss
@@ -44,6 +44,7 @@ img.emoji {
   width: 1.4em;
   height: 1.4em;
   margin-bottom: -4px;
+  vertical-align: baseline;
 }
 
 img.emoji.small {
diff --git a/stylesheets/_global.scss b/stylesheets/_global.scss
index c9952626185d..a5eddf01b9bc 100644
--- a/stylesheets/_global.scss
+++ b/stylesheets/_global.scss
@@ -1,7 +1,3 @@
-* {
-  box-sizing: border-box;
-}
-
 html {
   height: 100%;
 }
diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss
index 12d95862899b..5c37b3cf9589 100644
--- a/stylesheets/_modules.scss
+++ b/stylesheets/_modules.scss
@@ -6720,6 +6720,7 @@ button.module-image__border-overlay:focus {
     width: $size;
     height: $size;
     transform: translate3d(0, 0, 0);
+    vertical-align: baseline;
   }
 }