Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions ui/core/components/stat_weights_action.ts
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ class EpWeightsMenu extends BaseModal {
</div>
<div class="show-all-stats-container col col-sm-3"></div>
</div>
<div class="ep-reference-options row experimental">
<div class="ep-reference-options row">
<div class="col col-sm-4 damage-metrics">
<span>DPS/TPS reference:</span>
<select class="ref-stat-select form-select damage-metrics">
Expand Down Expand Up @@ -253,25 +253,25 @@ class EpWeightsMenu extends BaseModal {
<i class="fa fa-copy"></i>
</a>
</th>
<th class="threat-metrics type-weight experimental">
<th class="threat-metrics type-weight">
<span>TMI Weight</span>
<a href="javascript:void(0)" role="button" class="col-action">
<i class="fa fa-copy"></i>
</a>
</th>
<th class="threat-metrics type-ep experimental">
<th class="threat-metrics type-ep">
<span>TMI EP</span>
<a href="javascript:void(0)" role="button" class="col-action">
<i class="fa fa-copy"></i>
</a>
</th>
<th class="threat-metrics type-weight experimental">
<th class="threat-metrics type-weight">
<span>Death Weight</span>
<a href="javascript:void(0)" role="button" class="col-action">
<i class="fa fa-copy"></i>
</a>
</th>
<th class="threat-metrics type-ep experimental">
<th class="threat-metrics type-ep">
<span>Death EP</span>
<a href="javascript:void(0)" role="button" class="col-action">
<i class="fa fa-copy"></i>
Expand Down Expand Up @@ -303,13 +303,13 @@ class EpWeightsMenu extends BaseModal {
</td>
<td class="threat-metrics type-ratio type-ep">
</td>
<td class="threat-metrics type-ratio type-weight experimental">
<td class="threat-metrics type-ratio type-weight">
</td>
<td class="threat-metrics type-ratio type-ep experimental">
<td class="threat-metrics type-ratio type-ep">
</td>
<td class="threat-metrics type-ratio type-weight experimental">
<td class="threat-metrics type-ratio type-weight">
</td>
<td class="threat-metrics type-ratio type-ep experimental">
<td class="threat-metrics type-ratio type-ep">
</td>
<td style="text-align: center; vertical-align: middle;">
<button class="btn btn-primary compute-ep">
Expand Down Expand Up @@ -720,8 +720,8 @@ class EpWeightsMenu extends BaseModal {
${this.makeTableRowCells(stat, result?.hps, 'healing-metrics', rowTotalEp, epRatios[1])}
${this.makeTableRowCells(stat, result?.tps, 'threat-metrics', rowTotalEp, epRatios[2])}
${this.makeTableRowCells(stat, result?.dtps, 'threat-metrics', rowTotalEp, epRatios[3])}
${this.makeTableRowCells(stat, result?.tmi, 'threat-metrics experimental', rowTotalEp, epRatios[4])}
${this.makeTableRowCells(stat, result?.pDeath, 'threat-metrics experimental', rowTotalEp, epRatios[5])}
${this.makeTableRowCells(stat, result?.tmi, 'threat-metrics', rowTotalEp, epRatios[4])}
${this.makeTableRowCells(stat, result?.pDeath, 'threat-metrics', rowTotalEp, epRatios[5])}
<td class="current-ep"></td>
`;

Expand Down
6 changes: 4 additions & 2 deletions ui/core/player.ts
Original file line number Diff line number Diff line change
Expand Up @@ -460,8 +460,10 @@ export class Player<SpecType extends Spec> {
defaultRatios[1] = 1;
} else if (isTankSpec) {
// By default value TPS and DTPS EP equally for tanking spec
defaultRatios[2] = 1;
defaultRatios[3] = 1;
defaultRatios[2] = 1; // TPS
defaultRatios[3] = 1; // DTPS
defaultRatios[4] = 0; // TMI
defaultRatios[5] = 0; // COD
} else {
// By default only value DPS EP
defaultRatios[0] = 1;
Expand Down
24 changes: 11 additions & 13 deletions ui/scss/core/components/_stat_weights_action.scss
Original file line number Diff line number Diff line change
Expand Up @@ -194,20 +194,18 @@
}
}

// Style overrides for the expanded/experimental EP UI in tank mode
&:not(.hide-experimental) {
@include media-breakpoint-down(lg) {
@include compact-button;
@include compact-table;
.results-ep-table {
@include compact-input;
}
// Apply compact styles when there are many columns shown
@include media-breakpoint-down(lg) {
@include compact-button;
@include compact-table;
.results-ep-table {
@include compact-input;
}
@include media-breakpoint-only(lg) {
.results-ep-table {
th {
padding-right: 0;
}
}
@include media-breakpoint-only(lg) {
.results-ep-table {
th {
padding-right: 0;
}
}
}
Expand Down
Loading