Merge branch 'develop' into feature/snapp-transaction-snark-rewrite

MinaProtocol · Sep 9, 2020 · 4397147 · 4397147
2 parents d74e3b1 + 1af8a6e
commit 4397147
Show file tree

Hide file tree

Showing 36 changed files with 1,245 additions and 549 deletions.
diff --git a/buildkite/src/Monorepo.dhall b/buildkite/src/Monorepo.dhall
@@ -31,7 +31,7 @@ let makeCommand : JobSpec.Type -> Cmd.Type = \(job : JobSpec.Type) ->
   ''
 
 let prefixCommands = [
-  Cmd.run "git config http.sslVerify false", -- make git work inside container
+  Cmd.run "git config --global http.sslCAInfo /etc/ssl/certs/ca-bundle.crt", -- Tell git where to find certs for https connections
   Cmd.run "git fetch origin", -- Freshen the cache
   Cmd.run "./buildkite/scripts/generate-diff.sh > _computed_diff.txt"
 ]

diff --git a/frontend/website-redesign/public/static/AnnouncementBannerMobile.png b/frontend/website-redesign/public/static/AnnouncementBannerMobile.png
diff --git a/frontend/website-redesign/public/static/AnnouncementBannerTablet.png b/frontend/website-redesign/public/static/AnnouncementBannerTablet.png
diff --git a/...blic/static/AnnouncementBannerDesktop.png → .../public/static/img/AnnouncementBanner.png b/...blic/static/AnnouncementBannerDesktop.png → .../public/static/img/AnnouncementBanner.png
diff --git a/frontend/website-redesign/public/static/img/HeroSectionBackground.png b/frontend/website-redesign/public/static/img/HeroSectionBackground.png
diff --git a/frontend/website-redesign/public/static/img/HeroSectionHands.jpg b/frontend/website-redesign/public/static/img/HeroSectionHands.jpg
diff --git a/frontend/website-redesign/src/Theme.re b/frontend/website-redesign/src/Theme.re
@@ -8,7 +8,6 @@ module Colors = {
   let black = Css.black;
   let purple = `hex("5362C8");
   let digitalBlack = `hex("2d2d2d");
-
 };
 
 module Typeface = {
@@ -29,7 +28,7 @@ module MediaQuery = {
 };
 
 /** this function is needed to include the font files with the font styles */
-let generateStyles = rules => (Css.style(rules), rules);
+let generateStyles = rules => (style(rules), rules);
 
 module Type = {
   let h1jumbo =
@@ -38,7 +37,7 @@ module Type = {
       fontWeight(`normal),
       fontSize(`rem(3.5)),
       lineHeight(`rem(4.1875)),
-      color(black),
+      color(Colors.digitalBlack),
       media(
         MediaQuery.tablet,
         [fontSize(`rem(4.5)), lineHeight(`rem(5.4))],
@@ -51,7 +50,7 @@ module Type = {
       fontWeight(`normal),
       fontSize(`rem(2.25)),
       lineHeight(`rem(2.7)),
-      color(black),
+      color(Colors.digitalBlack),
       media(
         MediaQuery.tablet,
         [fontSize(`rem(3.0)), lineHeight(`rem(3.6))],
@@ -63,7 +62,7 @@ module Type = {
       Typeface.monumentGrotesk,
       fontSize(`rem(1.875)),
       lineHeight(`rem(2.25)),
-      color(black),
+      color(Colors.digitalBlack),
       media(
         MediaQuery.tablet,
         [fontSize(`rem(2.5)), lineHeight(`rem(3.))],
@@ -75,7 +74,7 @@ module Type = {
       Typeface.monumentGrotesk,
       fontSize(`rem(1.6)),
       lineHeight(`rem(2.1)),
-      color(black),
+      color(Colors.digitalBlack),
       media(
         MediaQuery.tablet,
         [fontSize(`rem(2.0)), lineHeight(`rem(2.375))],
@@ -92,6 +91,7 @@ module Type = {
       lineHeight(`rem(1.7)),
       textTransform(`uppercase),
       letterSpacing(`em(0.02)),
+      color(Colors.digitalBlack),
       media(
         MediaQuery.tablet,
         [fontSize(`rem(1.25)), lineHeight(`rem(1.9))],
@@ -112,7 +112,7 @@ module Type = {
       Typeface.monumentGrotesk,
       fontSize(`rem(1.3)),
       lineHeight(`rem(1.56)),
-      color(black),
+      color(Colors.digitalBlack),
       media(
         MediaQuery.tablet,
         [fontSize(`rem(1.5)), lineHeight(`rem(1.8))],
@@ -124,7 +124,7 @@ module Type = {
       Typeface.monumentGrotesk,
       fontSize(`rem(1.125)),
       lineHeight(`rem(1.375)),
-      color(black),
+      color(Colors.digitalBlack),
       media(
         MediaQuery.tablet,
         [fontSize(`rem(1.125)), lineHeight(`rem(1.4))],
@@ -139,7 +139,7 @@ module Type = {
       lineHeight(`rem(1.37)),
       textTransform(`uppercase),
       letterSpacing(`em(0.02)),
-      color(black),
+      color(Colors.digitalBlack),
       media(
         MediaQuery.tablet,
         [fontSize(`rem(1.25)), lineHeight(`rem(1.875))],
@@ -151,7 +151,7 @@ module Type = {
       Typeface.monumentGrotesk,
       fontSize(`rem(0.75)),
       lineHeight(`rem(1.)),
-      color(black),
+      color(Colors.digitalBlack),
       textTransform(`uppercase),
       letterSpacing(`em(0.03)),
       media(
@@ -166,7 +166,7 @@ module Type = {
       fontSize(`rem(0.75)),
       fontWeight(`num(500)),
       lineHeight(`rem(1.)),
-      color(black),
+      color(Colors.digitalBlack),
       textTransform(`uppercase),
       letterSpacing(`px(1)),
     ]);
@@ -185,23 +185,23 @@ module Type = {
       Typeface.monumentGrotesk,
       fontSize(`rem(1.1)),
       lineHeight(`rem(1.1)),
-      color(black),
+      color(Colors.digitalBlack),
     ]);
 
   let sidebarLink =
     style([
       Typeface.monumentGrotesk,
       fontSize(`rem(1.)),
       lineHeight(`rem(1.5)),
-      color(black),
+      color(Colors.digitalBlack),
     ]);
 
   let tooltip =
     style([
       Typeface.monumentGrotesk,
       fontSize(`px(13)),
       lineHeight(`rem(1.)),
-      color(black),
+      color(Colors.digitalBlack),
     ]);
 
   let creditName =
@@ -242,7 +242,7 @@ module Type = {
       Typeface.monumentGrotesk,
       fontSize(`rem(1.125)),
       lineHeight(`rem(1.68)),
-      color(black),
+      color(Colors.digitalBlack),
       media(
         MediaQuery.tablet,
         [fontSize(`rem(1.31)), lineHeight(`rem(1.93))],
@@ -255,7 +255,7 @@ module Type = {
       fontSize(`rem(1.)),
       lineHeight(`rem(1.5)),
       letterSpacing(`px(-1)),
-      color(black),
+      color(Colors.digitalBlack),
       media(
         MediaQuery.tablet,
         [fontSize(`rem(1.25)), lineHeight(`rem(1.875))],
@@ -267,7 +267,7 @@ module Type = {
       Typeface.monumentGrotesk,
       fontSize(`rem(1.)),
       lineHeight(`rem(1.5)),
-      color(black),
+      color(Colors.digitalBlack),
       media(
         MediaQuery.tablet,
         [fontSize(`rem(1.125)), lineHeight(`rem(1.69))],
@@ -279,7 +279,7 @@ module Type = {
       Typeface.monumentGrotesk,
       fontSize(`rem(0.875)),
       lineHeight(`rem(1.31)),
-      color(black),
+      color(Colors.digitalBlack),
       media(
         MediaQuery.tablet,
         [fontSize(`rem(1.)), lineHeight(`rem(1.5))],
@@ -292,7 +292,7 @@ module Type = {
       fontSize(`rem(1.)),
       lineHeight(`rem(1.5)),
       letterSpacing(`rem(0.03125)),
-      color(black),
+      color(Colors.digitalBlack),
       media(
         MediaQuery.tablet,
         [
@@ -309,10 +309,37 @@ module Type = {
       fontSize(`rem(1.31)),
       lineHeight(`rem(1.875)),
       letterSpacing(`em(-0.03)),
-      color(black),
+      color(Colors.digitalBlack),
       media(
         MediaQuery.tablet,
         [fontSize(`rem(2.5)), lineHeight(`rem(3.125))],
       ),
     ]);
 };
+
+// Match Tachyons setting pretty much everything to border-box
+global(
+  "a,article,aside,blockquote,body,code,dd,div,dl,dt,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,header,html,input[type=email],input[type=number],input[type=password],input[type=tel],input[type=text],input[type=url],legend,li,main,nav,ol,p,pre,section,table,td,textarea,th,tr,ul",
+  [boxSizing(`borderBox)],
+);
+
+// Reset padding that appears only on some browsers
+global(
+  "h1,h2,h3,h4,h5,fieldset,ul,li,p,figure",
+  [
+    unsafe("paddingInlineStart", "0"),
+    unsafe("paddingInlineEnd", "0"),
+    unsafe("paddingBlockStart", "0"),
+    unsafe("paddingBlockEnd", "0"),
+    unsafe("marginInlineStart", "0"),
+    unsafe("marginInlineEnd", "0"),
+    unsafe("marginBlockStart", "0"),
+    unsafe("marginBlockEnd", "0"),
+    unsafe("WebkitPaddingBefore", "0"),
+    unsafe("WebkitPaddingStart", "0"),
+    unsafe("WebkitPaddingEnd", "0"),
+    unsafe("WebkitPaddingAfter", "0"),
+    unsafe("WebkitMarginBefore", "0"),
+    unsafe("WebkitMarginAfter", "0"),
+  ],
+);
diff --git a/frontend/website-redesign/src/components/AnnouncementBanner.re b/frontend/website-redesign/src/components/AnnouncementBanner.re
@@ -4,22 +4,14 @@ module Styles = {
     merge([
       Theme.Type.announcement,
       style([
-        color(Theme.Colors.black),
+        color(Theme.Colors.digitalBlack),
         display(`flex),
         justifyContent(`spaceBetween),
         alignItems(`center),
         width(`percent(100.)),
         important(backgroundSize(`cover)),
-        backgroundImage(`url("/static/AnnouncementBannerMobile.png")),
+        backgroundImage(`url("/static/img/AnnouncementBanner.png")),
         padding2(~v=`rem(0.5), ~h=`rem(0.5)),
-        media(
-          Theme.MediaQuery.tablet,
-          [background(`url("/static/AnnouncementBannerTablet.png"))],
-        ),
-        media(
-          Theme.MediaQuery.desktop,
-          [background(`url("/static/AnnouncementBannerDesktop.png"))],
-        ),
       ]),
     ]);
 

diff --git a/frontend/website-redesign/src/components/Button.re b/frontend/website-redesign/src/components/Button.re
@@ -29,7 +29,7 @@ module Styles = {
         fontSize(`px(12)),
         color(
           {
-            bgColor === Theme.Colors.white ? black : white;
+            bgColor === Theme.Colors.white ? Theme.Colors.digitalBlack : white;
           },
         ),
         padding2(~v=`rem(paddingY), ~h=`rem(paddingX)),

diff --git a/frontend/website-redesign/src/components/CookieWarning.re b/frontend/website-redesign/src/components/CookieWarning.re
@@ -56,14 +56,15 @@ module Styles = {
     merge([
       Button.Styles.button(
         Theme.Colors.mint,
+        Theme.Colors.digitalBlack,
         true,
         `rem(3.25),
         `rem(7.75),
         1.5,
         1.,
       ),
       style([
-        color(Theme.Colors.black),
+        color(Theme.Colors.digitalBlack),
         marginRight(`auto),
         media(Theme.MediaQuery.tablet, [marginRight(`rem(2.))]),
         media(Theme.MediaQuery.desktop, [marginRight(`rem(4.))]),