diff --git a/makefile b/makefile index 5ad737285a..927640452b 100644 --- a/makefile +++ b/makefile @@ -85,7 +85,7 @@ ui/core/proto/api.ts: proto/*.proto node_modules ui/%/index.html: ui/index_template.html $(eval title := $(shell echo $(shell basename $(@D)) | sed -r 's/(^|_)([a-z])/\U \2/g' | cut -c 2-)) - cat ui/index_template.html | sed 's/@@TITLE@@/WOTLK $(title) Simulator/g' > $@ + cat ui/index_template.html | sed -e 's/@@TITLE@@/WOTLK $(title) Simulator/g' -e 's/@@SPEC@@/$(shell basename $(@D))/g' > $@ package-lock.json: npm install @@ -103,7 +103,7 @@ $(OUT_DIR)/%/index.html: ui/index_template.html $(OUT_DIR)/assets $(eval title := $(shell echo $(shell basename $(@D)) | sed -r 's/(^|_)([a-z])/\U \2/g' | cut -c 2-)) echo $(title) mkdir -p $(@D) - cat ui/index_template.html | sed 's/@@TITLE@@/WOTLK $(title) Simulator/g' > $@ + cat ui/index_template.html | sed -e 's/@@TITLE@@/WOTLK $(title) Simulator/g' -e 's/@@SPEC@@/$(shell basename $(@D))/g' > $@ .PHONY: wasm wasm: $(OUT_DIR)/lib.wasm diff --git a/package-lock.json b/package-lock.json index cc5aa15e5f..077b8217f2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2013,6 +2013,14 @@ "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", "dev": true }, + "tippy.js": { + "version": "6.3.7", + "resolved": "https://registry.npmjs.org/tippy.js/-/tippy.js-6.3.7.tgz", + "integrity": "sha512-E1d3oP2emgJ9dRQZdf3Kkn0qJgI6ZLpyS5z6ZkY1DF3kaQaBsGZsndEpHwx+eC+tYM41HaSNvNtLx8tU57FzTQ==", + "requires": { + "@popperjs/core": "^2.9.0" + } + }, "to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", diff --git a/package.json b/package.json index ae054465f7..5feaacb821 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ }, "dependencies": { "@popperjs/core": "^2.11.6", - "bootstrap": "5.2.3" + "bootstrap": "5.2.3", + "tippy.js": "^6.3.7" } } diff --git a/ui/balance_druid/index.scss b/ui/balance_druid/index.scss deleted file mode 100644 index 8c6b3f596d..0000000000 --- a/ui/balance_druid/index.scss +++ /dev/null @@ -1,2 +0,0 @@ -@import "../core/individual_sim_ui"; -@import "./sim"; diff --git a/ui/deathknight/index.scss b/ui/deathknight/index.scss deleted file mode 100644 index 8c6b3f596d..0000000000 --- a/ui/deathknight/index.scss +++ /dev/null @@ -1,2 +0,0 @@ -@import "../core/individual_sim_ui"; -@import "./sim"; diff --git a/ui/elemental_shaman/index.scss b/ui/elemental_shaman/index.scss deleted file mode 100644 index 8c6b3f596d..0000000000 --- a/ui/elemental_shaman/index.scss +++ /dev/null @@ -1,2 +0,0 @@ -@import "../core/individual_sim_ui"; -@import "./sim"; diff --git a/ui/enhancement_shaman/index.scss b/ui/enhancement_shaman/index.scss deleted file mode 100644 index 8c6b3f596d..0000000000 --- a/ui/enhancement_shaman/index.scss +++ /dev/null @@ -1,2 +0,0 @@ -@import "../core/individual_sim_ui"; -@import "./sim"; diff --git a/ui/feral_druid/index.scss b/ui/feral_druid/index.scss deleted file mode 100644 index 8c6b3f596d..0000000000 --- a/ui/feral_druid/index.scss +++ /dev/null @@ -1,2 +0,0 @@ -@import "../core/individual_sim_ui"; -@import "./sim"; diff --git a/ui/feral_tank_druid/index.scss b/ui/feral_tank_druid/index.scss deleted file mode 100644 index 8c6b3f596d..0000000000 --- a/ui/feral_tank_druid/index.scss +++ /dev/null @@ -1,2 +0,0 @@ -@import "../core/individual_sim_ui"; -@import "./sim"; diff --git a/ui/healing_priest/index.scss b/ui/healing_priest/index.scss deleted file mode 100644 index 8c6b3f596d..0000000000 --- a/ui/healing_priest/index.scss +++ /dev/null @@ -1,2 +0,0 @@ -@import "../core/individual_sim_ui"; -@import "./sim"; diff --git a/ui/hunter/index.scss b/ui/hunter/index.scss deleted file mode 100644 index 8c6b3f596d..0000000000 --- a/ui/hunter/index.scss +++ /dev/null @@ -1,2 +0,0 @@ -@import "../core/individual_sim_ui"; -@import "./sim"; diff --git a/ui/index.html b/ui/index.html index 9ee21ed70c..ff1e0fe907 100644 --- a/ui/index.html +++ b/ui/index.html @@ -5,7 +5,7 @@ - +
diff --git a/ui/index.scss b/ui/index.scss deleted file mode 100644 index 474cc4fac2..0000000000 --- a/ui/index.scss +++ /dev/null @@ -1,2 +0,0 @@ -@import "scss/index"; -@import "scss/homepage"; diff --git a/ui/index.ts b/ui/index.ts index 6aeeddb0df..24f55625ad 100644 --- a/ui/index.ts +++ b/ui/index.ts @@ -1,15 +1,18 @@ import * as Popper from '@popperjs/core'; import * as bootstrap from 'bootstrap'; +import tippy from 'tippy.js'; declare global { interface Window { Popper: any; bootstrap: any; + tippy: any; } } window.Popper = Popper; window.bootstrap = bootstrap; +window.tippy = tippy; import './shared/bootstrap_overrides'; diff --git a/ui/index_template.html b/ui/index_template.html index b1f1aa1fdd..fa985ff24e 100644 --- a/ui/index_template.html +++ b/ui/index_template.html @@ -1,13 +1,13 @@ +