From cdbb68bb8c750a99b808a8e9349c28f8f415d1cf Mon Sep 17 00:00:00 2001
From: Lauri Eskola <lauriii@1078742.no-reply.drupal.org>
Date: Mon, 25 Jun 2018 13:13:43 +0300
Subject: [PATCH] Issue #2950158 by Vidushi Mehta, ankitjain28may, Shiva
 Srikanth T, ckrina, markconroy, Eli-T: Choose policy for defining font-weight
 on Umami theme

---
 core/profiles/demo_umami/themes/umami/css/base.css            | 3 +--
 .../themes/umami/css/components/blocks/banner/banner.css      | 1 -
 .../umami/css/components/blocks/footer-promo/footer-promo.css | 4 ++--
 .../content/highlighted-bottom/highlighted-bottom.css         | 2 +-
 .../content/highlighted-medium/highlighted-medium.css         | 2 +-
 .../content/highlighted-small/highlighted-small.css           | 2 +-
 .../components/content/highlighted-top/highlighted-top.css    | 2 +-
 .../themes/umami/css/components/fields/label-items.css        | 2 +-
 .../css/components/navigation/menu-footer/menu-footer.css     | 4 ++--
 9 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/core/profiles/demo_umami/themes/umami/css/base.css b/core/profiles/demo_umami/themes/umami/css/base.css
index a63f96ef5d9e..1db4aeb1e56d 100644
--- a/core/profiles/demo_umami/themes/umami/css/base.css
+++ b/core/profiles/demo_umami/themes/umami/css/base.css
@@ -72,7 +72,6 @@ button,
   font-family: 'Scope One', Georgia, serif;
   font-size: 1.2rem;
   font-weight: 400;
-  font-weight: normal;
   transition: background-color 0.5s ease;
 }
 button:hover,
@@ -219,7 +218,7 @@ label {
   color: #464646;
   display: block;
   font-size: 1rem;
-  font-weight: bold;
+  font-weight: 700;
   margin: 0.25rem 0;
 }
 
diff --git a/core/profiles/demo_umami/themes/umami/css/components/blocks/banner/banner.css b/core/profiles/demo_umami/themes/umami/css/components/blocks/banner/banner.css
index 6e9567977ef5..45267bac6619 100644
--- a/core/profiles/demo_umami/themes/umami/css/components/blocks/banner/banner.css
+++ b/core/profiles/demo_umami/themes/umami/css/components/blocks/banner/banner.css
@@ -35,7 +35,6 @@
   font-family: 'Scope One', Georgia, serif;
   font-size: 1.2rem;
   font-weight: 400;
-  font-weight: normal;
   transition: background-color 0.5s ease;
 }
 
diff --git a/core/profiles/demo_umami/themes/umami/css/components/blocks/footer-promo/footer-promo.css b/core/profiles/demo_umami/themes/umami/css/components/blocks/footer-promo/footer-promo.css
index 8ee83eb5cf45..8476f1a6a836 100644
--- a/core/profiles/demo_umami/themes/umami/css/components/blocks/footer-promo/footer-promo.css
+++ b/core/profiles/demo_umami/themes/umami/css/components/blocks/footer-promo/footer-promo.css
@@ -9,7 +9,7 @@
 
 .block-type-footer-promo-block .block__title {
   font-size: 1.5rem;
-  font-weight: normal;
+  font-weight: 400;
 }
 
 .block-type-footer-promo-block .footer-promo-content {
@@ -19,7 +19,7 @@
 .block-type-footer-promo-block .footer-promo-content a {
   background-color: inherit;
   color: #fff;
-  font-weight: bold;
+  font-weight: 700;
 }
 
 .block-type-footer-promo-block .footer-promo-content a:active,
diff --git a/core/profiles/demo_umami/themes/umami/css/components/content/highlighted-bottom/highlighted-bottom.css b/core/profiles/demo_umami/themes/umami/css/components/content/highlighted-bottom/highlighted-bottom.css
index a7eb84f07adf..3f089a9997f5 100644
--- a/core/profiles/demo_umami/themes/umami/css/components/content/highlighted-bottom/highlighted-bottom.css
+++ b/core/profiles/demo_umami/themes/umami/css/components/content/highlighted-bottom/highlighted-bottom.css
@@ -13,7 +13,7 @@
 }
 
 .node--view-mode-highlighted-bottom .node__title {
-  font-weight: normal;
+  font-weight: 400;
   margin-bottom: 1rem;
 }
 
