diff --git a/app/app.ejs b/app/app.ejs index 75b5ea28..b9ed5a3e 100644 --- a/app/app.ejs +++ b/app/app.ejs @@ -39,10 +39,7 @@ <%- include('overlay') %>
-
- - -
+
diff --git a/app/assets/css/launcher.css b/app/assets/css/launcher.css index aba69600..aa2d96fa 100644 --- a/app/assets/css/launcher.css +++ b/app/assets/css/launcher.css @@ -747,6 +747,51 @@ body, button { } } +/* HTML:
*/ +.loader{ + width: 40px; + aspect-ratio: 1; + --c:no-repeat linear-gradient(#ffffff 0 0); + background: + var(--c) 0 0, + var(--c) 0 100%, + var(--c) 50% 0, + var(--c) 50% 100%, + var(--c) 100% 0, + var(--c) 100% 100%; + background-size: 8px 50%; + animation: l7-0 1s infinite; + position: relative; + overflow: hidden; +} +.loader:before { + content: ""; + position: absolute; + width: 8px; + height: 8px; + border-radius: 50%; + background: #f46d40; + top: calc(50% - 4px); + left: -8px; + animation: inherit; + animation-name: l7-1; +} + +@keyframes l7-0 { + 16.67% {background-size:8px 30%, 8px 30%, 8px 50%, 8px 50%, 8px 50%, 8px 50%} + 33.33% {background-size:8px 30%, 8px 30%, 8px 30%, 8px 30%, 8px 50%, 8px 50%} + 50% {background-size:8px 30%, 8px 30%, 8px 30%, 8px 30%, 8px 30%, 8px 30%} + 66.67% {background-size:8px 50%, 8px 50%, 8px 30%, 8px 30%, 8px 30%, 8px 30%} + 83.33% {background-size:8px 50%, 8px 50%, 8px 50%, 8px 50%, 8px 30%, 8px 30%} +} + +@keyframes l7-1 { + 20% {left:0px} + 40% {left:calc(50% - 4px)} + 60% {left:calc(100% - 8px)} + 80%, + 100% {left:100%} +} /*.spinningCircle { @@ -2855,7 +2900,7 @@ input:checked + .toggleSwitchSlider:before { /* Logo image. */ #image_seal { - height: 90px; + height: 60px; width: auto; position: relative; box-sizing: border-box; diff --git a/app/assets/images/LoadingSeal.png b/app/assets/images/LoadingSeal.png deleted file mode 100644 index afe2c4d4..00000000 Binary files a/app/assets/images/LoadingSeal.png and /dev/null differ diff --git a/app/assets/images/LoadingText.png b/app/assets/images/LoadingText.png deleted file mode 100644 index 5e55b332..00000000 Binary files a/app/assets/images/LoadingText.png and /dev/null differ diff --git a/app/assets/images/marcusLogo.png b/app/assets/images/marcusLogo.png index dbff3a10..0a4d0740 100644 Binary files a/app/assets/images/marcusLogo.png and b/app/assets/images/marcusLogo.png differ diff --git a/app/assets/js/configmanager.js b/app/assets/js/configmanager.js index 38f864fe..1b8bc49e 100644 --- a/app/assets/js/configmanager.js +++ b/app/assets/js/configmanager.js @@ -7,7 +7,7 @@ const logger = LoggerUtil.getLogger('ConfigManager') const sysRoot = process.env.APPDATA || (process.platform == 'darwin' ? process.env.HOME + '/Library/Application Support' : process.env.HOME) -const dataPath = path.join(sysRoot, '.helioslauncher') +const dataPath = path.join(sysRoot, '.marcusklauncher') const launcherDir = require('@electron/remote').app.getPath('userData') diff --git a/app/assets/lang/_custom.toml b/app/assets/lang/_custom.toml index 31cb0b66..2e9da78c 100644 --- a/app/assets/lang/_custom.toml +++ b/app/assets/lang/_custom.toml @@ -11,10 +11,10 @@ mediaYouTubeURL = "#" mediaDiscordURL = "https://discord.gg/marcusk" [ejs.settings] -sourceGithubLink = "https://github.com/dscalZi/HeliosLauncher" -supportLink = "https://github.com/dscalZi/HeliosLauncher/issues" +sourceGithubLink = "https://github.com/LeafdTK/Launcher" +supportLink = "https://github.com/LeafdTK/Launcher/issues" [ejs.welcome] -welcomeHeader = "WELCOME TO WESTEROSCRAFT" -welcomeDescription = "Our mission is to recreate the universe imagined by author George RR Martin in his fantasy series, A Song of Ice and Fire. Through the collaborative effort of thousands of community members, we have sought to create Westeros as accurately and precisely as possible within Minecraft. The world we are creating is yours to explore. Journey from Dorne to Castle Black, and if you aren’t afraid, beyond the Wall itself, but best not delay. As the words of House Stark ominously warn: Winter is Coming." -welcomeDescCTA = "You are just a few clicks away from Westeros." +welcomeHeader = "WELCOME TO MARCUSK EVENTS" +welcomeDescription = "The Goal Is Simple To Provide You With The Highest Quality Minecraft Videos And Events In The World!" +welcomeDescCTA = "You are just a few clicks away from the best event." diff --git a/app/settings.ejs b/app/settings.ejs index 3fda82a2..c41a2f8f 100644 --- a/app/settings.ejs +++ b/app/settings.ejs @@ -331,7 +331,7 @@
<%- lang('settings.sourceGithub') %> - + Original Source <%- lang('settings.support') %> <%- lang('settings.devToolsConsole') %>
diff --git a/app/welcome.ejs b/app/welcome.ejs index 4b3fee46..5c6256a0 100644 --- a/app/welcome.ejs +++ b/app/welcome.ejs @@ -4,7 +4,7 @@
-->
- + <%- lang('welcome.welcomeHeader') %> <%- lang('welcome.welcomeDescription') %>