From 8ab30c95d07cba7c1dd57762dca5e852703e8663 Mon Sep 17 00:00:00 2001
From: Tatiana Fokina <fokinatatian@gmail.com>
Date: Fri, 11 Aug 2023 22:08:52 +0400
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=BB=D1=83=D1=87=D1=88=D0=B0=D0=B5?=
 =?UTF-8?q?=D1=82=20=D0=B1=D0=BB=D0=BE=D0=BA=20=D1=81=20Baseline=20(#1187)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Улучшает разметку

* Возится со стилями
---
 src/includes/blocks/baseline.njk | 18 +++++++++---------
 src/styles/blocks/baseline.css   | 22 +++++++++++-----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/includes/blocks/baseline.njk b/src/includes/blocks/baseline.njk
index 2f898e485..17ea955d2 100644
--- a/src/includes/blocks/baseline.njk
+++ b/src/includes/blocks/baseline.njk
@@ -1,29 +1,29 @@
 <div class="wdi-browser-compat">
-  <span class="wdi-browser-compat__label">Поддержка в браузерах</span>
+  <span class="wdi-browser-compat__label">Поддержка в браузерах:</span>
   <ul class="wdi-browser-compat__items">
     {% for browser in baseline.keys %}
       <li class="wdi-browser-compat__item">
         <span class="wdi-browser-compat__icon" data-browser="{{ browser }}">
           {% if baseline.supported[browser] %}
-              <span class="visually-hidden">{{ baseline.names[browser] }} {{ baseline.versions[browser] }}, Поддерживается</span>
+              <span class="visually-hidden">{{ baseline.names[browser] }} {{ baseline.versions[browser] }}, поддерживается</span>
             </span>
-            <span aria-label="Поддерживается" title="Поддерживается" class="wdi-browser-compat__version" data-compat="yes">{{ baseline.versions[browser] }}</span>
+            <span class="wdi-browser-compat__version" aria-hidden="true" data-compat="yes">{{ baseline.versions[browser] }}</span>
           {% elif baseline.flagged[browser] %}
             <span class="wdi-browser-compat__icon" data-browser="firefox">
-              <span class="visually-hidden">{{ baseline.names[browser] }} {{ baseline.versions[browser] }}, За флагом</span>
+              <span class="visually-hidden">{{ baseline.names[browser] }} {{ baseline.versions[browser] }}, за флагом</span>
             </span>
-            <span aria-label="За флагом" title="За флагом" class="wdi-browser-compat__version" data-compat="flag">
+            <span class="wdi-browser-compat__version" aria-hidden="true" data-compat="flag">
             </span>
           {% elif baseline.preview[browser] %}
             <span class="wdi-browser-compat__icon" data-browser="safari">
-              <span class="visually-hidden">{{ baseline.names[browser] }}, Превью</span>
+              <span class="visually-hidden">{{ baseline.names[browser] }}, превью</span>
             </span>
-            <span aria-label="Превью" title="Превью"> class="wdi-browser-compat__version" data-compat="preview"</span>
+            <span class="wdi-browser-compat__version" aria-hidden="true" data-compat="preview"></span>
           {% else %}
             <span class="wdi-browser-compat__icon" data-browser="edge">
-              <span class="visually-hidden">{{ baseline.names[browser] }}, Не поддерживается</span>
+              <span class="visually-hidden">{{ baseline.names[browser] }}, не поддерживается</span>
             </span>
-            <span aria-label="Не поддерживается" title="Не поддерживается" class="wdi-browser-compat__version" data-compat="no"></span>
+            <span class="wdi-browser-compat__version" aria-hidden="true" data-compat="no"></span>
           {% endif %}
       </li>
     {% endfor %}
diff --git a/src/styles/blocks/baseline.css b/src/styles/blocks/baseline.css
index e3e90d76f..784a34b5a 100644
--- a/src/styles/blocks/baseline.css
+++ b/src/styles/blocks/baseline.css
@@ -1,23 +1,18 @@
 .wdi-browser-compat {
   max-width: 87.5%;
+  margin-block-start: 40px;
   align-items: center;
-  color: var(--wdi-text-color, #585b63);
+  color: var(--color-light);
   display: flex;
   flex-wrap: wrap;
 }
 
-.wdi-browser-compat__label {
-  color: var(--wdi-text-color, #585b63);
-  flex: 0 0 100%;
-  font-style: normal;
-  margin-right: 1rem;
-  width: 100%;
-}
-
 .wdi-browser-compat__items {
   display: flex;
-  margin: 1rem 1rem 1rem 0;
+  flex-wrap: wrap;
+  margin: 1rem 0;
   padding: 0;
+  gap: 24px;
   list-style: none;
 }
 
@@ -30,7 +25,6 @@
 .wdi-browser-compat__icon {
   display: inline-block;
   height: 24px;
-  margin-left: 24px;
   margin-right: 6px;
   width: 24px;
   background-repeat: no-repeat no-repeat;
@@ -114,3 +108,9 @@
     margin-left: auto;
   }
 }
+
+@media (min-width: 600px) {
+  .wdi-browser-compat__label {
+    margin-right: 24px;
+  }
+}