diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2019-01-10 10:42:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-10 10:42:51 +0100 |
| commit | c1fdd8ae032c262d29330872fc05f81160bbd517 (patch) | |
| tree | 7ca3f82acc0b67f9447450fbe1ee2850a893602a /themes/luci-theme-rosy/luasrc | |
| parent | e6604d7d84237ea2d30feb10dab757a4fbfa54c5 (diff) | |
| parent | 714a48e6caffddf43db4c9b6911cac3bcf622ac6 (diff) | |
Merge pull request #2445 from yglb/rosy-bugsfix
luci-theme-rosy: Some bug fixes about rosy's scrollbars, table color matching, fillet and modal boxes
Diffstat (limited to 'themes/luci-theme-rosy/luasrc')
| -rwxr-xr-x | themes/luci-theme-rosy/luasrc/view/themes/rosy/footer.htm | 4 | ||||
| -rw-r--r-- | themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/themes/luci-theme-rosy/luasrc/view/themes/rosy/footer.htm b/themes/luci-theme-rosy/luasrc/view/themes/rosy/footer.htm index f0cbe4e968..4377e1ca98 100755 --- a/themes/luci-theme-rosy/luasrc/view/themes/rosy/footer.htm +++ b/themes/luci-theme-rosy/luasrc/view/themes/rosy/footer.htm @@ -43,8 +43,8 @@ <script> var luciLocation = <%= luci.http.write_json(luci.dispatcher.context.path) %>; </script> -<script src="<%=media%>/js/jquery.min.js?v=git-18.247.71242-9541751"></script> -<script src="<%=media%>/js/script.js?v=git-18.247.71242-9541751"></script> +<script src="<%=media%>/js/jquery.min.js"></script> +<script src="<%=media%>/js/script.js"></script> </body> </html> diff --git a/themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm b/themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm index 21fa78e3c6..a6aafbed61 100644 --- a/themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm +++ b/themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm @@ -123,7 +123,7 @@ local function render_topmenu() local childs = disp.node_childs(cattree) if #childs > 0 then - write('<ul class="nav">') + write('<ul class="nav scroll">') for i, r in ipairs(childs) do local nnode = cattree.nodes[r] @@ -231,6 +231,7 @@ <% end -%> <script src="<%=resource%>/cbi.js"></script> <script src="<%=resource%>/xhr.js"></script> + <script src="<%=media%>/js/ScrollY.js"></script> </head> <body class="lang_<%=luci.i18n.context.lang%> <%- if node then %><%= striptags( node.title ) %><%- end %> <% if luci.dispatcher.context.authsession then %>logged-in<% end %>"> @@ -264,7 +265,7 @@ <div class="nav-container"> <a class="brand" href="#"> <%=boardinfo.hostname or "?"%></a> - <div class="navbar-container"> + <div class="navbar-container" id="navBox"> <% render_topmenu() %> </div> </div> |