diff --git a/assets/static/css/main.css b/assets/static/css/main.css index c197a46..89ed591 100644 --- a/assets/static/css/main.css +++ b/assets/static/css/main.css @@ -63,7 +63,7 @@ a { body { color: #000 !important; - background-color: #f1f1f1 !important; + background-color: #f1f1f1; } html { @@ -184,7 +184,7 @@ ul { } ul li { - padding: 8px 16px; + padding: 8px 0px; border-bottom: 1px solid #ddd } @@ -371,7 +371,6 @@ th.operations, td.operations { } #form-login { - width: 600px; background-color: var(--primary-color); color: #ffffff; position: absolute; @@ -910,12 +909,8 @@ dialog { z-index:100; } -#dialog-container dialog { - position: fixed; - left: 0; - top: 0; - width: 100%; - height: auto; +dialog::backdrop { + opacity: 0.7; } dialog header { @@ -936,6 +931,18 @@ dialog .content { /* Small */ @media (max-width: 568px) { + body.full { + background-color: var(--primary-color); + } + + body.full input { + padding: 4px; + } + + #form-login { + width: 100%; + } + #page-title-container { display: flex; align-items: center; @@ -1006,6 +1013,7 @@ dialog .content { /* Min medium */ @media (min-width:601px) { + .home-card-summary { height: 250px; overflow: auto; @@ -1014,12 +1022,12 @@ dialog .content { #quickbox { width: 400px; position: fixed; - top: 50px; + top: 54px; left: calc(100vw - 420px); - height: calc(100vh - 50px); + height: calc(100vh - 46px); background-color: #fff !important; - border-left: 2px solid #fff; - border-top: 2px solid #fff; + border: 2px solid var(--primary-color); + border-radius: 8px; } #quickbox-top-bar { position: relative; @@ -1036,6 +1044,10 @@ dialog .content { /* Medium */ @media (min-width: 768px) { + #form-login{ + width: 600px; + } + .col.m1 { width: 8.33333% } diff --git a/assets/static/js/main.js b/assets/static/js/main.js index c84188e..78cc58f 100644 --- a/assets/static/js/main.js +++ b/assets/static/js/main.js @@ -180,14 +180,18 @@ document.addEventListener("DOMContentLoaded", function(event){ if (event.target.classList.contains("close-dialog")) { event.target.closest('dialog').close(); } - }) + }); - document.querySelector('#dialog-container').addEventListener('click', (event) => { + document.querySelector('body').addEventListener('click', (event) => { if (event.target.classList.contains("close-dialog")) { - event.target.closest('dialog').close(); - event.target.closest('dialog').remove(); + event.target.closest('#dialog').close(); + event.target.closest('#dialog').remove(); } - }) + }); + + document.body.addEventListener("showModalDialog", function(evt){ + document.getElementById("dialog").showModal(); + }); document.body.addEventListener("quickboxNoteClear", function(evt){ document.getElementById("quickbox-note").value = '' diff --git a/assets/templates/base.tmpl b/assets/templates/base.tmpl index 51e9530..135941e 100644 --- a/assets/templates/base.tmpl +++ b/assets/templates/base.tmpl @@ -17,7 +17,7 @@ end }} - + {{template "partial:sidebar" .}}
@@ -45,7 +45,6 @@ {{template "partial:footer" .}}
-
diff --git a/assets/templates/full.tmpl b/assets/templates/full.tmpl index a14066b..cbcee88 100644 --- a/assets/templates/full.tmpl +++ b/assets/templates/full.tmpl @@ -14,11 +14,10 @@ end }} - +
{{template "page:content" .}}
- {{template "partial:footer" .}} {{ end }} diff --git a/assets/templates/items/all_list_rows.tmpl b/assets/templates/items/all_list_rows.tmpl index 2902653..7f6d4b7 100644 --- a/assets/templates/items/all_list_rows.tmpl +++ b/assets/templates/items/all_list_rows.tmpl @@ -42,7 +42,7 @@ {{ template "item:add_to_dashboard" .Id }} {{ end }} - + diff --git a/assets/templates/items/list_rows.tmpl b/assets/templates/items/list_rows.tmpl index da75fd8..a7dbc3a 100644 --- a/assets/templates/items/list_rows.tmpl +++ b/assets/templates/items/list_rows.tmpl @@ -50,7 +50,7 @@ {{ template "item:add_to_dashboard" .Id }} {{ end }} - + diff --git a/assets/templates/items/read.tmpl b/assets/templates/items/read.tmpl index 9aa78f5..8ade496 100644 --- a/assets/templates/items/read.tmpl +++ b/assets/templates/items/read.tmpl @@ -21,10 +21,9 @@ {{ template "item:relations_view" .}}
-
+
{{if gt (len .item.Categories) 0 }} - - Categories +

Categories

{{ range (stringToArray .item.Categories "|")}} {{ $category_name := index $.categoriesMap .}}
@@ -33,10 +32,10 @@ {{ end }} {{ end }}
-
+
{{if gt (len .item.Tags) 0 }} - - Tags {{ range (stringToArray .item.Tags ",")}} +

Tags

+ {{ range (stringToArray .item.Tags ",")}}
{{ . }}
diff --git a/assets/templates/items/share.tmpl b/assets/templates/items/share.tmpl index e869d09..083d97b 100644 --- a/assets/templates/items/share.tmpl +++ b/assets/templates/items/share.tmpl @@ -1,5 +1,5 @@ {{define "page:content"}} - +
Share item
diff --git a/assets/templates/items/view.tmpl b/assets/templates/items/view.tmpl index 2f7e466..ad9a2b7 100644 --- a/assets/templates/items/view.tmpl +++ b/assets/templates/items/view.tmpl @@ -1,5 +1,5 @@ {{define "page:content"}} - +
{{.item.Type_title}} : {{.item.Title}}
diff --git a/assets/templates/pages/home_items.tmpl b/assets/templates/pages/home_items.tmpl index d668ca2..c886e9a 100644 --- a/assets/templates/pages/home_items.tmpl +++ b/assets/templates/pages/home_items.tmpl @@ -16,14 +16,14 @@
- {{.Title}} + {{.Title}} {{.Title}}
{{.Summary | markdownfy | safeHTML}}
- +
diff --git a/assets/templates/partials/sidebar.tmpl b/assets/templates/partials/sidebar.tmpl index e094122..13b192b 100644 --- a/assets/templates/partials/sidebar.tmpl +++ b/assets/templates/partials/sidebar.tmpl @@ -20,12 +20,12 @@