Skip to content

Commit

Permalink
fix map-gets, update homepage (#4211)
Browse files Browse the repository at this point in the history
  • Loading branch information
@kayla-glick
kayla-glick authored Feb 11, 2024
1 parent ee8e326 commit d793813
Show file tree
Hide file tree
Showing 32 changed files with 79 additions and 79 deletions.
2 changes: 1 addition & 1 deletion ui/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<img class="wowsims-logo" src="/wotlk/assets/img/WoW-Simulator-Icon.png">
<div class="d-flex flex-column">
<h2 class="wowsims-title">WoWSims</h2>
<h2 class="expansion-title w-100">Wrath of the Lich King</h2>
<h3 class="expansion-title w-100">Wrath of the Lich King</h2>
</div>
</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#homepageHeaderCollapse" aria-controls="homepageHeaderCollapse" aria-expanded="false" aria-label="Toggle navigation">
Expand Down
6 changes: 3 additions & 3 deletions ui/scss/core/components/_bulk.scss
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@use "sass:map";

.bulk-settings-button {
margin-top: map.get($spacers, 3);
margin-top: map-get($spacers, 3);
}

.bulk-result {
Expand All @@ -20,7 +20,7 @@
.bulk-result-item-slot {
color: aliceblue;
margin-left: 0.5rem;
font-size: 0.5 * map.get($font-sizes, 6);
font-size: 0.5 * map-get($font-sizes, 6);
}

.bulk-results-header .content-block-header {
Expand All @@ -42,7 +42,7 @@
}

.bulk-result-body-dps {
font-size: map.get($font-sizes, 6);
font-size: map-get($font-sizes, 6);
text-align: left;

.topline-result-avg {
Expand Down
12 changes: 6 additions & 6 deletions ui/scss/core/components/_character_stats.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
padding-bottom: .8rem;

.character-stats-label {
margin-bottom: map.get($spacers, 2);
margin-bottom: map-get($spacers, 2);
}

.character-stats-table {
Expand All @@ -17,17 +17,17 @@

.character-stats-table-label,
.character-stats-table-value {
padding-top: map.get($spacers, 2);
padding-bottom: map.get($spacers, 2);
padding-top: map-get($spacers, 2);
padding-bottom: map-get($spacers, 2);
}

.character-stats-table-label {
padding-right: map.get($spacers, 2);
padding-right: map-get($spacers, 2);
text-align: left;
}

.character-stats-table-value {
padding-left: map.get($spacers, 2);
padding-left: map-get($spacers, 2);
font-weight: bold;
text-align: right;
}
Expand All @@ -52,6 +52,6 @@
justify-content: space-between;

span:first-child {
margin-right: map.get($spacers, 2);
margin-right: map-get($spacers, 2);
}
}
2 changes: 1 addition & 1 deletion ui/scss/core/components/_content_block.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
flex-direction: column;

&:not(:last-child) {
margin-bottom: 2 * map.get($spacers, 3);
margin-bottom: 2 * map-get($spacers, 3);
}

.content-block-header {
Expand Down
2 changes: 1 addition & 1 deletion ui/scss/core/components/_encounter_picker.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
width: 33.33%;

&:not(:last-child) {
margin-right: map.get($spacers, 3);
margin-right: map-get($spacers, 3);
}

&.target-picker-section2 {
Expand Down
2 changes: 1 addition & 1 deletion ui/scss/core/components/_filters_menu.scss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.filters-menu {
.menu-section:not(:last-child) {
margin-bottom: map.get($spacers, 3);
margin-bottom: map-get($spacers, 3);
}

[class*="filters-menu-section-"] {
Expand Down
12 changes: 6 additions & 6 deletions ui/scss/core/components/_gear_picker.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,12 @@
}

.item-picker-labels-container {
padding: map.get($spacers, 2);
padding: map-get($spacers, 2);
flex: 1;

.item-picker-name {
color: white;
font-size: map.get($font-sizes, 6);
font-size: map-get($font-sizes, 6);
letter-spacing: normal;
}

Expand Down Expand Up @@ -148,12 +148,12 @@
}

.item-picker-labels-container {
padding: map.get($spacers, 2);
padding: map-get($spacers, 2);
flex: 1;

.item-picker-name {
color: white;
font-size: map.get($font-sizes, 6);
font-size: map-get($font-sizes, 6);
letter-spacing: normal;
}

Expand All @@ -169,12 +169,12 @@
padding: 0;

.selector-modal-filters {
margin-bottom: map.get($spacers, 3);
margin-bottom: map-get($spacers, 3);
display: flex;
align-items: center;

&> *:not(:last-child) {
margin-right: map.get($spacers, 2);
margin-right: map-get($spacers, 2);
}

input, select {
Expand Down
4 changes: 2 additions & 2 deletions ui/scss/core/components/_icon_picker.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
}

label {
margin-left: map.get($spacers, 2);
margin-left: map-get($spacers, 2);
}

.dropdown-menu {
Expand Down Expand Up @@ -100,7 +100,7 @@
flex-wrap: wrap;

&> :not(:last-child) {
margin-right: map.get($spacers, 1);
margin-right: map-get($spacers, 1);
}

&> * {
Expand Down
4 changes: 2 additions & 2 deletions ui/scss/core/components/_input.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
align-items: center;

label {
margin-right: map.get($spacers, 1);
margin-right: map-get($spacers, 1);
}

input, select {
Expand All @@ -40,7 +40,7 @@
flex: 1;

&:not(:last-child) {
margin-right: map.get($spacers, 3);
margin-right: map-get($spacers, 3);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ui/scss/core/components/_item_swap_picker.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
}

.input-root:not(:last-child) {
margin-right: map.get($spacers, 1);
margin-right: map-get($spacers, 1);
}
}
8 changes: 4 additions & 4 deletions ui/scss/core/components/_list_picker.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
align-items: center;

&:not(:last-child) {
margin-bottom: 2 * map.get($spacers, 3);
margin-bottom: 2 * map-get($spacers, 3);
}

.list-picker-title {
Expand All @@ -21,7 +21,7 @@
width: 100%;

.list-picker-item-container {
margin-bottom: map.get($spacers, 3);
margin-bottom: map-get($spacers, 3);

&.inline {
border: 0;
Expand All @@ -36,7 +36,7 @@
}

&:not(.inline) {
padding: map.get($spacers, 3) map.get($spacers, 3) 0 map.get($spacers, 3);
padding: map-get($spacers, 3) map-get($spacers, 3) 0 map-get($spacers, 3);
border: 1px solid $link-color;

.list-picker-item-header {
Expand All @@ -59,7 +59,7 @@
}

.list-picker-item-action {
margin-left: map.get($spacers, 2);
margin-left: map-get($spacers, 2);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions ui/scss/core/components/_raid_sim_action.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
}

.results-reference {
margin-bottom: map.get($spacers, 2);
margin-bottom: map-get($spacers, 2);
font-weight: normal;

.results-reference-diff {
Expand All @@ -68,7 +68,7 @@
}

.results-sim-reference {
margin-top: map.get($spacers, 2);
margin-top: map-get($spacers, 2);
font-weight: normal;

&.has-reference {
Expand Down
6 changes: 3 additions & 3 deletions ui/scss/core/components/_saved_data_manager.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@
}

.saved-data-set-name {
padding: map.get($spacers, 2);
padding: map-get($spacers, 2);
color: $body-color;
}

.saved-data-set-delete {
padding: map.get($spacers, 2) 0;
margin-right: map.get($spacers, 2);
padding: map-get($spacers, 2) 0;
margin-right: map-get($spacers, 2);
color: $body-color;
}
}
Expand Down
4 changes: 2 additions & 2 deletions ui/scss/core/components/_sim_tab.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
flex: 1;

&:not(:last-child) {
margin-right: 2 * map.get($spacers, 3);
margin-right: 2 * map-get($spacers, 3);
}
}

.tab-panel-col {
flex: 1;

&:not(:last-child) {
margin-right: 2 * map.get($spacers, 3);
margin-right: 2 * map-get($spacers, 3);
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions ui/scss/core/components/_stat_weights_action.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@
}

th {
padding-top: map.get($spacers, 2);
padding-bottom: map.get($spacers, 2);
padding-right: map.get($spacers, 2);
padding-top: map-get($spacers, 2);
padding-bottom: map-get($spacers, 2);
padding-right: map-get($spacers, 2);
text-align: left;
}

Expand Down Expand Up @@ -118,7 +118,7 @@
}

.col-action {
margin-left: map.get($spacers, 1);
margin-left: map-get($spacers, 1);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ui/scss/core/components/individual_sim_ui/_consumes_picker.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
margin-bottom: 0;

&:not(:last-child) {
margin-right: map.get($spacers, 1);
margin-right: map-get($spacers, 1);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ui/scss/core/components/individual_sim_ui/_cooldowns_picker.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}

&> :not(:last-child) {
margin-right: map.get($spacers, 2);
margin-right: map-get($spacers, 2);
}

.cooldown-picker-label {
Expand Down
2 changes: 1 addition & 1 deletion ui/scss/core/components/individual_sim_ui/_rotation_tab.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@

.rotation-settings {
flex: 1;
margin-right: 2 * map.get($spacers, 3);
margin-right: 2 * map-get($spacers, 3);
}

.cooldown-settings {
Expand Down
4 changes: 2 additions & 2 deletions ui/scss/core/components/individual_sim_ui/_settings_tab.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@
grid-template-columns: repeat(3, minmax(0, 1fr));

&> .icon-picker {
margin-bottom: map.get($spacers, 1) !important;
margin-bottom: map-get($spacers, 1) !important;

&:not(:nth-child(3n)) {
margin-right: map.get($spacers, 2);
margin-right: map-get($spacers, 2);
}

.form-label {
Expand Down
2 changes: 1 addition & 1 deletion ui/scss/core/sim_ui/_header.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
font-size: $content-font-size;

.sim-toolbar-item, .sim-toolbar-socials {
margin-left: map.get($spacers, 3);
margin-left: map-get($spacers, 3);
display: flex;

a {
Expand Down
4 changes: 2 additions & 2 deletions ui/scss/core/sim_ui/_sidebar.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
padding-top: $gap-width;
padding-left: $gap-width;
padding-right: $gap-width;
padding-bottom: map.get($spacers, 3);
padding-bottom: map-get($spacers, 3);
display: flex;
flex-direction: column;

&> *:not(:last-child) {
margin-bottom: map.get($spacers, 4);
margin-bottom: map-get($spacers, 4);
}

.sim-sidebar-actions {
Expand Down
Loading

0 comments on commit d793813

Please sign in to comment.