diff options
| -rw-r--r-- | assets/css/styles.css | 6 | ||||
| -rw-r--r-- | assets/pages-src/about.bvr | 1 | ||||
| -rw-r--r-- | dist/css/styles.css | 6 | ||||
| -rw-r--r-- | dist/pages/about.html | 7 | ||||
| -rw-r--r-- | dist/sw.js | 9 |
5 files changed, 7 insertions, 22 deletions
diff --git a/assets/css/styles.css b/assets/css/styles.css index b372c5e..5cbedca 100644 --- a/assets/css/styles.css +++ b/assets/css/styles.css @@ -311,10 +311,6 @@ h5.subheader { color: var(--color-btn-flat-disabled) !important; } -.fc-content { - color: var(--color-text) !important; -} - .dropdown-content { - background: var(--background-accent-1) !important; + background: var(--background-accent-1) !important; } diff --git a/assets/pages-src/about.bvr b/assets/pages-src/about.bvr index dd42b82..26b5957 100644 --- a/assets/pages-src/about.bvr +++ b/assets/pages-src/about.bvr @@ -124,6 +124,7 @@ <p> <small> ^HEAD <@?g latest_commit@> + </small> </p> </div> </div> diff --git a/dist/css/styles.css b/dist/css/styles.css index b372c5e..5cbedca 100644 --- a/dist/css/styles.css +++ b/dist/css/styles.css @@ -311,10 +311,6 @@ h5.subheader { color: var(--color-btn-flat-disabled) !important; } -.fc-content { - color: var(--color-text) !important; -} - .dropdown-content { - background: var(--background-accent-1) !important; + background: var(--background-accent-1) !important; } diff --git a/dist/pages/about.html b/dist/pages/about.html index 40fb4da..7102567 100644 --- a/dist/pages/about.html +++ b/dist/pages/about.html @@ -142,11 +142,8 @@ <div class="row"> <p> <small> -<<<<<<< HEAD - ^HEAD b63b2381a851e2cbc6087bf4d355be4265e6982a -======= - ^HEAD 16d4d4b9f9b35edc7164cd5662ded7377b6960a9 ->>>>>>> 7b0e9737328c2dc5a0ff1bd063cd7818706256c3 + ^HEAD c373dd3a6d4c5acfa6ca44a3c3489146a6a761c6 + </small> </p> </div> </div> @@ -3,13 +3,8 @@ // Change version to cause cache refresh -<<<<<<< HEAD -const static_cache_name = "site-static-1.0.13-beta-b63b238"; -// latest commit is b63b2381a851e2cbc6087bf4d355be4265e6982a -======= -const static_cache_name = "site-static-1.0.13-beta-16d4d4b"; -// latest commit is 16d4d4b9f9b35edc7164cd5662ded7377b6960a9 ->>>>>>> 7b0e9737328c2dc5a0ff1bd063cd7818706256c3 +const static_cache_name = "site-static-1.0.13-beta-c373dd3"; +// latest commit is c373dd3a6d4c5acfa6ca44a3c3489146a6a761c6 // Got them with find . -not -path '*/\.*' | sed "s/.*/\"&\",/" | grep -v sw.js // sw.js NE SME BITI CACHAN, ker vsebuje verzijo! |