Skip to content

C
check
Commit bd0b751c by Kang Donghun
Options

Merge branch 'feature/1.0_check_web_dev_imai' into 'feature/1.0_check_web_dev' 

課題113　ヘッダーの位置がずれる問題

See merge request !87
parents 2ce157d0 4cfe17c1
Showing with 21 additions and 21 deletions
abweb/common/js/common.js
...@@ -66,7 +66,7 @@ COMMON.showLoading = function () { ...@@ -66,7 +66,7 @@ COMMON.showLoading = function () {
COMMON.closeLoading = function () { COMMON.closeLoading = function () {
setTimeout(function () { setTimeout(function () {
document.getElementById('loader').style.display = 'none'; document.getElementById('loader').style.display = 'none';
$('#loadingNone').show(); $('#loadingNone').css('visibility', 'visible');
}, 1000); }, 1000);
}; };
......
abweb/html/accountSetting.html
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<div id="includedHeader"></div> <div id="includedHeader"></div>
<!-- account setting --> <!-- account setting -->
<div id="includedMainTitle"></div> <div id="includedMainTitle"></div>
<div id="loadingNone" style="display:none;"> <span id="loadingNone" style="visibility: hidden;">
<main id="main"> <main id="main">
<div class="container-wrap"> <div class="container-wrap">
<!-- content --> <!-- content -->
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
<input type="hidden" id="getToken"> <input type="hidden" id="getToken">
<!-- confirm --> <!-- confirm -->
<div id="includedConfirmModal"></div> <div id="includedConfirmModal"></div>
</div> </span>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script src="../common/js/event.js?__UPDATEID__"></script> <script src="../common/js/event.js?__UPDATEID__"></script>
</body> </body>
......
abweb/html/dashboard.html
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<div id="loader"></div> <div id="loader"></div>
<!-- header --> <!-- header -->
<div id="includedHeader"></div> <div id="includedHeader"></div>
<div id="loadingNone" style="display:none;"> <span id="loadingNone" style="visibility: hidden;">
<!-- dashboard --> <!-- dashboard -->
<main> <main>
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<!-- confirm --> <!-- confirm -->
<div id="includedConfirmModal"></div> <div id="includedConfirmModal"></div>
</div> </span>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script src="../common/js/event.js?__UPDATEID__"></script> <script src="../common/js/event.js?__UPDATEID__"></script>
</body> </body>
......
abweb/html/index.html
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<div id="loader"></div> <div id="loader"></div>
<!-- header --> <!-- header -->
<div id="includedHeader"></div> <div id="includedHeader"></div>
<div id="loadingNone" style="display:none;"> <span id="loadingNone" style="visibility: hidden;">
<!-- task list --> <!-- task list -->
<main> <main>
<div class="container-wrap"> <div class="container-wrap">
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
<!-- confirm --> <!-- confirm -->
<div id="includedConfirmModal"></div> <div id="includedConfirmModal"></div>
</div> </span>
<script src="../common/js/app.js?__UPDATEID__" defer></script> <script src="../common/js/app.js?__UPDATEID__" defer></script>
<script src="../common/js/event.js?__UPDATEID__"></script> <script src="../common/js/event.js?__UPDATEID__"></script>
</body> </body>
......
abweb/html/pdfPrint.html
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<div id="loader"></div> <div id="loader"></div>
<!-- header --> <!-- header -->
<div id="includedHeader"></div> <div id="includedHeader"></div>
<div id="loadingNone" style="display:none;"> <span id="loadingNone" style="visibility: hidden;">
<!-- title --> <!-- title -->
<div id="includedMainTitle"></div> <div id="includedMainTitle"></div>
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<!-- confirm --> <!-- confirm -->
<div id="includedConfirmModal"></div> <div id="includedConfirmModal"></div>
</div> </span>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script src="../common/js/event.js?__UPDATEID__"></script> <script src="../common/js/event.js?__UPDATEID__"></script>
</body> </body>
......
abweb/html/pickup.html
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<body> <body>
<div id="loader"></div> <div id="loader"></div>
<div id="includedHeader"></div> <div id="includedHeader"></div>
<div id="loadingNone" style="display:none;"> <span id="loadingNone" style="visibility: hidden;">
<!-- pickup --> <!-- pickup -->
<main> <main>
<div class="container-wrap"> <div class="container-wrap">
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
<!-- confirm --> <!-- confirm -->
<div id="includedConfirmModal"></div> <div id="includedConfirmModal"></div>
</div> </span>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script src="../common/js/event.js?__UPDATEID__"></script> <script src="../common/js/event.js?__UPDATEID__"></script>
</body> </body>
......
abweb/html/pushMessageDetail.html
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<div id="loader"></div> <div id="loader"></div>
<!-- header --> <!-- header -->
<div id="includedHeader"></div> <div id="includedHeader"></div>
<div id="loadingNone" style="display:none;"> <span id="loadingNone" style="visibility: hidden;">
<!-- message detail --> <!-- message detail -->
<main> <main>
<div class="container-wrap"> <div class="container-wrap">
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
</div> </div>
</div> </div>
</main> </main>
</div> </span>
<script type="text/javascript" src="../common/js/app.js"></script> <script type="text/javascript" src="../common/js/app.js"></script>
<script src="../common/js/event.js?__UPDATEID__"></script> <script src="../common/js/event.js?__UPDATEID__"></script>
</body> </body>
......
abweb/html/pushMessageList.html
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<body> <body>
<div id="loader"></div> <div id="loader"></div>
<div id="includedHeader"></div> <div id="includedHeader"></div>
<div id="loadingNone" style="display:none;"> <span id="loadingNone" style="visibility: hidden;">
<!-- message list --> <!-- message list -->
<main> <main>
<div class="container-wrap"> <div class="container-wrap">
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
</ul> </ul>
</div> </div>
</main> </main>
</div> </span>
<script type="text/javascript" src="../common/js/app.js"></script> <script type="text/javascript" src="../common/js/app.js"></script>
<script src="../common/js/event.js?__UPDATEID__"></script> <script src="../common/js/event.js?__UPDATEID__"></script>
</body> </body>
......
abweb/html/reportForm.html
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<div id="loader"></div> <div id="loader"></div>
<!-- header --> <!-- header -->
<div id="includedHeader"></div> <div id="includedHeader"></div>
<div id="loadingNone" style="display:none;"> <span id="loadingNone" style="visibility: hidden;">
<div id="includedMainTitle"></div> <div id="includedMainTitle"></div>
<!-- report list --> <!-- report list -->
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<!-- confirm --> <!-- confirm -->
<div id="includedConfirmModal"></div> <div id="includedConfirmModal"></div>
</div> </span>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script src="../common/js/event.js?__UPDATEID__"></script> <script src="../common/js/event.js?__UPDATEID__"></script>
</body> </body>
......
abweb/html/reportList.html
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<div id="loader" style="display: none;"></div> <div id="loader" style="display: none;"></div>
<!-- header --> <!-- header -->
<div id="includedHeader"></div> <div id="includedHeader"></div>
<div id="loadingNone" style="display:none;"> <span id="loadingNone" style="visibility: hidden;">
<div id="includedMainTitle"></div> <div id="includedMainTitle"></div>
<!-- report list --> <!-- report list -->
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<!-- confirm --> <!-- confirm -->
<div id="includedConfirmModal"></div> <div id="includedConfirmModal"></div>
</div> </span>
<script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script> <script type="text/javascript" src="../common/js/app.js?__UPDATEID__"></script>
<script src="../common/js/event.js?__UPDATEID__"></script> <script src="../common/js/event.js?__UPDATEID__"></script>
</body> </body>
......
abweb/html/sendMessage.html
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<body> <body>
<div id="loader"></div> <div id="loader"></div>
<div id="includedHeader"></div> <div id="includedHeader"></div>
<div id="loadingNone" style="display:none;"> <span id="loadingNone" style="visibility: hidden;">
<!-- send message --> <!-- send message -->
<main> <main>
<div class="container-wrap"> <div class="container-wrap">
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
<!-- select template modal --> <!-- select template modal -->
<div id="includeTemplateModal"></div> <div id="includeTemplateModal"></div>
</div> </span>
<script type="text/javascript" src="../common/js/app.js"></script> <script type="text/javascript" src="../common/js/app.js"></script>
<script src="../common/js/event.js?__UPDATEID__"></script> <script src="../common/js/event.js?__UPDATEID__"></script>
</body> </body>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment