From 3a8021f9b3cdca382ab53d6638ee376060b19cb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=91=D0=B0=D0=BA=D0=B0?= =?UTF-8?q?=D0=BB=D1=8C=D1=81=D0=BA=D0=B0=D1=8F?= Date: Wed, 1 May 2024 13:29:44 +0400 Subject: [PATCH 1/2] =?UTF-8?q?=D0=B4=D0=BE=D0=BF=D0=B8=D0=BB=D0=B8=D0=BB?= =?UTF-8?q?=D0=B0=20=D1=84=D0=BE=D1=80=D0=BC=D1=83=20=D1=81=D0=BE=D0=B7?= =?UTF-8?q?=D0=B4=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BB=D0=B5=D0=BA=D0=B0=D1=80?= =?UTF-8?q?=D1=81=D1=82=D0=B2=20=D0=B8=20=D1=80=D0=B5=D1=86=D0=B5=D0=BF?= =?UTF-8?q?=D1=82=D0=BE=D0=B2=20=D0=BF=D0=BE=20=D0=BA=D1=80=D0=B0=D1=81?= =?UTF-8?q?=D0=BE=D1=82=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Home/CreateMedicament.cshtml | 43 +++----------- .../Views/Home/CreateRecipe.cshtml | 4 +- .../wwwroot/css/site.css | 57 +++++++++++++------ 3 files changed, 50 insertions(+), 54 deletions(-) diff --git a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/CreateMedicament.cshtml b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/CreateMedicament.cshtml index 45e6cd6..85007bc 100644 --- a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/CreateMedicament.cshtml +++ b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/CreateMedicament.cshtml @@ -9,7 +9,7 @@
-
+

@@ -33,7 +33,7 @@ Выбор процедуры:

+
+
+ +

Выбор симптома:

- - @*
- - - - - - - - @{ - int cRows = 20; - for (int i = 1; i <= cRows; i++) - { - - - - - } - } - -
- Выбранное из процедур: -
Процедура № @i - - - - - -
- -
*@
diff --git a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/CreateRecipe.cshtml b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/CreateRecipe.cshtml index 5ae840c..962e879 100644 --- a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/CreateRecipe.cshtml +++ b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/CreateRecipe.cshtml @@ -9,7 +9,7 @@ -
+

@@ -45,7 +45,7 @@

