Skip to content

Commit 216427a

Browse files
committed
feat: more css tweaks
1 parent 0e2e2b0 commit 216427a

File tree

8 files changed

+24
-63
lines changed

8 files changed

+24
-63
lines changed

public/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16877,7 +16877,7 @@ function toggleVoidMaps(updateOnly){
1687716877
return;
1687816878
}
1687916879
elem.style.display = "block";
16880-
voidMapsHere.style.display = "block";
16880+
voidMapsHere.style.display = "flex";
1688116881
mapsHere.style.display = "none";
1688216882
mapsCreate.style.display = "none";
1688316883
heirRare.style.display = "block";

src/entities/heirlooms/overview.module.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,10 @@
1515
padding: $size-little $size-small;
1616
cursor: pointer;
1717
}
18+
19+
.heirlooms {
20+
display: flex;
21+
flex-flow: row nowrap;
22+
gap: 1em;
23+
justify-content: center;
24+
}

src/entities/heirlooms/overview.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import clsx from "clsx";
2-
import styles from "./overview.module.scss";
32
import { Button } from "#components/buttons";
43

4+
import styles from "./overview.module.scss";
5+
56
export function HeirloomsOverview() {
67
return (
78
<div id="heirloomWrapper" style={{ display: "none" }}>
@@ -195,7 +196,7 @@ export function HeirloomsOverview() {
195196
<div id="extraHeirloomsHere"></div>
196197
<div
197198
id="extraHeirloomsBtnGroup"
198-
className="heirloomBtnGroup"
199+
className={clsx("heirloomBtnGroup", styles.heirlooms)}
199200
style={{ visibility: "hidden" }}
200201
>
201202
<div

src/entities/main-screen/bottom-row/battle.module.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,10 @@
2828
justify-content: center;
2929
align-items: baseline;
3030
}
31+
32+
.void_maps {
33+
flex-flow: row wrap;
34+
gap: $size-normal;
35+
justify-content: flex-start;
36+
align-items: stretch;
37+
}

src/entities/main-screen/bottom-row/battle.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import clsx from "clsx";
2+
13
import styles from "./battle.module.scss";
24

35
export function Battle() {
@@ -385,7 +387,7 @@ export function Battle() {
385387

386388
<div id="mapsHere" className="mapSize1 niceScroll"></div>
387389

388-
<div id="voidMapsHere" className="niceScroll"></div>
390+
<div id="voidMapsHere" className={clsx("niceScroll", styles.void_maps)}></div>
389391
</div>
390392

391393
<div

src/entities/main-screen/top-row/miscelaneous.module.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@use "../../../styles/sass/variables.scss" as *;
22

33
.block {
4+
flex: 1 0 100%;
45
display: flex;
56
flex-flow: row wrap;
67
gap: $size-normal;

src/entities/main-screen/top-row/resources.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.block {
2-
flex: 1 1 auto;
2+
flex: 1 0 100%;
33
display: flex;
44
flex-flow: row wrap;
55
gap: 1em;

src/styles/original/style.scss

Lines changed: 1 addition & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -964,9 +964,6 @@ body {
964964
.optionContainer {
965965
display: inline-block;
966966
vertical-align: top;
967-
margin-left: 2vw;
968-
margin-right: 2vw;
969-
margin-bottom: 1vw;
970967
width: 15.5vw;
971968
}
972969

@@ -975,32 +972,11 @@ body {
975972
width: 45%;
976973
}
977974

978-
#talentsEssenceTotal {
979-
}
980-
981-
.optionContainer.settingFit12 {
982-
margin-left: 0.58vw;
983-
margin-right: 0.58vw;
984-
}
985-
986-
.optionItemDescription {
987-
padding-left: 0.5vw;
988-
padding-right: 0.5vw;
989-
}
990975

991976
#settingTitleBar {
992977
text-align: center;
993-
padding-top: 1.5vw;
994-
margin-bottom: 1.5vw;
995-
}
996-
997-
#settingsHere {
998-
margin-bottom: 2vw;
999978
}
1000979

1001-
#searchSettingsTitle {
1002-
margin: 0 3vw;
1003-
}
1004980

1005981
#searchSettings {
1006982
color: black;
@@ -1012,12 +988,9 @@ body {
1012988
}
1013989

1014990
#settingsTabs {
1015-
margin-top: 0.75vw;
1016991
}
1017992

1018993
.settingTypeBtn {
1019-
margin-top: 0.4vw;
1020-
margin-bottom: 0.5vw;
1021994
margin-right: 0;
1022995
}
1023996

@@ -1031,14 +1004,6 @@ body {
10311004
border-radius: 8px 8px 0 0 !important;
10321005
}
10331006

1034-
.buyTab {
1035-
}
1036-
1037-
#mapsHere,
1038-
#voidMapsHere {
1039-
overflow-y: auto;
1040-
width: 100%;
1041-
}
10421007

10431008
#equipmentTitleDiv .lowPad,
10441009
#buildingsTitleDiv .lowPad:nth-child(2) {
@@ -1777,7 +1742,7 @@ body {
17771742

17781743
.heirloomBtnGroup {
17791744
background-color: #333;
1780-
border-top: 0.1vw solid #555;
1745+
border-top: 0.125em solid #555;
17811746
}
17821747

17831748
.heirBtn.heirloomBtnActive:hover {
@@ -3865,27 +3830,10 @@ body {
38653830
color: #ddddff;
38663831
}
38673832

3868-
.sizeSecReduced {
3869-
margin-top: 0.2em;
3870-
}
3871-
3872-
#resourceColumn .sizeSecReduced {
3873-
letter-spacing: -0.04em;
3874-
margin-left: -3%;
3875-
}
3876-
3877-
#miscColumn .sizeSecReduced {
3878-
letter-spacing: -0.05em;
3879-
}
3880-
38813833
.seventhColumn {
38823834
width: 14.2857% !important;
38833835
}
38843836

3885-
#gemsPs .sizeSecReduced,
3886-
#fragmentsPs .sizeSecReduced {
3887-
}
3888-
38893837
.planetBreakDescription {
38903838
font-weight: bold;
38913839
}
@@ -3931,11 +3879,6 @@ body {
39313879
background-color: #666666;
39323880
}
39333881

3934-
#mapsBtn div:nth-child(2) span {
3935-
}
3936-
3937-
.voidBadge {
3938-
}
39393882

39403883
.successColor,
39413884
.colorSuccess {

0 commit comments

Comments
 (0)