forked from spacebar/SplatNet
patch up merge conflicts (this some bs ass commit ngl dont even LOOK at it)
This commit is contained in:
parent
514c0b5526
commit
841fc4701e
5 changed files with 77 additions and 74 deletions
|
|
@ -3,6 +3,7 @@
|
|||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<link rel="stylesheet" href="../style.css" />
|
||||
<title>mewo</title>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,2 +1,3 @@
|
|||
<!DOCTYPE html>
|
||||
<script src="https://code.jquery.com/jquery-4.0.0.min.js"></script>
|
||||
<script src="autoredirect.js"></script>
|
||||
|
|
@ -1,6 +1,5 @@
|
|||
<!DOCTYPE html>
|
||||
|
||||
<html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8"/>
|
||||
<meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible"/>
|
||||
|
|
@ -20,78 +19,78 @@
|
|||
<title>SplatNet - Splatoon's multiplayer service hub</title>
|
||||
<link href="../assets/application-b4c7459fc6df950ab76bf61ce3457179f3260b0e44b1a2ea9fc252bbbc13ac22.css" media="all" rel="stylesheet"/>
|
||||
<script data-turbolinks-track="true" src="../assets/application-e247a417be83a666f78bb66e010996d13c08ed54ebc5174448e80be44628c6fd.js"></script>
|
||||
<link href="" rel="shortcut icon" type="image/x-icon"/>
|
||||
</head>
|
||||
<body>
|
||||
<div class="ika-wrapper welcome">
|
||||
<div class="geso-public">
|
||||
<header>
|
||||
<div class="icon-header-logo"></div>
|
||||
</header>
|
||||
<div class="tour">
|
||||
<div style="overflow: hidden">
|
||||
<div class="tour-screen m-scooch-inner">
|
||||
<div class="tour-1 m-item"></div>
|
||||
<div class="tour-2 m-item"></div>
|
||||
<div class="tour-3 m-item"></div>
|
||||
</div>
|
||||
</div>
|
||||
<a class="tour-prev hidden image-link" data-m-slide="prev" href="#">prev</a>
|
||||
<a class="tour-next image-link" data-m-slide="next" href="#">next</a>
|
||||
<div class="tour-bullet-wrapper">
|
||||
<div class="tour-bullet">
|
||||
<a class="active" data-m-slide="1" href="">1</a>
|
||||
<a data-m-slide="2" href="">2</a>
|
||||
<a data-m-slide="3" href="">3</a>
|
||||
</div>
|
||||
</div>
|
||||
<link href="../favicon.ico" rel="shortcut icon" type="image/x-icon"/>
|
||||
</head>
|
||||
<body>
|
||||
<div class="ika-wrapper welcome">
|
||||
<div class="geso-public">
|
||||
<header>
|
||||
<div class="icon-header-logo"></div>
|
||||
</header>
|
||||
<div class="tour">
|
||||
<div style="overflow: hidden">
|
||||
<div class="tour-screen m-scooch-inner">
|
||||
<div class="tour-1 m-item"></div>
|
||||
<div class="tour-2 m-item"></div>
|
||||
<div class="tour-3 m-item"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="do-public">
|
||||
<div class="contents">
|
||||
<div class="login">
|
||||
<a class="nnid-login-btn" href="../users/auth/splatfestival/">
|
||||
<span class="nnid-login-bg">Log in</span>
|
||||
</a>
|
||||
<span class="nnid-description">To use SplatNet, you need to log in with your Splatfestival Network ID.</span>
|
||||
<span class="security-announcement">Note: We have confirmed the existence of smartphone apps that utilize information from this website, but none of them are affiliated with Nintendo in any way. Please be aware that Nintendo will not be held responsible for any problems or damages that may arise from the use of such apps.</span>
|
||||
</div>
|
||||
<a class="tour-prev hidden image-link" data-m-slide="prev" href="#">prev</a>
|
||||
<a class="tour-next image-link" data-m-slide="next" href="#">next</a>
|
||||
<div class="tour-bullet-wrapper">
|
||||
<div class="tour-bullet">
|
||||
<a class="active" data-m-slide="1" href="">1</a>
|
||||
<a data-m-slide="2" href="">2</a>
|
||||
<a data-m-slide="3" href="">3</a>
|
||||
</div>
|
||||
</div>
|
||||
<footer class="enpera">
|
||||
<div class="site-policy">
|
||||
<a href="http://www.esrb.org/ratings/ratings_guide.jsp">
|
||||
<span class="esrb-bg"></span>
|
||||
</a>
|
||||
<a href="http://www.esrb.org/confirm/nintendo-confirmation.jsp">
|
||||
<span class="privacy-certified-bg"></span>
|
||||
</a>
|
||||
<a class="text-link site-policy-url" href="../site_policy">Site Policy</a>
|
||||
</div>
|
||||
<small>©Nintendo</small>
|
||||
</footer>
|
||||
</div>
|
||||
<script>
|
||||
$(function() {
|
||||
$('.tour').scooch({
|
||||
classPrefix: '',
|
||||
classNames: {
|
||||
inner: 'tour-screen',
|
||||
active: 'active'
|
||||
}
|
||||
}).on('beforeSlide', function(e, previousIndex, newIndex) {
|
||||
if (newIndex == 1) {
|
||||
$("a.tour-prev").addClass('hidden');
|
||||
} else {
|
||||
$("a.tour-prev").removeClass('hidden');
|
||||
}
|
||||
if (newIndex == 3) {
|
||||
$("a.tour-next").addClass('hidden');
|
||||
} else {
|
||||
$("a.tour-next").removeClass('hidden');
|
||||
}
|
||||
});
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
</div>
|
||||
<div class="do-public">
|
||||
<div class="contents">
|
||||
<div class="login">
|
||||
<a class="nnid-login-btn" href="../users/auth/splatfestival/">
|
||||
<span class="nnid-login-bg">Log in</span>
|
||||
</a>
|
||||
<span class="nnid-description">To use SplatNet, you need to log in with your Splatfestival Network ID.</span>
|
||||
<span class="security-announcement">Note: We have confirmed the existence of smartphone apps that utilize information from this website, but none of them are affiliated with Nintendo in any way. Please be aware that Nintendo will not be held responsible for any problems or damages that may arise from the use of such apps.</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<footer class="enpera">
|
||||
<div class="site-policy">
|
||||
<a href="http://www.esrb.org/ratings/ratings_guide.jsp">
|
||||
<span class="esrb-bg"></span>
|
||||
</a>
|
||||
<a href="http://www.esrb.org/confirm/nintendo-confirmation.jsp">
|
||||
<span class="privacy-certified-bg"></span>
|
||||
</a>
|
||||
<a class="text-link site-policy-url" href="../site_policy">Site Policy</a>
|
||||
</div>
|
||||
<small>©Nintendo</small>
|
||||
</footer>
|
||||
</div>
|
||||
<script>
|
||||
$(function() {
|
||||
$('.tour').scooch({
|
||||
classPrefix: '',
|
||||
classNames: {
|
||||
inner: 'tour-screen',
|
||||
active: 'active'
|
||||
}
|
||||
}).on('beforeSlide', function(e, previousIndex, newIndex) {
|
||||
if (newIndex == 1) {
|
||||
$("a.tour-prev").addClass('hidden');
|
||||
} else {
|
||||
$("a.tour-prev").removeClass('hidden');
|
||||
}
|
||||
if (newIndex == 3) {
|
||||
$("a.tour-next").addClass('hidden');
|
||||
} else {
|
||||
$("a.tour-next").removeClass('hidden');
|
||||
}
|
||||
});
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -36,8 +36,9 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="stages-container" id="stages-container"></div>
|
||||
</div>
|
||||
<div class="stages-container" id="stages-container"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script src="/assets/general.js"></script>
|
||||
<script src="stages.js"></script>
|
||||
|
|
|
|||
|
|
@ -62,7 +62,8 @@
|
|||
<label for="remember_box">Remember Me</label>
|
||||
</div>
|
||||
<input class="hb-btn hb-is-decide" id="btn_text" type="submit" value="Sign In"/>
|
||||
<p><a class="hb-icon-external" href="https://discord.gg/grMSxZf" target="_blank">Forgot your password?</a><br/>
|
||||
<p><a class="hb-icon-external" href="https://discord.gg/grMSxZf" target="_blank">Forgot your password?</a></p><br/>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in a new issue