kitten/SplatNet
Watch
0
0
Fork
You've already forked SplatNet
 0
forked from spacebar/SplatNet
Code Pull requests Activity

fix merge conflicts in equipment

Browse source
This commit is contained in:
kittentm 2026-03-14 00:11:58 +01:00
commit 8e5a45dba7
No known key found for this signature in database
GPG key ID: 520EDAA0C8CDE295
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
equipment/index.html
View file

@ -5,7 +5,8 @@
<title>SplatNet - Splatoon's multiplayer service hub</title> <title>SplatNet - Splatoon's multiplayer service hub</title>
<link rel="icon" href="../favicon.ico" type="image/x-icon" /> <link rel="icon" href="../favicon.ico" type="image/x-icon" />
<link rel="stylesheet" href="styles.css" /> <link rel="stylesheet" href="styles.css" />
<script src="/../assets/jquery-1.9.1.js"></script> <script src="/assets/jquery-1.9.1.js"></script>
<script src="/assets/general.js"></script>
<script src="/config.js"></script> <script src="/config.js"></script>
</head> </head>
<body> <body>
@ -18,7 +19,7 @@
<div id="loading-overlay" class="loading-overlay"> <div id="loading-overlay" class="loading-overlay">
<canvas id="loading-canvas" width="100" height="100"></canvas> <canvas id="loading-canvas" width="100" height="100"></canvas>
<div id="loading-text"> <div id="loading-text">
<img src="/../assets/en/svg/text/wait/tx_loading-dccf3fb801ca859f2d17992f5cd7da62995c1fe81a306dd103398ef7c0e25b70.svg" alt="Loading"> <img src="/assets/en/svg/text/wait/tx_loading-dccf3fb801ca859f2d17992f5cd7da62995c1fe81a306dd103398ef7c0e25b70.svg" alt="Loading">
</div> </div>
</div> </div>
@ -27,9 +28,9 @@
<div class="header-flex-row"> <div class="header-flex-row">
<div class="logo-left-align"> <div class="logo-left-align">
<div id="stage-header-logo"> <div id="stage-header-logo">
<img class="bg-layer" src="../../assets/en/svg/ui/bg_h1-62e768f2a1ca52f993b5953c78d46bc53b35b70df7f8e13619a982f8f10ab750.svg"> <img class="bg-layer" src="../assets/en/svg/ui/bg_h1-62e768f2a1ca52f993b5953c78d46bc53b35b70df7f8e13619a982f8f10ab750.svg">
<img class="icon-layer" src="../../assets/en/svg/ui/ico_equipment-40943361040a3d62c745a21d1a1fa95794c851f378e11334f2dc6c1cc81b4984.svg"> <img class="icon-layer" src="../assets/en/svg/ui/ico_equipment-40943361040a3d62c745a21d1a1fa95794c851f378e11334f2dc6c1cc81b4984.svg">
<img class="label-layer" src="../../assets/en/svg/text/scene/equipment/tx_equipment-ea02b805bb9aec4677fb4a4629f515d402822e8eed1f3fcc524336fe3c813fee.svg"> <img class="label-layer" src="../assets/en/svg/text/scene/equipment/tx_equipment-ea02b805bb9aec4677fb4a4629f515d402822e8eed1f3fcc524336fe3c813fee.svg">
</div> </div>
<div class="equipmentsubtitle-text"> <div class="equipmentsubtitle-text">
Check out the gear and weapons you had equipped while playing online! Check out the gear and weapons you had equipped while playing online!
@ -45,12 +46,12 @@
<div class="rank-box rank-level"> <div class="rank-box rank-level">
<span class="rank-text">50</span> <span class="rank-text">50</span>
<img src="/../assets/en/svg/text/scene/equipment/tx_rank-2bcc8d331694f06c2af30e720acafda60760c71f086906489afb73190a6913ce.svg" class="rank-label" /> <img src="../assets/en/svg/text/scene/equipment/tx_rank-2bcc8d331694f06c2af30e720acafda60760c71f086906489afb73190a6913ce.svg" class="rank-label" />
</div> </div>
<div class="rank-box rank-grade"> <div class="rank-box rank-grade">
<span class="rank-text">S+</span> <span class="rank-text">S+</span>
<img src="/../assets/en/svg/text/scene/equipment/tx_udemae-3f0e377d89a469c62069c2304dae87dfdf2b98076a0a4662b9190800c2d9da91.svg" class="rank-label" /> <img src="../assets/en/svg/text/scene/equipment/tx_udemae-3f0e377d89a469c62069c2304dae87dfdf2b98076a0a4662b9190800c2d9da91.svg" class="rank-label" />
</div> </div>
<div class="weapon-slot"> <div class="weapon-slot">
@ -97,7 +98,6 @@
</div> </div>
</div> </div>
<script src="/../assets/general.js"></script>
<script src="equipment.js"></script> <script src="equipment.js"></script>
</body> </body>
</html> </html>