From f9121fd86c669828fd808e7ab87b2d642ea61075 Mon Sep 17 00:00:00 2001 From: Ansuel Smith Date: Tue, 7 Aug 2018 17:46:00 +0200 Subject: [PATCH] luci-theme-material: fix theme for applyreboot page changes This rename style.css to casade.css (like the other themes) and fix the css to display the header even in the applyreboot page Signed-off-by: Ansuel Smith (cherry picked from commit 35da63fa9a977ac579ee18ce2636d0db9d76353e) --- .../material/{css/style.css => cascade.css} | 14 ++++++------ .../luasrc/view/themes/material/header.htm | 22 ++++++++++--------- 2 files changed, 19 insertions(+), 17 deletions(-) rename themes/luci-theme-material/htdocs/luci-static/material/{css/style.css => cascade.css} (99%) mode change 100755 => 100644 diff --git a/themes/luci-theme-material/htdocs/luci-static/material/css/style.css b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css old mode 100755 new mode 100644 similarity index 99% rename from themes/luci-theme-material/htdocs/luci-static/material/css/style.css rename to themes/luci-theme-material/htdocs/luci-static/material/cascade.css index 01fef2110a..2d8bd10cc9 --- a/themes/luci-theme-material/htdocs/luci-static/material/css/style.css +++ b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css @@ -23,11 +23,11 @@ */ @font-face { font-family: 'icomoon'; - src: url('../fonts/font.eot'); - src: url('../fonts/font.eot') format('embedded-opentype'), - url('../fonts/font.ttf') format('truetype'), - url('../fonts/font.woff') format('woff'), - url('../fonts/font.svg') format('svg'); + src: url('fonts/font.eot'); + src: url('fonts/font.eot') format('embedded-opentype'), + url('fonts/font.ttf') format('truetype'), + url('fonts/font.woff') format('woff'), + url('fonts/font.svg') format('svg'); font-weight: normal; font-style: normal; } @@ -285,12 +285,12 @@ header { color: white; } -header > .container { +header > .fill > .container { margin-top: 0.5rem; padding: 0.5rem 1rem 0 1rem; } -header > .container > .brand { +header > .fill > .container > .brand { font-size: 1.4rem; color: white; text-decoration: 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 f97db25751..e6047614f6 100644 --- a/themes/luci-theme-material/luasrc/view/themes/material/header.htm +++ b/themes/luci-theme-material/luasrc/view/themes/material/header.htm @@ -203,7 +203,7 @@ - + <% if node and node.css then %> @@ -216,15 +216,17 @@
-
- - <%=boardinfo.hostname or "?"%> -
- <% render_changes() %> - +
+
+ + <%=boardinfo.hostname or "?"%> +
+ <% render_changes() %> + +
-- 2.30.2