summaryrefslogtreecommitdiffhomepage
path: root/themes/luci-theme-material
diff options
context:
space:
mode:
Diffstat (limited to 'themes/luci-theme-material')
-rw-r--r--themes/luci-theme-material/htdocs/luci-static/material/cascade.css4
-rw-r--r--themes/luci-theme-material/luasrc/view/themes/material/header.htm2
-rwxr-xr-xthemes/luci-theme-material/root/etc/uci-defaults/30_luci-theme-material14
3 files changed, 14 insertions, 6 deletions
diff --git a/themes/luci-theme-material/htdocs/luci-static/material/cascade.css b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css
index 2a88ef3750..8a41e8c0cf 100644
--- a/themes/luci-theme-material/htdocs/luci-static/material/cascade.css
+++ b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css
@@ -2089,6 +2089,10 @@ label > input[type="radio"] {
vertical-align: bottom;
}
+label[data-index][data-depends] {
+ padding-right: 2em;
+}
+
.showSide {
display: none;
}
diff --git a/themes/luci-theme-material/luasrc/view/themes/material/header.htm b/themes/luci-theme-material/luasrc/view/themes/material/header.htm
index f463ef5cb2..9521314e1f 100644
--- a/themes/luci-theme-material/luasrc/view/themes/material/header.htm
+++ b/themes/luci-theme-material/luasrc/view/themes/material/header.htm
@@ -219,7 +219,7 @@
</div>
</header>
<div class="main">
- <div style="" class="loading"><span><div class="loading-img"></div>Loading...</span></div>
+ <div style="" class="loading"><span><div class="loading-img"></div><%:Collecting data...%></span></div>
<div class="main-left">
<% render_topmenu() %>
</div>
diff --git a/themes/luci-theme-material/root/etc/uci-defaults/30_luci-theme-material b/themes/luci-theme-material/root/etc/uci-defaults/30_luci-theme-material
index b01337821c..96ab461859 100755
--- a/themes/luci-theme-material/root/etc/uci-defaults/30_luci-theme-material
+++ b/themes/luci-theme-material/root/etc/uci-defaults/30_luci-theme-material
@@ -1,7 +1,11 @@
#!/bin/sh
-uci batch <<-EOF
- set luci.themes.Material=/luci-static/material
- set luci.main.mediaurlbase=/luci-static/material
- commit luci
-EOF
+
+if [ "$PKG_UPGRADE" != 1 ]; then
+ uci batch <<-EOF
+ set luci.themes.Material=/luci-static/material
+ set luci.main.mediaurlbase=/luci-static/material
+ commit luci
+ EOF
+fi
+
exit 0