From c2ecf0ea237de6d3860422ad9acb1a7cf6980cc8 Mon Sep 17 00:00:00 2001 From: schnulller Date: Wed, 8 Jun 2022 00:03:08 +0200 Subject: [PATCH] Some minor style adjustments --- HaWeb/Views/Shared/_PublishForm.cshtml | 2 +- HaWeb/wwwroot/css/output.css | 45 ++++++++++++++++++++++---- HaWeb/wwwroot/css/site.css | 14 +++++--- 3 files changed, 48 insertions(+), 13 deletions(-) diff --git a/HaWeb/Views/Shared/_PublishForm.cshtml b/HaWeb/Views/Shared/_PublishForm.cshtml index d1dba96..cce4f02 100644 --- a/HaWeb/Views/Shared/_PublishForm.cshtml +++ b/HaWeb/Views/Shared/_PublishForm.cshtml @@ -57,7 +57,7 @@ document.getElementById("ha-lds-ellipsis-publish").style.display = "none"; document.getElementById("ha-publishmessage").style.opacity = "1"; document.getElementById("publish-result").value = "Erfolg!"; - @* location.reload(); *@ + location.reload(); } }) .catch ((e) => { diff --git a/HaWeb/wwwroot/css/output.css b/HaWeb/wwwroot/css/output.css index e204015..072bb2e 100644 --- a/HaWeb/wwwroot/css/output.css +++ b/HaWeb/wwwroot/css/output.css @@ -2052,18 +2052,32 @@ body { border-radius: 0.375rem; border-width: 2px; --tw-border-opacity: 1; - border-color: rgb(29 78 216 / var(--tw-border-opacity)); + border-color: rgb(37 99 235 / var(--tw-border-opacity)); padding-left: 0.75rem; padding-right: 0.75rem; } .ha-uploadcontainer .ha-publishfilelist .ha-publishfilelabel:hover { - --tw-bg-opacity: 1; - background-color: rgb(147 197 253 / var(--tw-bg-opacity)); + border-width: 2px; + --tw-border-opacity: 1; + border-color: rgb(30 64 175 / var(--tw-border-opacity)); + --tw-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1); + --tw-shadow-colored: 0 1px 3px 0 var(--tw-shadow-color), 0 1px 2px -1px var(--tw-shadow-color); + box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); +} + +.ha-uploadcontainer .ha-publishfilelist .ha-publishfilelabel:active { + --tw-shadow: inset 0 2px 4px 0 rgb(0 0 0 / 0.05); + --tw-shadow-colored: inset 0 2px 4px 0 var(--tw-shadow-color); + box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); } .ha-uploadcontainer .ha-availablefiles { cursor: pointer; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; border-width: 1px; --tw-border-opacity: 1; border-color: rgb(226 232 240 / var(--tw-border-opacity)); @@ -2156,8 +2170,16 @@ body { .ha-selectfilesform .ha-filelistfile { display: flex; flex-direction: row; + align-items: center; -moz-column-gap: 1rem; column-gap: 1rem; + padding-left: 0.25rem; + padding-right: 0.25rem; +} + +.ha-selectfilesform .ha-filelistfile:nth-child(even) { + --tw-bg-opacity: 1; + background-color: rgb(241 245 249 / var(--tw-bg-opacity)); } .ha-selectfilesform .ha-filelistlist { @@ -2172,7 +2194,6 @@ body { } .ha-selectfilesform .ha-filelistfile .ha-filelistusedproduction { - align-self: flex-start; font-size: 0.875rem; line-height: 1.25rem; } @@ -2220,14 +2241,24 @@ body { border-radius: 0.375rem; border-width: 2px; --tw-border-opacity: 1; - border-color: rgb(29 78 216 / var(--tw-border-opacity)); + border-color: rgb(37 99 235 / var(--tw-border-opacity)); padding-left: 0.75rem; padding-right: 0.75rem; } .ha-selectfilesform .ha-filelistbutton:hover { - --tw-bg-opacity: 1; - background-color: rgb(147 197 253 / var(--tw-bg-opacity)); + border-width: 2px; + --tw-border-opacity: 1; + border-color: rgb(30 64 175 / var(--tw-border-opacity)); + --tw-shadow: 0 1px 3px 0 rgb(0 0 0 / 0.1), 0 1px 2px -1px rgb(0 0 0 / 0.1); + --tw-shadow-colored: 0 1px 3px 0 var(--tw-shadow-color), 0 1px 2px -1px var(--tw-shadow-color); + box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); +} + +.ha-selectfilesform .ha-filelistbutton:active { + --tw-shadow: inset 0 2px 4px 0 rgb(0 0 0 / 0.05); + --tw-shadow-colored: inset 0 2px 4px 0 var(--tw-shadow-color); + box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); } /* Classes for Letter View */ diff --git a/HaWeb/wwwroot/css/site.css b/HaWeb/wwwroot/css/site.css index bda9d58..170b938 100644 --- a/HaWeb/wwwroot/css/site.css +++ b/HaWeb/wwwroot/css/site.css @@ -755,11 +755,11 @@ } .ha-uploadcontainer .ha-publishfilelist .ha-publishfilelabel { - @apply mt-4 ml-6 rounded-md px-3 border-2 border-blue-700 hover:bg-blue-300 cursor-pointer float-right; + @apply mt-4 ml-6 rounded-md px-3 border-2 border-blue-600 hover:border-2 hover:shadow active:shadow-inner hover:border-blue-800 cursor-pointer float-right; } .ha-uploadcontainer .ha-availablefiles { - @apply px-16 border border-slate-200 hover:border-slate-800 py-2 cursor-pointer + @apply px-16 border border-slate-200 hover:border-slate-800 py-2 cursor-pointer select-none } .ha-uploadcontainer .ha-availablefiles .ha-availablefilestitle { @@ -817,7 +817,11 @@ } .ha-selectfilesform .ha-filelistfile { - @apply flex flex-row gap-x-4 + @apply flex flex-row gap-x-4 px-1 items-center + } + + .ha-selectfilesform .ha-filelistfile:nth-child(even) { + @apply bg-slate-100 } .ha-selectfilesform .ha-filelistlist { @@ -829,7 +833,7 @@ } .ha-selectfilesform .ha-filelistfile .ha-filelistusedproduction { - @apply text-sm self-start + @apply text-sm } .ha-selectfilesform .ha-filelistfile .ha-filelistusedproduction .ha-filelistproduction { @@ -849,7 +853,7 @@ } .ha-selectfilesform .ha-filelistbutton { - @apply mt-4 ml-6 rounded-md px-3 border-2 border-blue-700 hover:bg-blue-300 cursor-pointer float-right; + @apply mt-4 ml-6 rounded-md px-3 border-2 border-blue-600 hover:border-2 hover:shadow active:shadow-inner hover:border-blue-800 cursor-pointer float-right; } /* Classes for Letter View */