diff options
| author | silverwind <me@silverwind.io> | 2020-01-29 00:22:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-28 23:22:39 +0000 |
| commit | 7c84dbca4f0f79dc90752105800a6964693283bd (patch) | |
| tree | e7f678be8d64f7e9528bbb2f46c52efbfd173416 | |
| parent | b9690d7c0b4980c46b3416e36478fa0140dd5f9e (diff) | |
| download | gitea-7c84dbca4f0f79dc90752105800a6964693283bd.tar.gz gitea-7c84dbca4f0f79dc90752105800a6964693283bd.zip | |
fix gitgraph commit hashes in dark theme (#10046)
because the CSS was lazy-loaded the rules in arc-green did not win.
included the css file in the main bundle to fix. the black dots can not
be fixed via CSS because they are drawn in a `<canvas>` element
unfortunately.
| -rw-r--r-- | templates/pwa/serviceworker_js.tmpl | 2 | ||||
| -rw-r--r-- | web_src/js/gitGraphLoader.js | 5 | ||||
| -rw-r--r-- | web_src/less/index.less | 1 |
3 files changed, 2 insertions, 6 deletions
diff --git a/templates/pwa/serviceworker_js.tmpl b/templates/pwa/serviceworker_js.tmpl index a81731a5dc..e4ff2fc07e 100644 --- a/templates/pwa/serviceworker_js.tmpl +++ b/templates/pwa/serviceworker_js.tmpl @@ -19,8 +19,6 @@ var urlsToCache = [ '{{StaticUrlPrefix}}/vendor/plugins/vue/vue.min.js', // css - '{{StaticUrlPrefix}}/css/gitgraph.css', - '{{StaticUrlPrefix}}/css/highlight.css', '{{StaticUrlPrefix}}/css/index.css?v={{MD5 AppVer}}', '{{StaticUrlPrefix}}/css/swagger.css?v={{MD5 AppVer}}', '{{StaticUrlPrefix}}/fomantic/semantic.min.css?v={{MD5 AppVer}}', diff --git a/web_src/js/gitGraphLoader.js b/web_src/js/gitGraphLoader.js index 997e179c84..f2687fa270 100644 --- a/web_src/js/gitGraphLoader.js +++ b/web_src/js/gitGraphLoader.js @@ -2,10 +2,7 @@ $(async () => { const graphCanvas = document.getElementById('graph-canvas'); if (!graphCanvas) return; - const [{ default: gitGraph }] = await Promise.all([ - import(/* webpackChunkName: "gitgraph" */'./gitGraph.js'), - import(/* webpackChunkName: "gitgraph" */'../css/gitGraph.css'), - ]); + const { default: gitGraph } = await import(/* webpackChunkName: "gitgraph" */'./gitGraph.js'); const graphList = []; $('#graph-raw-list li span.node-relation').each(function () { diff --git a/web_src/less/index.less b/web_src/less/index.less index de6f2088c3..a8ef18953d 100644 --- a/web_src/less/index.less +++ b/web_src/less/index.less @@ -14,3 +14,4 @@ @import "_explore"; @import "_review"; @import "~highlight.js/styles/github.css"; +@import "../css/gitGraph.css"; |