version 0.2.19

LuttyYang · Sep 21, 2017 · e2b413b · e2b413b
1 parent 821ee1e
commit e2b413b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/Makefile b/Makefile
@@ -10,7 +10,7 @@ THEME_NAME:=material
 THEME_TITLE:=Material
 
 PKG_NAME:=luci-theme-$(THEME_NAME)
-PKG_VERSION:=0.2.18
+PKG_VERSION:=0.2.19
 PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk

diff --git a/files/htdocs/css/style.css b/files/htdocs/css/style.css
@@ -159,31 +159,29 @@ footer > a {
     height: calc(100% - 4rem);
 }
 
-.page_loading {
-    position: absolute;
-    top: 0rem;
+.main > .loading {
+    position: fixed;
     width: 100%;
-    height: 4rem;
-    line-height: 4rem;
+    height: 100%;
     z-index: 1000;
     display: block;
     background-color: rgb(240, 240, 240);
+    top: 0;
+}
+
+.main > .loading > span {
     display: block;
     text-align: center;
+    margin-top: 2rem;
     color: #888;
     font-size: 1.2rem;
 }
 
-.page_loading div {
-    display: inline;
-    vertical-align: middle;
-}
-
-.page_loading .loading-img:before {
+.main > .loading > span > .loading-img:before {
     content: "\e603";
 }
 
-.page_loading .loading-img {
+.main > .loading > span > .loading-img {
     animation: anim-rotate 2s infinite linear;
     margin-right: 0.2rem;
     display: inline-block;

diff --git a/files/htdocs/js/zepto-luci.min.js → files/htdocs/js/zepto.min.js b/files/htdocs/js/zepto-luci.min.js → files/htdocs/js/zepto.min.js
diff --git a/files/templates/header.htm b/files/templates/header.htm
@@ -215,7 +215,6 @@
 </head>
 <body class="lang_<%=luci.i18n.context.lang%> <%- if node then %><%= striptags( node.title ) %><%- end %> <% if luci.dispatcher.context.authsession then %>logged-in<% end %>">
 <header>
-	<div class="page_loading"><span><div class="loading-img"></div>Loading...</span></div>
 	<div class="container">
 		<span class="showSide"></span>
 		<a class="brand" href="#"><%=boardinfo.hostname or "?"%></a>
@@ -229,6 +228,7 @@
 	</div>
 </header>
 <div class="main">
+	 <div class="page_loading loading"><span><div class="loading-img"></div>Loading...</span></div>
 	 <div class="main-left">
 		<% render_topmenu() %>
 	 </div>