Skip to content

Commit

Permalink
reorganizing and streamlining stylesheets
Browse files Browse the repository at this point in the history
  • Loading branch information
kayla-glick committed Nov 25, 2022
1 parent 6a175a1 commit 2174e1c
Show file tree
Hide file tree
Showing 118 changed files with 150 additions and 123 deletions.
4 changes: 2 additions & 2 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
8 changes: 8 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
},
"dependencies": {
"@popperjs/core": "^2.11.6",
"bootstrap": "5.2.3"
"bootstrap": "5.2.3",
"tippy.js": "^6.3.7"
}
}
2 changes: 0 additions & 2 deletions ui/balance_druid/index.scss

This file was deleted.

2 changes: 0 additions & 2 deletions ui/deathknight/index.scss

This file was deleted.

2 changes: 0 additions & 2 deletions ui/elemental_shaman/index.scss

This file was deleted.

2 changes: 0 additions & 2 deletions ui/enhancement_shaman/index.scss

This file was deleted.

2 changes: 0 additions & 2 deletions ui/feral_druid/index.scss

This file was deleted.

2 changes: 0 additions & 2 deletions ui/feral_tank_druid/index.scss

This file was deleted.

2 changes: 0 additions & 2 deletions ui/healing_priest/index.scss

This file was deleted.

2 changes: 0 additions & 2 deletions ui/hunter/index.scss

This file was deleted.

2 changes: 1 addition & 1 deletion ui/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<link rel="icon" href="/wotlk/assets/favicon_io/favicon.ico" type="image/x-icon">
<link rel="stylesheet" href="./index.scss">
<link rel="stylesheet" href="./homepage/index.scss">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css" integrity="sha512-9usAa10IRO0HhonpyAIVpjrylPvoDwiPUiKdWk5t3PyolY1cOd4DSE0Ga+ri4AuTroPR5aQvXU9xC6qOPnzFeg==" crossorigin="anonymous" referrerpolicy="no-referrer" />
</head>
<body>
Expand Down
2 changes: 0 additions & 2 deletions ui/index.scss

This file was deleted.

3 changes: 3 additions & 0 deletions ui/index.ts
Original file line number Diff line number Diff line change
@@ -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';

Expand Down
14 changes: 6 additions & 8 deletions ui/index_template.html
Original file line number Diff line number Diff line change
@@ -1,26 +1,24 @@
<!DOCTYPE html>
<html>
<head>
<title>@@TITLE@@</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<link rel="preload" href="/wotlk/assets/database/db.bin" as="fetch" crossOrigin="anonymous">
<link rel="icon" type="image/x-icon" href="/wotlk/assets/favicon_io/favicon.ico">
<link rel="stylesheet" href="./index.scss">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" integrity="sha384-Zenh87qX5JnK2Jl0vWa8Ck2rdkQ2Bzep5IDxbcnCeuOxjzrPF/et3URy9Bv1WTRi" crossorigin="anonymous">
<link rel="stylesheet" href="../scss/sims/@@SPEC@@/index.scss">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css" integrity="sha512-9usAa10IRO0HhonpyAIVpjrylPvoDwiPUiKdWk5t3PyolY1cOd4DSE0Ga+ri4AuTroPR5aQvXU9xC6qOPnzFeg==" crossorigin="anonymous" referrerpolicy="no-referrer" />

<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.tablesorter/2.31.3/js/jquery.tablesorter.min.js" integrity="sha512-qzgd5cYSZcosqpzpn7zF2ZId8f/8CHmFKZ8j7mU4OUXTNRd5g+ZHBPsgKEwoqxCtdQvExE5LprwwPAgoicguNg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/bPopup/0.11.0/jquery.bpopup.min.js" integrity="sha512-kmrY+BFhi6ywgfK8hW1ySM/KYU3xPd4elbMhORq3DhacwqmitFrf3GB2HpLj3srV1zFsqxvAcZ4qU+y+ym1Eeg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/muuri.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/apexcharts"></script>
<script src="https://unpkg.com/@popperjs/core@2"></script>
<script src="https://unpkg.com/tippy.js@6"></script>
<script src="../index.ts" type="module"></script>
<script src="./index.ts" type="module"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/3.5.1/chart.min.js" integrity="sha512-Wt1bJGtlnMtGP0dqNFH1xlkLBNpEodaiQ8ZN5JLA5wpc1sUlk/O5uuOMNgvzddzkpvZ9GLyYNa8w2s7rqiTk5Q==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-OERcA2EqjJCMA+/3y+gxIOqMEjwtxJY7qPCqsdltbNJuaOe923+mo//f6V8Qbsw3" crossorigin="anonymous"></script>
<script type="module" src="https://cdnjs.cloudflare.com/ajax/libs/pako/2.0.4/pako.min.js"></script>
<script type="module" src="./index.ts"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/pako/2.0.4/pako.min.js" type="module"></script>
<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=G-T3HBB0LXNX"></script>
<script>
Expand Down
2 changes: 0 additions & 2 deletions ui/mage/index.scss

