Fix conflict
This commit is contained in:
Araya's Project
2026-06-05 10:02:02 +07:00
9 changed files with 384 additions and 336 deletions
+11 -18
View File
@@ -1247,7 +1247,6 @@
<div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
<div class="grid grid-cols-3 divide-x divide-white/20">
<!-- Total Penerima -->
<div class="stat-item" data-aos="fade-up" data-aos-delay="0">
<div class="stat-number" data-counter="20" id="ctr-total">0</div>
<div class="stat-label" data-i18n-html="ape_stats_total">
@@ -1255,19 +1254,17 @@
</div>
</div>
<!-- Pemerintah -->
<div class="stat-item" data-aos="fade-up" data-aos-delay="100">
<div class="stat-number" data-counter="12" id="ctr-gov">0</div>
<div class="stat-label" data-i18n-html="ape_stats_gov">
Total Penerima Beasiswa<br>Pembiayaan Pemerintah
<div class="stat-number" data-counter="12" id="ctr-s1">0</div>
<div class="stat-label" data-i18n-html="ape_stats_s1">
Total Penerima Beasiswa<br>Khusus S1
</div>
</div>
<!-- Swasta -->
<div class="stat-item" data-aos="fade-up" data-aos-delay="200">
<div class="stat-number" data-counter="8" id="ctr-pvt">0</div>
<div class="stat-label" data-i18n-html="ape_stats_private">
Total Penerima Beasiswa<br>Pembiayaan Swasta
<div class="stat-number" data-counter="8" id="ctr-studi">0</div>
<div class="stat-label" data-i18n-html="ape_stats_studi">
Total Penerima Beasiswa<br>Studi Lanjut
</div>
</div>
@@ -1302,14 +1299,10 @@
aria-label="Filter beasiswa">
<button class="filter-tab active" data-filter="semua" role="tab" aria-selected="true"
data-i18n="filter_all">Semua</button>
<button class="filter-tab" data-filter="Buka" role="tab" aria-selected="false"
data-i18n="ape_filter_open">Sedang Buka</button>
<button class="filter-tab" data-filter="Ditutup" role="tab" aria-selected="false"
data-i18n="ape_filter_closed">Ditutup</button>
<button class="filter-tab" data-filter="Pemerintah" role="tab" aria-selected="false"
data-i18n="ape_filter_gov">Pemerintah</button>
<button class="filter-tab" data-filter="Swasta" role="tab" aria-selected="false"
data-i18n="ape_filter_private">Swasta</button>
<button class="filter-tab" data-filter="s1" role="tab" aria-selected="false"
data-i18n="ape_filter_s1">S1</button>
<button class="filter-tab" data-filter="studi_lanjut" role="tab" aria-selected="false"
data-i18n="ape_filter_studi">Studi Lanjut</button>
</div>
<!-- Real-Time Search -->
@@ -1487,6 +1480,7 @@
<script src="https://unpkg.com/aos@2.3.4/dist/aos.js"></script>
<script src="https://cdn.jsdelivr.net/npm/swiper@11/swiper-bundle.min.js"></script>
<script src="../../assets/global/localization.js"></script>
<script src="assets/js/counter.js"></script>
<script type="module" src="assets/js/API.js"></script>
@@ -1608,7 +1602,6 @@
})();
</script>
<script src="../../assets/global/localization.js"></script>
</body>
</html>