summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--dist/css/styles.css6
-rw-r--r--dist/pages/about.html6
-rw-r--r--dist/sw.js9
3 files changed, 8 insertions, 13 deletions
diff --git a/dist/css/styles.css b/dist/css/styles.css
index 10e4e87..0f80cea 100644
--- a/dist/css/styles.css
+++ b/dist/css/styles.css
@@ -359,9 +359,13 @@ h5.subheader {
}
.general-text {
- color: var(--color-text);
+ color: var(--color-text) !important;
}
.dropdown-content {
background: var(--background-accent-1) !important;
}
+
+p {
+ color: var(--color-text) !important;
+}
diff --git a/dist/pages/about.html b/dist/pages/about.html
index bb04c16..d357ecf 100644
--- a/dist/pages/about.html
+++ b/dist/pages/about.html
@@ -142,11 +142,7 @@
<div class="row">
<p>
<small>
-<<<<<<< HEAD
- ^HEAD fa9467811859cd9c2d595f5a79819ce3aca91e26
-=======
- ^HEAD b8d872d3487cbe1b6ce510bb08da799b31bd5567
->>>>>>> b0d7eb0101a6c8a26c97a1c7069e4496706225ec
+ ^HEAD b989d252515d9d8e636f1c86cdfb71bb68938a30
</small>
</p>
</div>
diff --git a/dist/sw.js b/dist/sw.js
index bd3a453..3c3f398 100644
--- a/dist/sw.js
+++ b/dist/sw.js
@@ -3,13 +3,8 @@
// Change version to cause cache refresh
-<<<<<<< HEAD
-const static_cache_name = "site-static-1.0.13-beta-fa94678";
-// latest commit is fa9467811859cd9c2d595f5a79819ce3aca91e26
-=======
-const static_cache_name = "site-static-1.0.13-beta-b8d872d";
-// latest commit is b8d872d3487cbe1b6ce510bb08da799b31bd5567
->>>>>>> b0d7eb0101a6c8a26c97a1c7069e4496706225ec
+const static_cache_name = "site-static-1.0.13-beta-b989d25";
+// latest commit is b989d252515d9d8e636f1c86cdfb71bb68938a30
// Got them with find . -not -path '*/\.*' | sed "s/.*/\"&\",/" | grep -v sw.js
// sw.js NE SME BITI CACHAN, ker vsebuje verzijo!