Compare commits
No commits in common. "aca913613747a656608f56e08ec2611f2a4280f5" and "309873c95912707467bdc3bb1b1ee26581444f15" have entirely different histories.
aca9136137
...
309873c959
@ -4027,70 +4027,4 @@ input:checked + .toggleSwitchSlider:before {
|
||||
transition: 0.25s ease;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
/*******************************************************************************
|
||||
* *
|
||||
* Skirda Discord Authorization *
|
||||
* *
|
||||
******************************************************************************/
|
||||
|
||||
.Centered {
|
||||
position: relative;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
height: 100%;
|
||||
/* width: 100%; */
|
||||
}
|
||||
|
||||
.Centered > div {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
#loginSkirdaAuthorizationWindow {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
background: rgba(0, 0, 0, 0.4);
|
||||
border: 1px solid rgb(83 83 83 / 60%);
|
||||
border-radius: 3px;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
#settingsAboutCurrentVersion {
|
||||
text-align: center;
|
||||
width: 50%;
|
||||
padding: 2rem 0 2rem 0;
|
||||
}
|
||||
|
||||
#loginSkirdaAuthorizationNote {
|
||||
font-size: 10px;
|
||||
color: grey;
|
||||
}
|
||||
|
||||
#loginSkirdaAuthorizationRetryButton {
|
||||
margin-bottom: 0.7rem;
|
||||
color: rgb(249 249 249);
|
||||
border: 1px solid rgb(209 209 209);
|
||||
border-radius: 4px;
|
||||
transition: 0.25s ease;
|
||||
font-size: 15px;
|
||||
cursor: pointer;
|
||||
outline: none;
|
||||
background: none;
|
||||
padding: 0.4rem 1rem 0.4rem 1rem;
|
||||
}
|
||||
|
||||
#loginSkirdaAuthorizationRetryButton:hover {
|
||||
background: rgb(0 0 0 / 91%);
|
||||
border: 1px solid rgb(83 83 83 / 42%);
|
||||
}
|
||||
|
||||
#loginSkirdaAuthorizationRetryButton:active {
|
||||
background: rgb(0 0 0 / 91%);
|
||||
border: 1px solid rgb(83 83 83 / 42%);
|
||||
}
|
||||
@ -17,7 +17,6 @@ newsErrorLoadSpan = "Checking for News.."
|
||||
newsErrorFailedSpan = "Failed to Load News"
|
||||
newsErrorRetryButton = "Try Again"
|
||||
newsErrorNoneSpan = "No News"
|
||||
mapButton = "MAP"
|
||||
|
||||
[ejs.login]
|
||||
loginCancelText = "Cancel"
|
||||
@ -123,8 +122,6 @@ launcherUpdatesHeaderDesc = "Download, install, and review updates for the launc
|
||||
checkForUpdates = "Check for Updates"
|
||||
whatsNew = "What's New"
|
||||
updateReleaseNotes = "Update Release Notes"
|
||||
skirdaAccount = "Skirda"
|
||||
addSkirdaAccount = "Authorize with Skirda"
|
||||
|
||||
[ejs.waiting]
|
||||
waitingText = "Waiting for Microsoft.."
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
[ejs.landing]
|
||||
updateAvailableTooltip = "Доступно обновление"
|
||||
usernamePlaceholder = "Никнейм"
|
||||
usernameEditButton = "Изм."
|
||||
usernameEditButton = "Редактировать"
|
||||
settingsTooltip = "Настройки"
|
||||
serverStatus = "СЕРВЕР"
|
||||
serverStatusPlaceholder = "ОФФЛАЙН"
|
||||
@ -17,7 +17,6 @@ newsErrorLoadSpan = "Checking for News.."
|
||||
newsErrorFailedSpan = "Failed to Load News"
|
||||
newsErrorRetryButton = "Try Again"
|
||||
newsErrorNoneSpan = "No News"
|
||||
mapButton = "КАРТА"
|
||||
|
||||
[ejs.login]
|
||||
loginCancelText = "Отминет"
|
||||
@ -28,7 +27,7 @@ loginPasswordError = "* Требуется"
|
||||
loginPasswordPlaceholder = "ПАРОЛЬ"
|
||||
loginForgotPasswordLink = "https://minecraft.net/password/forgot/"
|
||||
loginForgotPasswordText = "Забыли пароль?"
|
||||
loginRememberMeText = "Запомнить"
|
||||
loginRememberMeText = "помнишь меня?"
|
||||
loginButtonText = "ЛОГИН"
|
||||
loginNeedAccountLink = "https://minecraft.net/store/minecraft-java-edition/"
|
||||
loginNeedAccountText = "Нужен аккаунт?"
|
||||
@ -56,7 +55,7 @@ navMinecraft = "Minecraft"
|
||||
navMods = "Моды"
|
||||
navJava = "Java"
|
||||
navLauncher = "Лаунчер"
|
||||
navAbout = "О лаунчере"
|
||||
navAbout = "О"
|
||||
navUpdates = "Обновления"
|
||||
navDone = "Готово"
|
||||
tabAccountHeaderText = "Настройки аккаунта"
|
||||
@ -86,7 +85,7 @@ selectShaderpack = "Выберите пак шейдеров"
|
||||
tabJavaHeaderText = "Настройки Java"
|
||||
tabJavaHeaderDesc = "Настройка конфигурации Java (advanced)."
|
||||
memoryTitle = "Память"
|
||||
maxRAM = "Максимально допустимый объем ОЗУ"
|
||||
maxRAM = "Максимальное допустимый объем ОЗУ"
|
||||
minRAM = "Минимально допустимый объем ОЗУ"
|
||||
memoryDesc = "Рекомендуемый минимум объема ОЗУ - 3 Гб. Установка одинакового максимального и миниального значений может увеличить производительность."
|
||||
memoryTotalTitle = "Всего"
|
||||
@ -119,12 +118,10 @@ changelog = "Изменения"
|
||||
noReleaseNotes = "Нет примечаний к релизу"
|
||||
viewReleaseNotes = "Посмотреть примечания к релизу"
|
||||
launcherUpdatesHeaderText = "Обновления лаунчера"
|
||||
launcherUpdatesHeaderDesc = "Проверить наличие новых версий и обновить."
|
||||
launcherUpdatesHeaderDesc = "Скачать, установить лаунчер."
|
||||
checkForUpdates = "Проверить на наличие обновлений"
|
||||
whatsNew = "Что нового?"
|
||||
updateReleaseNotes = "Причения к обновлению"
|
||||
skirdaAccount = "Скирда"
|
||||
addSkirdaAccount = "Авторизироватся через Скирду"
|
||||
|
||||
[ejs.waiting]
|
||||
waitingText = "Ожидание Microsoft.."
|
||||
|
||||
@ -105,7 +105,7 @@
|
||||
</defs>
|
||||
<polyline class="arrowLine" points="0.71 13.26 12.56 1.41 24.16 13.02"/>
|
||||
</svg>
|
||||
<span id="dynmapDoneButtonText"><%- lang('landing.MapButton') %></span>
|
||||
<span id="dynmapDoneButtonText">MAP</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -1,40 +1,28 @@
|
||||
<div id="loginSkirdaDiscordContainer" style="display: none;" class="Centered">
|
||||
|
||||
<!--Окно открытия браузера (ожидание ответа)-->
|
||||
<div id="loginSkirdaAuthorizationWindow" style="display:none;">
|
||||
<div id="settingsAboutCurrentContent" class="Centered">
|
||||
<div id="settingsAboutCurrentHeadline">
|
||||
<img id="settingsAboutLogo" src="./assets/images/SealCircle.png">
|
||||
<span id="settingsAboutTitle">Authorize through Skirda Discord</span>
|
||||
</div>
|
||||
<div id="settingsAboutCurrentVersion" class="Centered">
|
||||
<span>Мы открыли браузер для дальнейшей авторизации через Discord</span>
|
||||
</div>
|
||||
</div>
|
||||
<div id="settingsAboutButtons">
|
||||
<span id="loginSkirdaAuthorizationNote">В случае, если это не произошло, откройте его самостоятельно</span>
|
||||
</div>
|
||||
<div id="loginSkirdaDiscordContainer" style="display: none;">
|
||||
<div id="loginOfflineCancelContainer" > <!--Delete style="" as temp fix-->
|
||||
<button id="loginOfflineCancelButton">
|
||||
<div id="loginOfflineCancelIcon">X</div>
|
||||
<span id="loginOfflineCancelText">Cancel</span>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<!--Ошибка-->
|
||||
<div id="loginSkirdaAuthorizationWindow">
|
||||
<div id="settingsAboutCurrentContent" class="Centered">
|
||||
<div id="settingsAboutCurrentHeadline">
|
||||
<img id="settingsAboutLogo" src="./assets/images/SealCircle.png">
|
||||
<span id="settingsAboutTitle">Authorize through Skirda Discord</span>
|
||||
<div id="loginContent">
|
||||
<button id="loginSkirdaDiscordInitAuth" class="loginButton" enabled>
|
||||
<div id="loginOfflineButtonContent">
|
||||
LOGIN
|
||||
<svg id="loginSVG" viewBox="0 0 24.87 13.97">
|
||||
<defs>
|
||||
<style>.arrowLine{fill:none;stroke:#FFF;stroke-width:2px;transition: 0.25s ease;}</style>
|
||||
</defs>
|
||||
<polyline class="arrowLine" points="0.71 13.26 12.56 1.41 24.16 13.02"/>
|
||||
</svg>
|
||||
<div class="circle-loader">
|
||||
<div class="checkmark draw"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="settingsAboutCurrentVersion" class="Centered">
|
||||
<span>Ошибка при авторизации :(</span>
|
||||
</div>
|
||||
<div class="settingsAboutCurrentContent">
|
||||
<button id="loginSkirdaAuthorizationRetryButton">Повторить</button>
|
||||
<button class="settingsAuthAccountLogOut" style="opacity: 100%;">Отменить</button>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div id="settingsAboutButtons">
|
||||
<span id="loginSkirdaAuthorizationNote">Не получается? Обратитесь к администрации проекта за помощью</span>
|
||||
</div>
|
||||
|
||||
</button>
|
||||
</div>
|
||||
<script src="./assets/js/scripts/loginSkirdaDiscord.js"></script>
|
||||
<script src="./assets/js/skirda-auth/auth.js"></script>
|
||||
|
||||
|
||||
</div>
|
||||
Loading…
Reference in New Issue
Block a user