This file was deleted.

2 changes: 0 additions & 2 deletions ui/protection_paladin/index.scss

This file was deleted.

2 changes: 0 additions & 2 deletions ui/protection_warrior/index.scss

This file was deleted.

2 changes: 0 additions & 2 deletions ui/retribution_paladin/index.scss

This file was deleted.

2 changes: 0 additions & 2 deletions ui/rogue/index.scss

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
32 changes: 32 additions & 0 deletions ui/scss/core/individual_sim_ui/index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
// Import Sim UI and system-wide styles
@import "../sim_ui/index";

// Import Individual Sim UI Styles
@import "./shared";

// Import component styles
@import "../components/bonus_stats_picker";
@import "../components/boolean_picker";
@import "../components/character_stats";
@import "../components/cooldowns_picker";
@import "../components/custom_rotation_picker";
@import "../components/detailed_results";
@import "../components/encounter_picker";
@import "../components/exporters";
@import "../components/enum_picker";
@import "../components/gear_picker";
@import "../components/icon_enum_picker";
@import "../components/icon_picker";
@import "../components/importers";
@import "../components/log_runner";
@import "../components/multi_icon_picker";
@import "../components/number_list_picker";
@import "../components/number_picker";
@import "../components/raid_sim_action";
@import "../components/raid_target_picker";
@import "../components/saved_data_manager";
@import "../components/settings_menu";
@import "../components/stat_weights_action";
@import "../talents/hunter_pet";
@import "../talents/glyphs_picker";
@import "../talents/talents_picker";
Original file line number Diff line number Diff line change
@@ -1,31 +1,3 @@
@import "./shared";
@import "./sim_ui";
@import "./components/bonus_stats_picker";
@import "./components/boolean_picker";
@import "./components/character_stats";
@import "./components/cooldowns_picker";
@import "./components/custom_rotation_picker";
@import "./components/detailed_results";
@import "./components/encounter_picker";
@import "./components/exporters";
@import "./components/enum_picker";
@import "./components/gear_picker";
@import "./components/icon_enum_picker";
@import "./components/icon_picker";
@import "./components/importers";
@import "./components/log_runner";
@import "./components/multi_icon_picker";
@import "./components/number_list_picker";
@import "./components/number_picker";
@import "./components/raid_sim_action";
@import "./components/raid_target_picker";
@import "./components/saved_data_manager";
@import "./components/settings_menu";
@import "./components/stat_weights_action";
@import "./talents/hunter_pet";
@import "./talents/glyphs_picker";
@import "./talents/talents_picker";

.within-raid-sim .within-raid-sim-hide {
display: none;
}
Expand Down
10 changes: 10 additions & 0 deletions ui/scss/core/sim_ui/index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// Import system-wide styles
@import "../../index";

// Import Sim UI Styles
@import "./shared";

// Import Components
@import "../components/close_button";
@import "../components/number_picker";
@import "../components/title";
8 changes: 4 additions & 4 deletions ui/core/_sim_ui.scss → ui/scss/core/sim_ui/shared.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
@import "./components/close_button";
@import "./components/number_picker";
@import "./components/title";

html {
overflow: hidden;
}
Expand All @@ -14,6 +10,10 @@ td, th {
padding: auto;
}

.sim-ui {
height: 100%;
}

.sim-root {
height: 100%;
display: flex;
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

.hunter-pet-talents-cunning, .hunter-pet-talents-ferocity, .hunter-pet-talents-tenacity {
display: none !important;
}
Expand Down
File renamed without changes.
4 changes: 4 additions & 0 deletions ui/scss/global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
letter-spacing: 1px;
}

html {
height: 100%;
}

