Skip to content

Commit 78d5686

Browse files
bump CSS and JS library versions to 5.4.12; enhance dropdown accessibility in user menu
1 parent 52efa18 commit 78d5686

2 files changed

Lines changed: 11 additions & 9 deletions

File tree

sources/src/main/resources/web/templates/dynamical/views/index.zul

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
<?meta name="skin" content="${appTemplate.skin.id}"?>
3131
<?link rel="manifest" href="/manifest.json"?>
3232

33-
<?link href="${contextPath}/static/css/adminlte.min.css?v=5.4.1" rel="stylesheet" type="text/css"?>
34-
<?link href="${contextPath}/static/css/skins/dynamical-${appTemplate.skin.id}.css?v=5.4.1" rel="stylesheet" type="text/css"?>
35-
<?link href="${contextPath}/static/css/dynamical.css?v=5.4.1" rel="stylesheet" type="text/css"?>
36-
<?link href="${contextPath}/static/css/dynamical-mobile.css?v=5.4.1" rel="stylesheet" type="text/css"?>
33+
<?link href="${contextPath}/static/css/adminlte.min.css?v=5.4.12" rel="stylesheet" type="text/css"?>
34+
<?link href="${contextPath}/static/css/skins/dynamical-${appTemplate.skin.id}.css?v=5.4.12" rel="stylesheet" type="text/css"?>
35+
<?link href="${contextPath}/static/css/dynamical.css?v=5.4.12" rel="stylesheet" type="text/css"?>
36+
<?link href="${contextPath}/static/css/dynamical-mobile.css?v=5.4.12" rel="stylesheet" type="text/css"?>
3737
<?link href="${contextPath}/static/fonts/fontawesome-free/css/all.min.css" rel="stylesheet" type="text/css"?>
3838

3939
<?link rel="shortcut icon" href="${contextPath}/static/favicon.ico"?>
@@ -42,11 +42,12 @@
4242
<?link rel="icon" type="image/png" sizes="16x16" href="${contextPath}/static/favicon-16x16.png"?>
4343

4444

45-
<?script src="${contextPath}/static/js/adminlte.min.js?v=5.4.1"?>
46-
<?script src="${contextPath}/static/js/dynamical.js?v=5.4.1"?>
45+
<?script src="${contextPath}/static/js/popper.min.js?v=5.4.12"?>
46+
<?script src="${contextPath}/static/js/bootstrap.min.js?v=5.4.12"?>
47+
<?script src="${contextPath}/static/js/adminlte.min.js?v=5.4.12"?>
48+
<?script src="${contextPath}/static/js/dynamical.js?v=5.4.12"?>
4749

48-
49-
<zk>
50+
<zk >
5051
<import src="classpath:/zk/dynamical/index-main.zul"/>
5152

5253

sources/src/main/resources/zk/dynamical/index-main.zul

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,10 @@
4343
</a>
4444
</li>
4545

46+
<!-- User Account: style can be found in dropdown.less -->
4647
<z:zk if="${userInfo.enabled}">
4748
<li class="nav-item dropdown user-menu">
48-
<a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown">
49+
<a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
4950
<img src="${userInfo.image}" class="user-image shadow"/>
5051
<span class="d-none d-md-inline">${userInfo.fullName}</span>
5152
</a>

0 commit comments

Comments
 (0)