From 38663a5aad9cb1943d610df67a9b31230ab0a948 Mon Sep 17 00:00:00 2001 From: esoe Date: Thu, 22 Feb 2024 16:15:13 +0300 Subject: [PATCH] qqq --- pom.xml | 1 + src/main/webapp/content/md/README.md | 4 ++-- src/main/webapp/layout/styles.css | 7 ++++--- target/home.war | Bin 823570 -> 823613 bytes target/home/content/md/README.md | 4 ++-- target/home/layout/styles.css | 7 ++++--- .../compile/default-compile/inputFiles.lst | 10 +++++----- 7 files changed, 18 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 491f6df..1ef1637 100644 --- a/pom.xml +++ b/pom.xml @@ -110,6 +110,7 @@ molokoin.ru 9990 + esoe psalm6912 home.war diff --git a/src/main/webapp/content/md/README.md b/src/main/webapp/content/md/README.md index 8ccef61..a219b9b 100644 --- a/src/main/webapp/content/md/README.md +++ b/src/main/webapp/content/md/README.md @@ -1,7 +1,7 @@ # Основные задачи - Файлообменник - Заметки -- Судостроение +- Расчет корпуса судна ## Файлообменник ### Общие требования @@ -58,7 +58,7 @@ __Файлы:__ --- - -получить перечень файлов в директории + - получить перечень файлов в текущей директории ## Заметки ### Общие требования diff --git a/src/main/webapp/layout/styles.css b/src/main/webapp/layout/styles.css index 4944d23..117da74 100644 --- a/src/main/webapp/layout/styles.css +++ b/src/main/webapp/layout/styles.css @@ -34,7 +34,8 @@ aside{ color: #fff; background-color: rgba(25, 25, 25, 0.8); width: 20%; - height: 700px; + /* height: 700px; */ + height: calc(100vh - 7rem); margin-top: 7rem; /* padding: 5px; */ } @@ -56,12 +57,12 @@ aside a:hover{ main{ display: inline-block; /* position: absolute; */ - /* height: 700px; */ width: 80%; background-color: rgba(25, 25, 25, 0.2); - /* padding-left: 10%; */ margin-top: 7rem; margin-left: 20%; + padding-left: 10px; + /* height: calc(100vh - 7rem); */ } div{ /* display: block; */ diff --git a/target/home.war b/target/home.war index 5634d70e6c62d70a899c6892906a7d1907f0da37..f0c0fce1c2f3bfd0bd18fd0e7b5ef8e945bbc279 100644 GIT binary patch delta 4738 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 delta 4583 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