diff --git a/res/logo.png b/res/logo.png index 02f3e540..75dd3a35 100644 Binary files a/res/logo.png and b/res/logo.png differ diff --git a/res/logo_orgiginal.png b/res/logo_orgiginal.png deleted file mode 100644 index 75dd3a35..00000000 Binary files a/res/logo_orgiginal.png and /dev/null differ diff --git a/src/css/dynamic_ui.scss b/src/css/dynamic_ui.scss index 9b7374fa..f5d81baf 100644 --- a/src/css/dynamic_ui.scss +++ b/src/css/dynamic_ui.scss @@ -1,6 +1,6 @@ // Removes the unit (px, %, etc) from a value @function strip-unit($number) { - @if type-of($number)=="number" and not unitless($number) { + @if type-of($number) == "number" and not unitless($number) { @return $number / ($number * 0 + 1); } @return $number; @@ -25,14 +25,14 @@ $impSuffix: "!important"; } $v1: D($v1); - @if $v2 !="" { + @if $v2 != "" { $v2: D($v2); } - @if $v3 !="" { + @if $v3 != "" { $v3: D($v3); } - @if $v4 !="" { + @if $v4 != "" { $v4: D($v4); } #{$propName}: #{$v1} #{$v2} #{$v3} #{$v4} #{$impSuffix}; -} \ No newline at end of file +} diff --git a/src/css/resources.scss b/src/css/resources.scss index 8b24db98..93f4092d 100644 --- a/src/css/resources.scss +++ b/src/css/resources.scss @@ -1,27 +1,6 @@ -$buildings: belt, -cutter, -miner, -mixer, -painter, -rotater, -balancer, -stacker, -trash, -underground_belt, -wire, -constant_signal, -logic_gate, -lever, -filter, -wire_tunnel, -display, -virtual_processor, -reader, -storage, -transistor, -analyzer, -comparator, -item_producer; +$buildings: belt, cutter, miner, mixer, painter, rotater, balancer, stacker, trash, underground_belt, wire, + constant_signal, logic_gate, lever, filter, wire_tunnel, display, virtual_processor, reader, storage, + transistor, analyzer, comparator, item_producer; @each $building in $buildings { [data-icon="building_icons/#{$building}.png"] { /* @load-async */ @@ -29,41 +8,11 @@ item_producer; } } -$buildingsAndVariants: belt, -balancer, -underground_belt, -underground_belt-tier2, -miner, -miner-chainable, -cutter, -cutter-quad, -rotater, -rotater-ccw, -stacker, -mixer, -painter-double, -painter-quad, -trash, -storage, -reader, -rotater-rotate180, -display, -constant_signal, -wire, -wire_tunnel, -logic_gate-or, -logic_gate-not, -logic_gate-xor, -analyzer, -virtual_processor-rotater, -virtual_processor-unstacker, -item_producer, -virtual_processor-stacker, -virtual_processor-painter, -wire-second, -painter, -painter-mirrored, -comparator; +$buildingsAndVariants: belt, balancer, underground_belt, underground_belt-tier2, miner, miner-chainable, + cutter, cutter-quad, rotater, rotater-ccw, stacker, mixer, painter-double, painter-quad, trash, storage, + reader, rotater-rotate180, display, constant_signal, wire, wire_tunnel, logic_gate-or, logic_gate-not, + logic_gate-xor, analyzer, virtual_processor-rotater, virtual_processor-unstacker, item_producer, + virtual_processor-stacker, virtual_processor-painter, wire-second, painter, painter-mirrored, comparator; @each $building in $buildingsAndVariants { [data-icon="building_tutorials/#{$building}.png"] { /* @load-async */ @@ -108,9 +57,7 @@ comparator; background-image: uiResource("res/ui/building_tutorials/virtual_processor-cutter.png") !important; } -$icons: notification_saved, -notification_success, -notification_upgrade; +$icons: notification_saved, notification_success, notification_upgrade; @each $icon in $icons { [data-icon="icons/#{$icon}.png"] { /* @load-async */ @@ -118,34 +65,8 @@ notification_upgrade; } } -$languages: en, -de, -cs, -da, -et, -es-419, -fr, -it, -pt-BR, -sv, -tr, -el, -ru, -uk, -zh-TW, -zh-CN, -nb, -mt-MT, -ar, -nl, -vi, -th, -hu, -pl, -ja, -kor, -no, -pt-PT; +$languages: en, de, cs, da, et, es-419, fr, it, pt-BR, sv, tr, el, ru, uk, zh-TW, zh-CN, nb, mt-MT, ar, nl, vi, + th, hu, pl, ja, kor, no, pt-PT; @each $language in $languages { [data-languageicon="#{$language}"] { /* @load-async */ @@ -153,7 +74,6 @@ pt-PT; } } - /* PRICE */ @@ -166,4 +86,4 @@ PRICE .steam_2_npr { /* @load-async */ background-image: uiResource("get_on_steam.png") !important; -} \ No newline at end of file +} diff --git a/src/css/states/main_menu.scss b/src/css/states/main_menu.scss index 821e6587..929025b9 100644 --- a/src/css/states/main_menu.scss +++ b/src/css/states/main_menu.scss @@ -277,7 +277,7 @@ grid-row: 2 / 3; @include SuperSmallText; opacity: 0.5; - >span { + > span { display: inline-flex; @include S(max-width, 140px); overflow: hidden; @@ -290,7 +290,7 @@ @include PlainText; display: inline-flex; align-items: center; - >span { + > span { display: inline-flex; @include S(max-width, 140px); overflow: hidden; @@ -429,7 +429,7 @@ $linkBg: #fdfdff; $linkBgHover: darken($linkBg, 2); $linkColor: #55586a; - >.boxLink { + > .boxLink { display: grid; align-items: center; grid-template-columns: 1fr auto; @@ -470,14 +470,14 @@ } } } - >.sidelinks { + > .sidelinks { display: grid; align-items: flex-start; justify-content: flex-start; grid-template-rows: 1fr 1fr 1fr; @include S(grid-gap, 3px); @include S(height, 60px); - >a { + > a { color: $linkColor; background: $linkBg; height: 100%; @@ -524,8 +524,8 @@ } } .footer { - >a, - .sidelinks>a { + > a, + .sidelinks > a { background-color: $darkModeControlsBackground; color: #eee; &:hover { @@ -534,7 +534,7 @@ } .author { color: #bdbdbd; - >a { + > a { color: white; } } @@ -543,4 +543,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/html/index.html b/src/html/index.html index 03b08899..b1d89377 100644 --- a/src/html/index.html +++ b/src/html/index.html @@ -1,36 +1,46 @@ +
+