-
+
diff --git a/Polyclinic/PolyclinicWebAppSuretor/wwwroot/css/site.css b/Polyclinic/PolyclinicWebAppSuretor/wwwroot/css/site.css index 83ba528..880d2d7 100644 --- a/Polyclinic/PolyclinicWebAppSuretor/wwwroot/css/site.css +++ b/Polyclinic/PolyclinicWebAppSuretor/wwwroot/css/site.css @@ -1,24 +1,24 @@ html { - font-size: 14px; + font-size: 14px; } @media (min-width: 768px) { - html { - font-size: 16px; - } + html { + font-size: 16px; + } } .btn:focus, .btn:active:focus, .btn-link.nav-link:focus, .form-control:focus, .form-check-input:focus { - box-shadow: 0 0 0 0.1rem white, 0 0 0 0.25rem #258cfb; + box-shadow: 0 0 0 0.1rem white, 0 0 0 0.25rem #258cfb; } html { - position: relative; - min-height: 100%; + position: relative; + min-height: 100%; } body { - margin-bottom: 60px; + margin-bottom: 60px; } .bi-edit-pen { @@ -27,9 +27,9 @@ body { transition: transform 0.3s; } -.bi-edit-pen:hover{ - transform: scale(1.5); -} + .bi-edit-pen:hover { + transform: scale(1.5); + } .bi-cart-delete { color: red; @@ -37,12 +37,21 @@ body { transition: transform 0.3s; } -.form-create-recipe{ +.form-create-recipe { color: white; background-color: rgb(66, 132, 112) -}S +} -.create-recipe{ +.form-create-medicament { + color: white; + background-color: rgb(65, 154, 162) +} + +.recipe-info { + text-shadow: 0px 4px 8px rgba(6, 25, 16, 0.8); +} + +.create-recipe { background-color: rgb(145, 195, 128) } @@ -54,31 +63,45 @@ body { transition: transform 0.3s; } -.table-recipe-create{ +.table-recipe-create { font-size: 2.5vh; color: white; } +.proc-list{ + border: dashed; +} + .button-save-recipe:hover { transform: scale(1.3); color: white; background-color: rgb(6, 25, 16); } -.button-save-recipe{ +.button-save-recipe { width: 20vh; height: 8vh; background-color: rgb(16, 58, 39); color: white; transition: transform 0.3s; + box-shadow: 0px 4px 8px rgba(6, 25, 16, 0.8); } .button-save-medicament:hover { transform: scale(1.3); color: white; + background-color: rgb(26, 67, 71) } .button-save-medicament { + width: 20vh; + height: 8vh; color: white; transition: transform 0.3s; -} \ No newline at end of file + background-color: rgb(40, 92, 97); + box-shadow: 0px 4px 8px rgba(26, 67, 71, 1); /* , , , */ +} + +.medicament-info { + text-shadow: 0px 4px 8px rgba(26, 67, 71, 1); /* , , , */ +} From 2b8a670018e2c777ef84628d4ed3b853eccb61cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=91=D0=B0=D0=BA=D0=B0?= =?UTF-8?q?=D0=BB=D1=8C=D1=81=D0=BA=D0=B0=D1=8F?= Date: Wed, 1 May 2024 13:47:38 +0400 Subject: [PATCH 2/2] =?UTF-8?q?=D0=B4=D0=BE=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB?= =?UTF-8?q?=D0=B0=20=D1=84=D0=BE=D1=80=D0=BC=D1=8B=20=D1=81=D0=BE=D0=B7?= =?UTF-8?q?=D0=B4=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B8=20=D1=81=D0=BF=D0=B8?= =?UTF-8?q?=D1=81=D0=BA=D0=B0=20=D0=B3=D0=BB=D0=B0=D0=B2=D0=BD=D1=8B=D1=85?= =?UTF-8?q?=20=D1=81=D1=83=D1=89=D0=BD=D0=BE=D1=81=D1=82=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Home/CreateMedicament.cshtml | 2 +- .../Views/Home/CreateProcedure.cshtml | 29 +++++++++++++++++-- .../Views/Home/Medicaments.cshtml | 2 +- .../Views/Home/Procedures.cshtml | 9 +++--- .../wwwroot/css/site.css | 26 ++++++++++++++++- 5 files changed, 59 insertions(+), 9 deletions(-) diff --git a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/CreateMedicament.cshtml b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/CreateMedicament.cshtml index 85007bc..d2823fa 100644 --- a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/CreateMedicament.cshtml +++ b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/CreateMedicament.cshtml @@ -44,8 +44,8 @@ -
+

Выбор симптома: diff --git a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/CreateProcedure.cshtml b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/CreateProcedure.cshtml index 1269586..91fd8ec 100644 --- a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/CreateProcedure.cshtml +++ b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/CreateProcedure.cshtml @@ -7,6 +7,31 @@

Создание процедуры

-
+ -
\ No newline at end of file +
+ +
+

+ Название: +

+ +
+ +
+

+ Комментарий: +

+ +
+ +
+
+
+
+ +
+
+ \ No newline at end of file diff --git a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Medicaments.cshtml b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Medicaments.cshtml index 2e9c30b..1217c28 100644 --- a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Medicaments.cshtml +++ b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Medicaments.cshtml @@ -61,7 +61,7 @@ При особом неврозе употребляйте каждый день и спина не будет болеть
- + diff --git a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Procedures.cshtml b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Procedures.cshtml index 91057a5..31c7bb1 100644 --- a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Procedures.cshtml +++ b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Procedures.cshtml @@ -60,10 +60,11 @@ ммммммм - - - - + + + + + diff --git a/Polyclinic/PolyclinicWebAppSuretor/wwwroot/css/site.css b/Polyclinic/PolyclinicWebAppSuretor/wwwroot/css/site.css index 880d2d7..646955c 100644 --- a/Polyclinic/PolyclinicWebAppSuretor/wwwroot/css/site.css +++ b/Polyclinic/PolyclinicWebAppSuretor/wwwroot/css/site.css @@ -68,7 +68,7 @@ body { color: white; } -.proc-list{ +.proc-list { border: dashed; } @@ -78,6 +78,30 @@ body { background-color: rgb(6, 25, 16); } +.form-create-procedure{ + color: white; + background-color: rgb(149, 100, 197) +} + +.button-save-procedure { + width: 20vh; + height: 8vh; + background-color: rgb(70, 42, 98); + color: white; + transition: transform 0.3s; + box-shadow: 0px 4px 8px rgba(49, 29, 7); +} + +.procedure-info { + text-shadow: 0px 4px 8px rgba(49, 29, 7); +} + +.button-save-procedure:hover { + transform: scale(1.3); + color: white; + background-color: rgb(49, 29, 70); +} + .button-save-recipe { width: 20vh; height: 8vh;