From e2b413bbc91cf917267438bb74b11049703f2f61 Mon Sep 17 00:00:00 2001 From: lutty Date: Thu, 21 Sep 2017 15:54:12 +0800 Subject: [PATCH] version 0.2.19 --- Makefile | 2 +- files/htdocs/css/style.css | 22 +++++++++---------- .../js/{zepto-luci.min.js => zepto.min.js} | 0 files/templates/header.htm | 2 +- 4 files changed, 12 insertions(+), 14 deletions(-) rename files/htdocs/js/{zepto-luci.min.js => zepto.min.js} (100%) diff --git a/Makefile b/Makefile index 7ee9d5e..3b16504 100644 --- 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 index f9dbf5e..7c62846 100755 --- 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 b/files/htdocs/js/zepto.min.js similarity index 100% rename from files/htdocs/js/zepto-luci.min.js rename to files/htdocs/js/zepto.min.js diff --git a/files/templates/header.htm b/files/templates/header.htm index 88cf06c..0606c9e 100644 --- a/files/templates/header.htm +++ b/files/templates/header.htm @@ -215,7 +215,6 @@
-
Loading...
<%=boardinfo.hostname or "?"%> @@ -229,6 +228,7 @@
+
Loading...
<% render_topmenu() %>