diff options
| -rw-r--r-- | assets/css/styles.css | 3 | ||||
| -rw-r--r-- | assets/js/lib/themes.js | 2 | ||||
| -rw-r--r-- | dist/css/styles.css | 3 | ||||
| -rw-r--r-- | dist/js/lib/themes.js | 2 | ||||
| -rw-r--r-- | dist/pages/about.html | 4 | ||||
| -rw-r--r-- | dist/sw.js | 5 |
6 files changed, 17 insertions, 2 deletions
diff --git a/assets/css/styles.css b/assets/css/styles.css index 0f80cea..9ff84bf 100644 --- a/assets/css/styles.css +++ b/assets/css/styles.css @@ -4,6 +4,7 @@ --color-accent: rgba(0, 156, 101, 1); --color-primary-light: rgba(230, 250, 231, 1); --color-invalid: rgba(192, 0, 0, 1); + --color-primary-transparent: rgba(0, 128, 83, 0.3); --background-color: rgba(255, 255, 255, 1); --background-accent: rgba(0, 156, 101, 0.2); @@ -118,7 +119,7 @@ a.collection-item { } .fc-unthemed td.fc-today { - background: var(--color-primary); + background: var(--color-primary-transparent); } .fc-icon { diff --git a/assets/js/lib/themes.js b/assets/js/lib/themes.js index eb2f61c..8917aaa 100644 --- a/assets/js/lib/themes.js +++ b/assets/js/lib/themes.js @@ -5,6 +5,7 @@ const THEME_COLOR_SCHEMES = { "color-accent": "rgba(0, 156, 101, 1)", "color-primary-light": "rgba(230, 250, 231, 1)", "color-invalid": "rgba(192, 0, 0, 1)", + "color-primary-transparent": "rgba(0, 128, 83, 0.3)", "background-color": "rgba(255, 255, 255, 1)", "background-accent": "rgba(0, 156, 101, 0.2)", @@ -32,6 +33,7 @@ const THEME_COLOR_SCHEMES = { "color-accent": "rgba(20, 117, 83, 1)", "color-primary-light": "rgba(6, 137, 9, 1)", // it's not really light anymore, is it? "color-invalid": "rgba(192, 0, 0, 1)", + "color-primary-transparent": "rgba(0, 128, 83, 0.3)", "background-color": "rgba(31, 31, 31, 1)", "background-accent": "rgba(0, 92, 44, 0.2)", diff --git a/dist/css/styles.css b/dist/css/styles.css index 0f80cea..9ff84bf 100644 --- a/dist/css/styles.css +++ b/dist/css/styles.css @@ -4,6 +4,7 @@ --color-accent: rgba(0, 156, 101, 1); --color-primary-light: rgba(230, 250, 231, 1); --color-invalid: rgba(192, 0, 0, 1); + --color-primary-transparent: rgba(0, 128, 83, 0.3); --background-color: rgba(255, 255, 255, 1); --background-accent: rgba(0, 156, 101, 0.2); @@ -118,7 +119,7 @@ a.collection-item { } .fc-unthemed td.fc-today { - background: var(--color-primary); + background: var(--color-primary-transparent); } .fc-icon { diff --git a/dist/js/lib/themes.js b/dist/js/lib/themes.js index eb2f61c..8917aaa 100644 --- a/dist/js/lib/themes.js +++ b/dist/js/lib/themes.js @@ -5,6 +5,7 @@ const THEME_COLOR_SCHEMES = { "color-accent": "rgba(0, 156, 101, 1)", "color-primary-light": "rgba(230, 250, 231, 1)", "color-invalid": "rgba(192, 0, 0, 1)", + "color-primary-transparent": "rgba(0, 128, 83, 0.3)", "background-color": "rgba(255, 255, 255, 1)", "background-accent": "rgba(0, 156, 101, 0.2)", @@ -32,6 +33,7 @@ const THEME_COLOR_SCHEMES = { "color-accent": "rgba(20, 117, 83, 1)", "color-primary-light": "rgba(6, 137, 9, 1)", // it's not really light anymore, is it? "color-invalid": "rgba(192, 0, 0, 1)", + "color-primary-transparent": "rgba(0, 128, 83, 0.3)", "background-color": "rgba(31, 31, 31, 1)", "background-accent": "rgba(0, 92, 44, 0.2)", diff --git a/dist/pages/about.html b/dist/pages/about.html index a32a331..8dd6f27 100644 --- a/dist/pages/about.html +++ b/dist/pages/about.html @@ -142,7 +142,11 @@ <div class="row"> <p> <small> +<<<<<<< HEAD ^HEAD bed93d7d52a80a05cd87c5eeacdcafde8cafe24a +======= + ^HEAD b0d7eb0101a6c8a26c97a1c7069e4496706225ec +>>>>>>> 837a4ad3f49cb4441d294e67332b98818fc90011 </small> </p> </div> @@ -3,8 +3,13 @@ // Change version to cause cache refresh +<<<<<<< HEAD const static_cache_name = "site-static-1.0.13-beta-bed93d7"; // latest commit is bed93d7d52a80a05cd87c5eeacdcafde8cafe24a +======= +const static_cache_name = "site-static-1.0.13-beta-b0d7eb0"; +// latest commit is b0d7eb0101a6c8a26c97a1c7069e4496706225ec +>>>>>>> 837a4ad3f49cb4441d294e67332b98818fc90011 // Got them with find . -not -path '*/\.*' | sed "s/.*/\"&\",/" | grep -v sw.js // sw.js NE SME BITI CACHAN, ker vsebuje verzijo! |