From 7200cdfda9c9f7703fa776fe73214a41968a6ac7 Mon Sep 17 00:00:00 2001 From: poignatov Date: Wed, 14 Jan 2026 18:03:29 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=81=D0=BF=D0=B8=D1=81=D0=BA=D0=B0?= =?UTF-8?q?=20=D1=81=D0=BB=D0=BE=D0=B2=D0=B0=D1=80=D0=B5=D0=B9:=20=D0=BA?= =?UTF-8?q?=D1=80=D0=B5=D1=81=D1=82=D0=B8=D0=BA=20=D0=B8=20=D0=BE=D1=82?= =?UTF-8?q?=D1=81=D1=82=D1=83=D0=BF=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VERSION | 2 +- play-life-web/package.json | 2 +- play-life-web/src/App.jsx | 4 +++ .../src/components/DictionaryList.css | 35 ++++++++++++------- .../src/components/DictionaryList.jsx | 9 +++-- 5 files changed, 32 insertions(+), 20 deletions(-) diff --git a/VERSION b/VERSION index 95ed564..da71773 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.14.2 +3.14.3 diff --git a/play-life-web/package.json b/play-life-web/package.json index 62920a5..8ab4e8f 100644 --- a/play-life-web/package.json +++ b/play-life-web/package.json @@ -1,6 +1,6 @@ { "name": "play-life-web", - "version": "3.14.2", + "version": "3.14.3", "type": "module", "scripts": { "dev": "vite", diff --git a/play-life-web/src/App.jsx b/play-life-web/src/App.jsx index e90286c..e30a42e 100644 --- a/play-life-web/src/App.jsx +++ b/play-life-web/src/App.jsx @@ -755,6 +755,10 @@ function AppContent() { if (activeTab === 'priorities') { return 'px-4 md:px-8 py-0' } + // Для экрана словарей используем такие же отступы как для приоритетов + if (activeTab === 'dictionaries') { + return 'px-4 md:px-8 py-0' + } // Для остальных fullscreen экранов без отступов return 'p-0' } diff --git a/play-life-web/src/components/DictionaryList.css b/play-life-web/src/components/DictionaryList.css index fee7c7c..eadd421 100644 --- a/play-life-web/src/components/DictionaryList.css +++ b/play-life-web/src/components/DictionaryList.css @@ -1,31 +1,40 @@ .dictionary-list { padding-top: 0; position: relative; + padding-bottom: 5rem; } -.dictionary-back-button { - position: absolute; - top: 0; - left: 0; - background: transparent; +.dictionary-close-button { + position: fixed; + top: 1rem; + right: 1rem; + background: rgba(255, 255, 255, 0.9); border: none; - border-radius: 8px; - padding: 0.5rem; + font-size: 1.5rem; + color: #7f8c8d; cursor: pointer; - color: #2c3e50; - transition: all 0.2s; - z-index: 10; + width: 40px; + height: 40px; + display: flex; + align-items: center; + justify-content: center; + border-radius: 50%; + transition: background-color 0.2s, color 0.2s; + z-index: 1600; + box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15); } -.dictionary-back-button:hover { - background: rgba(0, 0, 0, 0.05); +.dictionary-close-button:hover { + background-color: #ffffff; + color: #2c3e50; } .dictionaries-grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(150px, 1fr)); gap: 1rem; - padding-top: 2.5rem; + padding-top: 4rem; + margin-bottom: 1rem; } .dictionary-card { diff --git a/play-life-web/src/components/DictionaryList.jsx b/play-life-web/src/components/DictionaryList.jsx index b64c5fa..26a0bb2 100644 --- a/play-life-web/src/components/DictionaryList.jsx +++ b/play-life-web/src/components/DictionaryList.jsx @@ -115,14 +115,13 @@ function DictionaryList({ onNavigate, refreshTrigger = 0 }) { return (
- {/* Кнопка назад */} + {/* Кнопка закрытия */}