diff --git a/core/profiles/demo_umami/themes/umami/css/components/content/highlighted-medium/highlighted-medium.css b/core/profiles/demo_umami/themes/umami/css/components/content/highlighted-medium/highlighted-medium.css
index e3c4367f8f63..b1a03cc394c7 100644
--- a/core/profiles/demo_umami/themes/umami/css/components/content/highlighted-medium/highlighted-medium.css
+++ b/core/profiles/demo_umami/themes/umami/css/components/content/highlighted-medium/highlighted-medium.css
@@ -24,7 +24,7 @@
 }
 
 .node--view-mode-highlighted-medium .node__title {
-  font-weight: normal;
+  font-weight: 400;
   margin-bottom: 1rem;
 }
 
diff --git a/core/profiles/demo_umami/themes/umami/css/components/content/highlighted-small/highlighted-small.css b/core/profiles/demo_umami/themes/umami/css/components/content/highlighted-small/highlighted-small.css
index 741977482766..eefe796a2265 100644
--- a/core/profiles/demo_umami/themes/umami/css/components/content/highlighted-small/highlighted-small.css
+++ b/core/profiles/demo_umami/themes/umami/css/components/content/highlighted-small/highlighted-small.css
@@ -24,7 +24,7 @@
 }
 
 .node--view-mode-highlighted-small .node__title {
-  font-weight: normal;
+  font-weight: 400;
   margin-bottom: 1rem;
 }
 
diff --git a/core/profiles/demo_umami/themes/umami/css/components/content/highlighted-top/highlighted-top.css b/core/profiles/demo_umami/themes/umami/css/components/content/highlighted-top/highlighted-top.css
index 9326d1e8a251..901c4319fe64 100644
--- a/core/profiles/demo_umami/themes/umami/css/components/content/highlighted-top/highlighted-top.css
+++ b/core/profiles/demo_umami/themes/umami/css/components/content/highlighted-top/highlighted-top.css
@@ -45,7 +45,7 @@
 }
 
 .node--view-mode-highlighted-top .node__title {
-  font-weight: normal;
+  font-weight: 400;
   margin-bottom: 1rem;
 }
 
diff --git a/core/profiles/demo_umami/themes/umami/css/components/fields/label-items.css b/core/profiles/demo_umami/themes/umami/css/components/fields/label-items.css
index d8e8b99bf2a9..9ed36b682fa9 100644
--- a/core/profiles/demo_umami/themes/umami/css/components/fields/label-items.css
+++ b/core/profiles/demo_umami/themes/umami/css/components/fields/label-items.css
@@ -20,5 +20,5 @@
 }
 
 .label-items .field__label {
-  font-weight: normal;
+  font-weight: 400;
 }
diff --git a/core/profiles/demo_umami/themes/umami/css/components/navigation/menu-footer/menu-footer.css b/core/profiles/demo_umami/themes/umami/css/components/navigation/menu-footer/menu-footer.css
index 3f10ec99ac66..7fc705472015 100644
--- a/core/profiles/demo_umami/themes/umami/css/components/navigation/menu-footer/menu-footer.css
+++ b/core/profiles/demo_umami/themes/umami/css/components/navigation/menu-footer/menu-footer.css
@@ -9,7 +9,7 @@
 
 .menu-footer__title {
   font-size: 1.5rem;
-  font-weight: normal;
+  font-weight: 400;
 }
 
 .menu-footer__item {
@@ -18,7 +18,7 @@
 
 .menu-footer .menu-footer__link {
   background-color: transparent;
-  font-weight: bold;
+  font-weight: 700;
   color: #fff;
 }
 
-- 
GitLab