From 4c906261e4d77aa709e5dc66c9b6886120006ce2 Mon Sep 17 00:00:00 2001 From: roberto Date: Thu, 21 Nov 2024 18:14:12 +0100 Subject: [PATCH] CSS rework --- assets/static/css/main.css | 297 ++++++++++++++++++++++++- assets/static/css/orig.css | 263 ---------------------- assets/static/js/serviceWorker.js | 2 +- assets/templates/base.tmpl | 13 +- assets/templates/full.tmpl | 1 - assets/templates/items/form.tmpl | 50 ++--- assets/templates/items/read.tmpl | 10 +- assets/templates/items/view.tmpl | 14 +- assets/templates/pages/home.tmpl | 2 +- assets/templates/pages/home_items.tmpl | 10 +- 10 files changed, 343 insertions(+), 319 deletions(-) diff --git a/assets/static/css/main.css b/assets/static/css/main.css index 3ea432d..c093031 100644 --- a/assets/static/css/main.css +++ b/assets/static/css/main.css @@ -84,6 +84,34 @@ body { min-height: 100vh; } +.modal { + z-index: 100; + padding-top: 100px; + position: fixed; + left: 0; + top: 0; + width: 100%; + height: 100%; + overflow: auto; + background-color: rgb(0, 0, 0); + background-color: rgba(0, 0, 0, 0.4); + display: block; +} + +.modal-content { + margin: auto; + background-color: #fff; + position: relative; + padding: 0; + outline: 0; + width: 600px; + color: rgb(84, 84, 84); +} + +.modal-content h5 { + font-weight: 600 !important; +} + .display-topleft { position: absolute; left: 0; @@ -179,7 +207,7 @@ ul li:last-child { border-bottom: none } -.row:after { +.row:after, .row:before { content:""; display:table; clear:both @@ -230,6 +258,21 @@ button { padding: 10px 18px; } +button.main, .button.main { + background-color: var(--primary-color); + color: #ffffff; +} + +button.secondary, .button.secondary { + background-color: #4d4d4d; + color: #ffffff; +} + +button.delete, .button.delete { + background-color: #aa2222; + color: #ffffff; +} + fieldset { border-radius: 8px; } @@ -258,6 +301,11 @@ input[type='radio'] { accent-color: var(--primary-color); } +input[type='text']{ + height: 37px; + padding: 3px; +} + .label-checkbox { top: 4px; position: relative; @@ -460,6 +508,15 @@ input[type='radio'] { margin-left: 2px !important; } +.item-card { + position: relative; + background-color: #ffffff; + box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12); + border-radius: 8px; + padding: 10px; + margin: 10px; +} + .menu-item-title:hover, #settings_menu a:hover{ border-radius: 8px; background-color: var(--primary-color); @@ -471,7 +528,7 @@ input[type='radio'] { } #page-content { - padding-top: 4px; + padding-top: 60px; padding-left: 4px; padding-right: 4px; } @@ -505,6 +562,7 @@ input[type='radio'] { border-right: 1px solid #ccc !important; border-left: 1px solid #ccc !important; border-top: 1px solid #ccc !important; + font-weight: bold; } .tab-button.active, @@ -530,6 +588,103 @@ input[type='radio'] { font-size: 1rem; } +.bar { + width: 100%; + overflow: hidden +} + +.center .bar { + display: inline-block; + width: auto +} + +.bar .bar-item { + padding: 6px 16px; + float: left; + width: auto; + border: none; + display: block; + outline: 0 +} + +.bar .button { + white-space: normal +} + +.bar-block .bar-item { + width: 100%; + display: block; + padding: 8px 16px; + text-align: left; + border: none; + white-space: normal; + float: none; + outline: 0 +} + +.bar-block.center .bar-item { + text-align: center +} + +.col, +.half, +.third, +.twothird, +.threequarter, +.quarter { + float: left; + width: 100% +} + +.col.s1 { + width: 8.33333% +} + +.col.s2 { + width: 16.66666% +} + +.col.s3 { + width: 24.99999% +} + +.col.s4 { + width: 33.33333% +} + +.col.s5 { + width: 41.66666% +} + +.col.s6 { + width: 49.99999% +} + +.col.s7 { + width: 58.33333% +} + +.col.s8 { + width: 66.66666% +} + +.col.s9 { + width: 74.99999% +} + +.col.s10 { + width: 83.33333% +} + +.col.s11 { + width: 91.66666% +} + +.col.s12 { + width: 99.99999% +} + + .ss-main { padding: 3px; } @@ -646,9 +801,95 @@ input[type='radio'] { } } +/* Min medium */ +@media (min-width:601px) { + .home-card-summary { + height: 250px; + overflow: auto; + } + + #quickbox { + width: 400px; + position: fixed; + top: 50px; + left: calc(100vw - 420px); + height: calc(100vh - 50px); + background-color: #fff !important; + border-left: 2px solid #fff; + border-top: 2px solid #fff; + } + #quickbox-top-bar { + position: relative; + } + #quickbox-footer { + position: relative; + } + + #quickbox-content { + height: calc(100vh - var(--quickbox-footer-height) - var(--quickbox-footer-height) - 42px); + } +} + /* Medium */ @media (max-width: 768px) { + .col.m1 { + width: 8.33333% + } + .col.m2 { + width: 16.66666% + } + + .col.m3, + .w3-quarter { + width: 24.99999% + } + + .col.m4, + .w3-third { + width: 33.33333% + } + + .col.m5 { + width: 41.66666% + } + + .col.m6, + .w3-half { + width: 49.99999% + } + + .col.m7 { + width: 58.33333% + } + + .col.m8, + .w3-twothird { + width: 66.66666% + } + + .col.m9, + .w3-threequarter { + width: 74.99999% + } + + .col.m10 { + width: 83.33333% + } + + .col.m11 { + width: 91.66666% + } + + .col.m12 { + width: 99.99999% + } +} + +@media (min-width:60px) { + .col.half { + width: 49.99999%; + } } @media (max-width:993px) and (min-width:768px) { @@ -658,6 +899,54 @@ input[type='radio'] { } @media (min-width:993px) { + .col.l1 { + width: 8.33333% + } + + .col.l2 { + width: 16.66666% + } + + .col.l3 { + width: 24.99999% + } + + .col.l4 { + width: 33.33333% + } + + .col.l5 { + width: 41.66666% + } + + .col.l6 { + width: 49.99999% + } + + .col.l7 { + width: 58.33333% + } + + .col.l8 { + width: 66.66666% + } + + .col.l9 { + width: 74.99999% + } + + .col.l10 { + width: 83.33333% + } + + .col.l11 { + width: 91.66666% + } + + .col.l12 { + width: 99.99999% + } + .hide-large { display: none !important } @@ -666,11 +955,11 @@ input[type='radio'] { display: block !important; } - .w3-row > .w3-half:first { + .row > .w3-half:first { padding-right: 4px; } - .w3-row > .w3-half:nth-child(2) { + .row > .w3-half:nth-child(2) { padding-left: 4px; } diff --git a/assets/static/css/orig.css b/assets/static/css/orig.css index 7a3237e..592cdb6 100644 --- a/assets/static/css/orig.css +++ b/assets/static/css/orig.css @@ -72,78 +72,6 @@ transition: margin-left .4s } -.w3-modal { - z-index: 100; - padding-top: 100px; - position: fixed; - left: 0; - top: 0; - width: 100%; - height: 100%; - overflow: auto; - background-color: rgb(0, 0, 0); - background-color: rgba(0, 0, 0, 0.4); - display: block; -} - -.w3-modal-content { - margin: auto; - background-color: #fff; - position: relative; - padding: 0; - outline: 0; - width: 600px; - color: rgb(84, 84, 84); -} - -.w3-modal-content h5 { - font-weight: 600 !important; -} - -.w3-bar { - width: 100%; - overflow: hidden -} - -.w3-center .w3-bar { - display: inline-block; - width: auto -} - -.w3-bar .w3-bar-item { - padding: 6px 16px; - float: left; - width: auto; - border: none; - display: block; - outline: 0 -} - -.w3-bar .w3-dropdown-hover, -.w3-bar .w3-dropdown-click { - position: static; - float: left -} - -.w3-bar .w3-button { - white-space: normal -} - -.w3-bar-block .w3-bar-item { - width: 100%; - display: block; - padding: 8px 16px; - text-align: left; - border: none; - white-space: normal; - float: none; - outline: 0 -} - -.w3-bar-block.w3-center .w3-bar-item { - text-align: center -} - .w3-block { display: block; width: 100% @@ -173,169 +101,6 @@ clear: both } -.w3-col, -.w3-half, -.w3-third, -.w3-twothird, -.w3-threequarter, -.w3-quarter { - float: left; - width: 100% -} - -.w3-col.s1 { - width: 8.33333% -} - -.w3-col.s2 { - width: 16.66666% -} - -.w3-col.s3 { - width: 24.99999% -} - -.w3-col.s4 { - width: 33.33333% -} - -.w3-col.s5 { - width: 41.66666% -} - -.w3-col.s6 { - width: 49.99999% -} - -.w3-col.s7 { - width: 58.33333% -} - -.w3-col.s8 { - width: 66.66666% -} - -.w3-col.s9 { - width: 74.99999% -} - -.w3-col.s10 { - width: 83.33333% -} - -.w3-col.s11 { - width: 91.66666% -} - -.w3-col.s12 { - width: 99.99999% -} - -@media (min-width:601px) { - .w3-col.m1 { - width: 8.33333% - } - - .w3-col.m2 { - width: 16.66666% - } - - .w3-col.m3, - .w3-quarter { - width: 24.99999% - } - - .w3-col.m4, - .w3-third { - width: 33.33333% - } - - .w3-col.m5 { - width: 41.66666% - } - - .w3-col.m6, - .w3-half { - width: 49.99999% - } - - .w3-col.m7 { - width: 58.33333% - } - - .w3-col.m8, - .w3-twothird { - width: 66.66666% - } - - .w3-col.m9, - .w3-threequarter { - width: 74.99999% - } - - .w3-col.m10 { - width: 83.33333% - } - - .w3-col.m11 { - width: 91.66666% - } - - .w3-col.m12 { - width: 99.99999% - } -} - -@media (min-width:993px) { - .w3-col.l1 { - width: 8.33333% - } - - .w3-col.l2 { - width: 16.66666% - } - - .w3-col.l3 { - width: 24.99999% - } - - .w3-col.l4 { - width: 33.33333% - } - - .w3-col.l5 { - width: 41.66666% - } - - .w3-col.l6 { - width: 49.99999% - } - - .w3-col.l7 { - width: 58.33333% - } - - .w3-col.l8 { - width: 66.66666% - } - - .w3-col.l9 { - width: 74.99999% - } - - .w3-col.l10 { - width: 83.33333% - } - - .w3-col.l11 { - width: 91.66666% - } - - .w3-col.l12 { - width: 99.99999% - } -} - .w3-rest { overflow: hidden } @@ -1238,33 +1003,5 @@ table.stickyheader.searchopened thead { } } -/* Min medium */ -@media (min-width:601px) { - .home-card-summary { - height: 250px; - overflow: auto; - } - #quickbox { - width: 400px; - position: fixed; - top: 50px; - left: calc(100vw - 420px); - height: calc(100vh - 50px); - background-color: #fff !important; - border-left: 2px solid #fff; - border-top: 2px solid #fff; - } - #quickbox-top-bar { - position: relative; - } - #quickbox-footer { - position: relative; - } - - #quickbox-content { - height: calc(100vh - var(--quickbox-footer-height) - var(--quickbox-footer-height) - 42px); - } - -} diff --git a/assets/static/js/serviceWorker.js b/assets/static/js/serviceWorker.js index b66580f..6213938 100644 --- a/assets/static/js/serviceWorker.js +++ b/assets/static/js/serviceWorker.js @@ -1,4 +1,4 @@ -const cacheVersion = "0.281" +const cacheVersion = "0.282" const cacheName = "speedtech-brainminder" const cacheFiles = [ '/static/bootstrap-icons/font/bootstrap-icons.min.css', diff --git a/assets/templates/base.tmpl b/assets/templates/base.tmpl index 787a00e..6a2e45b 100644 --- a/assets/templates/base.tmpl +++ b/assets/templates/base.tmpl @@ -9,7 +9,6 @@ - {{block "page:meta" . }} @@ -49,8 +48,8 @@
-