body {
height: 100%;
opacity: 0;
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 2 additions & 0 deletions ui/scss/homepage/index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@import "../index";
@import "./homepage";
13 changes: 9 additions & 4 deletions ui/scss/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,18 @@
@import "bootstrap/scss/helpers";
@import "bootstrap/scss/transitions";
@import "bootstrap/scss/dropdown";
@import "bootstrap/scss/nav";
@import "bootstrap/scss/navbar";

// Bootstrap Utilities API
@import "bootstrap/scss/utilities/api";
@import "./bootstrap/scss/utilities/api";

// custom Bootstrap style overrides
@import "bootstrap_style_overrides";
// Custom Bootstrap style overrides
@import "./bootstrap_style_overrides";

// Import other plugin styles
@import "tippy.js/dist/tippy";

// Custom styles
@import "global";
@import "./global";
@import "./global_old";
2 changes: 2 additions & 0 deletions ui/scss/sims/balance_druid/index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@import "../../core/individual_sim_ui/index";
@import "./sim";
File renamed without changes.
2 changes: 2 additions & 0 deletions ui/scss/sims/deathknight/index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@import "../../core/individual_sim_ui/index";
@import "./sim";
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
@import "../core/shared";
@import "../core/sim_ui";
@import "dps_histogram";
@import "player_damage";
@import "resource_metrics";
@import "results_filter";
@import "source_chart";
@import "timeline";
@import "topline_results";
@import "../../core/sim_ui";
@import "./dps_histogram";
@import "./player_damage";
@import "./resource_metrics";
@import "./results_filter";
@import "./source_chart";
@import "./timeline";
@import "./topline_results";

body {
background-color: transparent;
Expand Down Expand Up @@ -142,8 +141,7 @@ body.new-tab {
.child-metric>*:first-child {
padding-left: 20px;
}
.expand-toggle {
}

tr:not(.parent-metric) .expand-toggle {
display: none;
}
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "../core/components/raid_sim_action";
@import "../../core/components/raid_sim_action";

.topline-results-root {
display: flex;
Expand Down
3 changes: 3 additions & 0 deletions ui/scss/sims/elemental_shaman/index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@import "../../core/individual_sim_ui/index";
@import "../../core/components/totem_inputs";
@import "./sim";
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import "../core/components/totem_inputs";

// Set color variables which control the site theme.
.elemental-shaman-sim-ui {
--theme-color-primary: #228db0;
Expand Down
3 changes: 3 additions & 0 deletions ui/scss/sims/enhancement_shaman/index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@import "../../core/individual_sim_ui/index";
@import "../../core/components/totem_inputs";
@import "./sim";
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import "../core/components/totem_inputs";

// Set color variables which control the site theme.
.enhancement-shaman-sim-ui {
--theme-color-primary: #228db0;
Expand Down
2 changes: 2 additions & 0 deletions ui/scss/sims/feral_druid/index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@import "../../core/individual_sim_ui/index";
@import "./sim";
File renamed without changes.
2 changes: 2 additions & 0 deletions ui/scss/sims/feral_tank_druid/index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@import "../../core/individual_sim_ui/index";
@import "./sim";
File renamed without changes.
2 changes: 2 additions & 0 deletions ui/scss/sims/healing_priest/index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@import "../../core/individual_sim_ui/index";
@import "./sim";
File renamed without changes.
3 changes: 3 additions & 0 deletions ui/scss/sims/hunter/index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@import "../../core/individual_sim_ui/index";
@import "../../core/components/totem_inputs";
@import "./sim";
2 changes: 0 additions & 2 deletions ui/hunter/_sim.scss → ui/scss/sims/hunter/sim.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import "../core/components/totem_inputs";

// Set color variables which control the site theme.
.hunter-sim-ui {
--theme-color-primary: #2ead50;
Expand Down
2 changes: 2 additions & 0 deletions ui/scss/sims/mage/index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@import "../../core/individual_sim_ui/index";
@import "./sim";
File renamed without changes.
2 changes: 2 additions & 0 deletions ui/scss/sims/protection_paladin/index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@import "../../core/individual_sim_ui/index";
@import "./sim";
File renamed without changes.
2 changes: 2 additions & 0 deletions ui/scss/sims/protection_warrior/index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@import "../../core/individual_sim_ui/index";
@import "./sim";
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

.blessings-table-header-cell {
padding: 2px 10px;
}
Expand Down
Loading

0 comments on commit 2174e1c

Please sign in to comment.