devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

fix(WIP): bootstrap4 잔여 코드 수정 중

Browse Source 
- 이상하게도 ingame에서 bootstrap이 충돌 중
This commit is contained in:
Hide_D
2021-12-11 04:45:39 +09:00
parent 2880a37595
commit ef6cb065d5
21 changed files with 306 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files
i_entrance/admin_userlist.php
+2 -2
View File
@@ -35,7 +35,7 @@ require(__DIR__ . '/../vendor/autoload.php');
</div>
<div class="card-body">
가입 허용&nbsp;
<div id="radios_allow_join" class="btn-group btn-group-toggle" data-toggle="buttons">
<div id="radios_allow_join" class="btn-group btn-group-toggle" data-bs-toggle="buttons">
<label class="btn btn-secondary">
<input type="radio" name="allow_join" value="1" id="allow_join_y" autocomplete="off">Y
</label>
@@ -45,7 +45,7 @@ require(__DIR__ . '/../vendor/autoload.php');
</div>
로그인 허용&nbsp;
<div id="radios_allow_login" class="btn-group btn-group-toggle" data-toggle="buttons">
<div id="radios_allow_login" class="btn-group btn-group-toggle" data-bs-toggle="buttons">
<label class="btn btn-secondary">
<input type="radio" name="allow_login" value="1" id="allow_login_y" autocomplete="off">Y
</label>
i_entrance/entrance.php
+2 -2
View File
@@ -38,7 +38,7 @@ $acl = $session->acl;
</script>
<?= WebUtil::printJS('../d_shared/common_path.js', true) ?>
<?= WebUtil::printJS('../dist_js/vendors.js', true) ?>
<?= WebUtil::printJS('../dist_js/common_ts.js') ?>
<?= WebUtil::printJS('../dist_js/common_ts.js', true) ?>
<?= WebUtil::printJS('../dist_js/entrance.js', true) ?>
</head>
@@ -47,7 +47,7 @@ $acl = $session->acl;
<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
<a class="navbar-brand" href="../">삼국지 모의전투 HiDCHe</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNav">
i_entrance/user_info.php
+3 -3
View File
@@ -30,7 +30,7 @@ require(__DIR__ . '/../vendor/autoload.php');
<body>
<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
<a class="navbar-brand" href="../">삼국지 모의전투 HiDCHe</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNav">
@@ -172,7 +172,7 @@ require(__DIR__ . '/../vendor/autoload.php');
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">완료되었습니다.<br>새 아이콘을 적용할 서버를 선택하세요.</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
@@ -183,7 +183,7 @@ require(__DIR__ . '/../vendor/autoload.php');
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">닫기</button>
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
<button type="button" class="btn btn-primary" id="modal-apply">서버 적용</button>
</div>
</div>