diff --git a/res_built/atlas/atlas0_10.json b/res_built/atlas/atlas0_10.json
index 86f1f8a3..bfa4206c 100644
--- a/res_built/atlas/atlas0_10.json
+++ b/res_built/atlas/atlas0_10.json
@@ -1399,6 +1399,6 @@
"format": "RGBA8888",
"size": {"w":690,"h":128},
"scale": "0.1",
- "smartupdate": "$TexturePacker:SmartUpdate:bf30498b7e1d76f2f7b9d1274acdd7cd:7220449b6cf5c4e08c60eab73ea85805:f159918d23e5952766c6d23ab52278c6$"
+ "smartupdate": "$TexturePacker:SmartUpdate:64fccb50e5cbc78c707e6728e5ddc881:7220449b6cf5c4e08c60eab73ea85805:f159918d23e5952766c6d23ab52278c6$"
}
}
diff --git a/res_built/atlas/atlas0_10.png b/res_built/atlas/atlas0_10.png
index 42bf1607..a1bdcf03 100644
Binary files a/res_built/atlas/atlas0_10.png and b/res_built/atlas/atlas0_10.png differ
diff --git a/res_built/atlas/atlas0_100.json b/res_built/atlas/atlas0_100.json
index 7f8ef65f..8e6d262a 100644
--- a/res_built/atlas/atlas0_100.json
+++ b/res_built/atlas/atlas0_100.json
@@ -1399,6 +1399,6 @@
"format": "RGBA8888",
"size": {"w":2048,"h":2708},
"scale": "1",
- "smartupdate": "$TexturePacker:SmartUpdate:bf30498b7e1d76f2f7b9d1274acdd7cd:7220449b6cf5c4e08c60eab73ea85805:f159918d23e5952766c6d23ab52278c6$"
+ "smartupdate": "$TexturePacker:SmartUpdate:64fccb50e5cbc78c707e6728e5ddc881:7220449b6cf5c4e08c60eab73ea85805:f159918d23e5952766c6d23ab52278c6$"
}
}
diff --git a/res_built/atlas/atlas0_25.json b/res_built/atlas/atlas0_25.json
index 188c39ab..8c2b6642 100644
--- a/res_built/atlas/atlas0_25.json
+++ b/res_built/atlas/atlas0_25.json
@@ -1399,6 +1399,6 @@
"format": "RGBA8888",
"size": {"w":490,"h":837},
"scale": "0.25",
- "smartupdate": "$TexturePacker:SmartUpdate:bf30498b7e1d76f2f7b9d1274acdd7cd:7220449b6cf5c4e08c60eab73ea85805:f159918d23e5952766c6d23ab52278c6$"
+ "smartupdate": "$TexturePacker:SmartUpdate:64fccb50e5cbc78c707e6728e5ddc881:7220449b6cf5c4e08c60eab73ea85805:f159918d23e5952766c6d23ab52278c6$"
}
}
diff --git a/res_built/atlas/atlas0_25.png b/res_built/atlas/atlas0_25.png
index eed32078..d13fb3e0 100644
Binary files a/res_built/atlas/atlas0_25.png and b/res_built/atlas/atlas0_25.png differ
diff --git a/res_built/atlas/atlas0_50.json b/res_built/atlas/atlas0_50.json
index f991e46a..c83cc41f 100644
--- a/res_built/atlas/atlas0_50.json
+++ b/res_built/atlas/atlas0_50.json
@@ -1399,6 +1399,6 @@
"format": "RGBA8888",
"size": {"w":1522,"h":949},
"scale": "0.5",
- "smartupdate": "$TexturePacker:SmartUpdate:bf30498b7e1d76f2f7b9d1274acdd7cd:7220449b6cf5c4e08c60eab73ea85805:f159918d23e5952766c6d23ab52278c6$"
+ "smartupdate": "$TexturePacker:SmartUpdate:64fccb50e5cbc78c707e6728e5ddc881:7220449b6cf5c4e08c60eab73ea85805:f159918d23e5952766c6d23ab52278c6$"
}
}
diff --git a/res_built/atlas/atlas0_50.png b/res_built/atlas/atlas0_50.png
index f5a7db1d..6f2eaad1 100644
Binary files a/res_built/atlas/atlas0_50.png and b/res_built/atlas/atlas0_50.png differ
diff --git a/res_built/atlas/atlas0_75.json b/res_built/atlas/atlas0_75.json
index 34827276..06883bba 100644
--- a/res_built/atlas/atlas0_75.json
+++ b/res_built/atlas/atlas0_75.json
@@ -1399,6 +1399,6 @@
"format": "RGBA8888",
"size": {"w":1759,"h":1834},
"scale": "0.75",
- "smartupdate": "$TexturePacker:SmartUpdate:bf30498b7e1d76f2f7b9d1274acdd7cd:7220449b6cf5c4e08c60eab73ea85805:f159918d23e5952766c6d23ab52278c6$"
+ "smartupdate": "$TexturePacker:SmartUpdate:64fccb50e5cbc78c707e6728e5ddc881:7220449b6cf5c4e08c60eab73ea85805:f159918d23e5952766c6d23ab52278c6$"
}
}
diff --git a/res_built/atlas/atlas0_75.png b/res_built/atlas/atlas0_75.png
index 066c604b..926ce2dd 100644
Binary files a/res_built/atlas/atlas0_75.png and b/res_built/atlas/atlas0_75.png differ
diff --git a/res_raw/atlas.tps b/res_raw/atlas.tps
index 87eacd70..a5a6abbd 100644
--- a/res_raw/atlas.tps
+++ b/res_raw/atlas.tps
@@ -449,6 +449,7 @@
sprites/blueprints/miner-chainable.png
sprites/blueprints/miner.png
sprites/blueprints/rotater-ccw.png
+ sprites/blueprints/rotater-fl.png
sprites/blueprints/rotater.png
sprites/blueprints/splitter-compact-inverse.png
sprites/blueprints/splitter-compact.png
@@ -459,6 +460,7 @@
sprites/blueprints/underground_belt_exit.png
sprites/buildings/miner-chainable.png
sprites/buildings/rotater-ccw.png
+ sprites/buildings/rotater-fl.png
sprites/buildings/splitter-compact-inverse.png
sprites/buildings/splitter-compact.png
sprites/buildings/underground_belt_entry-tier2.png
diff --git a/src/css/states/about.scss b/src/css/states/about.scss
index 052afe56..02025e03 100644
--- a/src/css/states/about.scss
+++ b/src/css/states/about.scss
@@ -3,16 +3,16 @@
@include S(max-width, 600px);
@include PlainText;
padding: 0;
+ background: transparent;
}
.head {
- background: rgba(0, 0, 0, 0.2);
- @include S(padding, 10px);
+ @include S(padding, 20px);
img {
display: block;
margin: 0 auto;
- @include S(max-width, 300px);
+ @include S(max-width, 200px);
}
}
@@ -23,10 +23,4 @@
a {
@include S(margin, 0, 3px);
}
-
- @include DarkThemeOverride {
- .head {
- background: rgba(22, 21, 21, 0.1);
- }
- }
}
diff --git a/src/css/states/main_menu.scss b/src/css/states/main_menu.scss
index a2e0a81d..3537e6fd 100644
--- a/src/css/states/main_menu.scss
+++ b/src/css/states/main_menu.scss
@@ -55,7 +55,7 @@
opacity: 0;
display: none;
transform: translate(50%, 50%);
- filter: blur(10px);
+ // filter: blur(10px);
$opacity: 0.2;
&.loaded {
@@ -178,6 +178,10 @@
transform: translateX(50%) rotate(-7deg) scale(1.1);
}
}
+
+ @include DarkThemeOverride {
+ color: $colorBlueBright;
+ }
}
}
diff --git a/src/css/states/settings.scss b/src/css/states/settings.scss
index cfa496ed..5a35a9a2 100644
--- a/src/css/states/settings.scss
+++ b/src/css/states/settings.scss
@@ -1,6 +1,6 @@
#state_SettingsState {
- $colorCategoryButton: #393747;
- $colorCategoryButtonSelected: #5c5872;
+ $colorCategoryButton: #eee;
+ $colorCategoryButtonSelected: #5f748b;
.container .content {
display: flex;
@@ -115,16 +115,23 @@
}
}
- button.categoryButton {
+ button.categoryButton,
+ button.about {
background-color: $colorCategoryButton;
+ color: #777a7f;
&.active {
background-color: $colorCategoryButtonSelected;
- }
- }
+ color: #fff;
- button.about {
- background-color: $colorGreenBright;
+ &:hover {
+ opacity: 1;
+ }
+ }
+
+ &.pressed {
+ transform: none !important;
+ }
}
.versionbar {
@@ -145,8 +152,9 @@
@include DarkThemeOverride {
.container .content {
.sidebar {
- button.categoryButton {
- background-color: #44444f;
+ button.categoryButton,
+ button.about {
+ background-color: #3f3f47;
&.active {
background-color: $colorBlueBright;
diff --git a/src/js/changelog.js b/src/js/changelog.js
index 05f47f8d..1a5ec3de 100644
--- a/src/js/changelog.js
+++ b/src/js/changelog.js
@@ -4,6 +4,7 @@ export const CHANGELOG = [
date: "unreleased",
entries: [
"WIRES",
+ "Reworked menu UI design (by dengr1605)",
"Allow holding ALT in belt planner to reverse direction (by jakobhellermann)",
"Clear cursor when trying to pipette the same building twice (by hexy)",
"Added keybinding to close menus (by isaisstillalive / Sandwichs-del)",
diff --git a/src/js/profile/application_settings.js b/src/js/profile/application_settings.js
index a1f17e86..50c34e0e 100644
--- a/src/js/profile/application_settings.js
+++ b/src/js/profile/application_settings.js
@@ -252,7 +252,7 @@ export const allApplicationSettings = [
changeCb: (app, id) => {},
}),
- new BoolSetting("alwaysMultiplace", enumCategories.userInterface, (app, value) => {}),
+ new BoolSetting("alwaysMultiplace", enumCategories.advanced, (app, value) => {}),
new BoolSetting("enableTunnelSmartplace", enumCategories.advanced, (app, value) => {}),
new BoolSetting("vignette", enumCategories.userInterface, (app, value) => {}),
new BoolSetting("compactBuildingInfo", enumCategories.userInterface, (app, value) => {}),
diff --git a/src/js/states/settings.js b/src/js/states/settings.js
index f4c5a022..5e22492a 100644
--- a/src/js/states/settings.js
+++ b/src/js/states/settings.js
@@ -18,13 +18,16 @@ export class SettingsState extends TextualGameState {