diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2018-08-07 17:50:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-07 17:50:34 +0200 |
| commit | 849a5bb54e0b53af46daf109157724c3c2540c2f (patch) | |
| tree | e1c55f14f62699a535af40d87baf895e481936e8 | |
| parent | 3531350ae3cfc3d13256a17754955ced36eafd1e (diff) | |
| parent | 35da63fa9a977ac579ee18ce2636d0db9d76353e (diff) | |
Merge pull request #2043 from Ansuel/materialfix
luci-theme-material: fix theme for applyreboot page changes
| -rw-r--r--[-rwxr-xr-x] | themes/luci-theme-material/htdocs/luci-static/material/cascade.css (renamed from themes/luci-theme-material/htdocs/luci-static/material/css/style.css) | 14 | ||||
| -rw-r--r-- | themes/luci-theme-material/luasrc/view/themes/material/header.htm | 22 |
2 files changed, 19 insertions, 17 deletions
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 index 01fef2110..2d8bd10cc 100755..100644 --- 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 f97db2575..e6047614f 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 @@ <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> |