git.99rst.org / openwrt-luci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side (parent: c27a777)
luci-theme-material: fix theme for applyreboot page changes
authorAnsuel Smith <redacted>
Tue, 7 Aug 2018 15:46:00 +0000 (17:46 +0200)
committerAnsuel Smith <redacted>
Tue, 7 Aug 2018 15:46:00 +0000 (17:46 +0200)
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 <redacted>
themes/luci-theme-material/htdocs/luci-static/material/cascade.css [moved from themes/luci-theme-material/htdocs/luci-static/material/css/style.css with 99% similarity, mode: 0644] patch | blob | history
themes/luci-theme-material/luasrc/view/themes/material/header.htm patch | blob | history

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 (executable)
new mode 100644 (file)
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 01fef21..2d8bd10
--- 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 f97db257510214e3058219c0d30170ca72058d36..e6047614f6a30ac5eea1a76cb60522cf65b8a0aa 100644 (file)
--- 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 @@
        <link rel="icon" href="<%=media%>/logo.png" sizes="144x144">
        <link rel="apple-touch-icon-precomposed" href="<%=media%>/logo.png" sizes="144x144">
 
-       <link rel="stylesheet" href="<%=media%>/css/style.css">
+       <link rel="stylesheet" href="<%=media%>/cascade.css">
        <link rel="shortcut icon" href="<%=media%>/favicon.ico">
        <% if node and node.css then %>
                <link rel="stylesheet" href="<%=resource%>/<%=node.css%>">
@@ -216,15 +216,17 @@
 </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="container">
-               <span class="showSide"></span>
-               <a class="brand" href="#"><%=boardinfo.hostname or "?"%></a>
-               <div class="pull-right">
-                       <% render_changes() %>
-                       <span id="xhr_poll_status" style="display:none" onclick="XHR.running() ? XHR.halt() : XHR.run()">
-                               <span class="label success" id="xhr_poll_status_on"><span class="mobile-hide"><%:Auto Refresh%></span> <%:on%></span>
-                               <span class="label" id="xhr_poll_status_off" style="display:none"><span class="mobile-hide"><%:Auto Refresh%></span> <%:off%></span>
-                       </span>
+       <div class="fill">
+               <div class="container">
+                       <span class="showSide"></span>
+                       <a class="brand" href="#"><%=boardinfo.hostname or "?"%></a>
+                       <div class="pull-right">
+                               <% render_changes() %>
+                               <span id="xhr_poll_status" style="display:none" onclick="XHR.running() ? XHR.halt() : XHR.run()">
+                                       <span class="label success" id="xhr_poll_status_on"><span class="mobile-hide"><%:Auto Refresh%></span> <%:on%></span>
+                                       <span class="label" id="xhr_poll_status_off" style="display:none"><span class="mobile-hide"><%:Auto Refresh%></span> <%:off%></span>
+                               </span>
+                       </div>
                </div>
        </div>
 </header>
git clone https://git.99rst.org/PROJECT