projects / oweals / luci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a5e1e86)
luci-theme-rosy: (html)Change the scroll bar style, compatible with each bower
authorYanlan Shen <yanlan.shen.@rosinson.com>
Thu, 10 Jan 2019 03:45:16 +0000 (11:45 +0800)
committerYanlan Shen <yanlan.shen.@rosinson.com>
Thu, 10 Jan 2019 03:59:37 +0000 (11:59 +0800)
Signed-off-by: Yanlan Shen <yanlan.shen.@rosinson.com>
themes/luci-theme-rosy/luasrc/view/themes/rosy/footer.htm patch | blob | history
themes/luci-theme-rosy/luasrc/view/themes/rosy/header.htm patch | blob | history

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 f0cbe4e9689c3d5f089e12752f14b414160cd34c..4377e1ca98002eaa2628b519564ab740ae4597e0 100755 (executable)
--- 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 21fa78e3c6b205447a0d5b8d2291bdae5e6bd889..a6aafbed61bece10da542c1ce1e2c89f78e65387 100644 (file)
--- 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>
Unnamed repository; edit this file 'description' to name the repository.