Skip to content

Commit 23fa659

Browse files
committed
[Server] Some improvements to navbar on mobile
1 parent 511568c commit 23fa659

File tree

11 files changed

+35
-16
lines changed

11 files changed

+35
-16
lines changed

server/proxy/less/styles.less

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,21 @@ a {
360360
.dropdown-menu>li>a:focus, .dropdown-menu>li>a:hover {
361361
background: #080808;
362362
}
363+
@media (max-width: 991.98px) {
364+
.navbar-user .dropdown-menu[data-bs-popper] {
365+
margin-top: 0;
366+
}
367+
.navbar-user .dropdown-menu {
368+
display: block;
369+
position: static;
370+
background-color: transparent;
371+
border: none;
372+
box-shadow: none;
373+
}
374+
.navbar-user .dropdown-toggle::after {
375+
display: none;
376+
}
377+
}
363378
.btn,
364379
a.btn {
365380
-webkit-transition: all 0.4s ease-in-out;

server/proxy/templates/2col/assets/css/styles.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/proxy/templates/2col/assets/css/styles.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/proxy/templates/2col/assets/js/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
$(function () {
2-
$('#navHome').removeClass('active');
2+
$('.nav-home').removeClass('active');
33
const currLocation = window.location.pathname;
44
if (
55
!(

server/proxy/templates/2col/fragments/navbar.html

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
>
3838
<nav class="navbar navbar-expand-lg navbar-dark fixed-top">
3939
<!-- Brand -->
40-
<a id="navHome" class="navbar-brand navbar-nav active" th:href="@{/}">
40+
<a class="navbar-brand navbar-nav navbar-home active" th:href="@{/}">
4141
My Apps
4242
</a>
4343

@@ -60,7 +60,6 @@
6060
aria-labelledby="mainOffcanvasLabel"
6161
>
6262
<div class="offcanvas-header d-lg-none">
63-
<h5 class="offcanvas-title" id="mainOffcanvasLabel">My Apps</h5>
6463
<button
6564
type="button"
6665
class="btn-close btn-close-white"
@@ -71,6 +70,11 @@ <h5 class="offcanvas-title" id="mainOffcanvasLabel">My Apps</h5>
7170

7271
<div class="offcanvas-body">
7372
<!-- Left side -->
73+
<ul class="navbar-nav me-auto d-lg-none">
74+
<li class="nav-item">
75+
<a class="nav-link nav-home active" th:href="@{/}">My Apps</a>
76+
</li>
77+
</ul>
7478
<ul class="navbar-nav me-auto" th:if="${isAdmin}">
7579
<li class="nav-item">
7680
<a

src/srcjs/baseline_compare_error_manager.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ export default class BaselineCompareErrorManager {
66
evaluateData(refData, data, tableId, sessionId) {
77
if (Math.abs(refData - data) > 1e-4) {
88
if (
9-
!Object.hasOwn(this.errors, tableId) ||
10-
this.errors[tableId] !== sessionId
9+
!Object.hasOwn(this.errors, tableId)
10+
|| this.errors[tableId] !== sessionId
1111
) {
1212
this.errors[tableId] = sessionId;
1313
setTimeout(() => {
1414
if (
15-
Object.hasOwn(this.errors, tableId) &&
16-
this.errors[tableId] === sessionId
15+
Object.hasOwn(this.errors, tableId)
16+
&& this.errors[tableId] === sessionId
1717
) {
1818
modal(
1919
"Something went wrong. Please don't trust the data! Also, please contact GAMS about this issue (id: 981273) via [email protected]",
@@ -23,8 +23,8 @@ export default class BaselineCompareErrorManager {
2323
}, 2000);
2424
}
2525
} else if (
26-
Object.hasOwn(this.errors, tableId) &&
27-
this.errors[tableId] !== sessionId
26+
Object.hasOwn(this.errors, tableId)
27+
&& this.errors[tableId] !== sessionId
2828
) {
2929
// old error -> clear as we render a new table
3030
delete this.errors[tableId];

src/www/default_browser.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/www/miro.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/www/miro.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/www/miro_admin.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)