diff --git a/public/css/common.css b/public/css/common.css index 77c2b86904..7a6b88281b 100644 --- a/public/css/common.css +++ b/public/css/common.css @@ -1213,50 +1213,20 @@ background-color: #adcae6 background-color: #e8e8e8; border-top: solid 1px #BBBBBB; margin-top:25px; - padding:15px 30px 23px; -} - -#footer a:hover{ - text-decoration: underline; -} - -#footer #kitwarelogo { - float: left; - height:26px; - margin-top:5px; -} - -#footer #kitwarelogo a { - text-decoration: none; -} - -#footer #kitwarelogo img { - height:100%; - width:auto; -} - -#footerlinks { - float: right; - height: 32px; + padding: 15px; + display: flex; + width: 100%; + justify-content: space-between; + align-items: center; } -#footerlinks a { +#footer .footer-link { text-decoration: none; + color: initial; } -#footerlinks .footerlogo { - margin-right:8px; -} - -#footerlinks .footerlogo img { - height:100%; - width:auto; -} - -#footerlinks #footertext, -#footerlinks #footertext a { - font-size: 12px; - color: #4A4A4A; +#footer .footer-link:hover { + text-decoration: underline; } /* flot legend display */ diff --git a/public/js/services/renderTimer.js b/public/js/services/renderTimer.js index 18e76bc10d..1198240a50 100644 --- a/public/js/services/renderTimer.js +++ b/public/js/services/renderTimer.js @@ -19,7 +19,7 @@ CDash.factory('renderTimer', ["$timeout", function ($timeout) { $timeout(function() { var renderTime = +((new Date() - start) / 1000); var generationTimeStr = (renderTime + cdash.generationtime).toFixed(2); - generationTimeStr += `s (${cdash.generationtime}s)`; + generationTimeStr += ` (${cdash.generationtime}s)`; controllerScope.cdash.generationtime = generationTimeStr; }, 0, true, controllerScope, cdash); }; diff --git a/resources/js/components/shared/ApiLoader.js b/resources/js/components/shared/ApiLoader.js index 0508ecaf27..844f3a0bed 100644 --- a/resources/js/components/shared/ApiLoader.js +++ b/resources/js/components/shared/ApiLoader.js @@ -39,11 +39,14 @@ export default { if (document.getElementById('api-endpoint')) { document.getElementById('api-endpoint')?.setAttribute('href', vm.cdash.endpoint); } + if (document.getElementById('api-endpoint-container')) { + document.getElementById('api-endpoint-container').style.display = 'inline'; + } if (document.getElementById('generation-time')) { document.getElementById('generation-time').textContent = vm.cdash.generationtime; } if (document.getElementById('testing-day') && vm.cdash.nightlytime !== undefined) { - document.getElementById('testing-day').textContent = `Current Testing Day ${vm.cdash.currentdate} | Started at ${vm.cdash.nightlytime}`; + document.getElementById('testing-day').textContent = `| Testing day ${vm.cdash.currentdate} started at ${vm.cdash.nightlytime}`; } // Let other components know that data has been loaded from the API. diff --git a/resources/views/components/footer.blade.php b/resources/views/components/footer.blade.php index 048cca3874..8d4d38af93 100755 --- a/resources/views/components/footer.blade.php +++ b/resources/views/components/footer.blade.php @@ -1,52 +1,45 @@ {{-- Fill the space between the content and the footer to push the footer to the bottom of the page --}}
-