summaryrefslogtreecommitdiffhomepage
path: root/themes
diff options
context:
space:
mode:
Diffstat (limited to 'themes')
-rw-r--r--themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css71
-rw-r--r--themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm7
-rw-r--r--themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css4
-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)48
-rw-r--r--themes/luci-theme-material/htdocs/luci-static/material/custom.css9
-rw-r--r--themes/luci-theme-material/luasrc/view/themes/material/header.htm30
-rw-r--r--themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css61
-rw-r--r--themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm7
8 files changed, 146 insertions, 91 deletions
diff --git a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css
index 0c158961d2..260f5e31cc 100644
--- a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css
+++ b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css
@@ -23,7 +23,7 @@ body {
padding: 5px;
}
-h1, h2, h3, h4, h5, h6, p, pre, a, abbr, acronym, code, del, em, img, q, s,
+h1, h2, h3, h4, h5, h6, p, pre, a, abbr, acronym, code, del, em, img, ins, q, s,
small, strike, strong, sub, sup, tt, var, dd, dl, dt, li, ol, ul, fieldset,
form, label, legend, button, table, caption, tbody, tfoot, thead, tr, th, td,
.table, .tbody, .tfoot, .thead, .tr, .th, .td {
@@ -598,6 +598,12 @@ textarea[readonly] {
cursor: default;
}
+select[readonly],
+textarea[readonly] {
+ pointer-events: auto;
+ cursor: auto;
+}
+
.cbi-optionals,
.cbi-section-create {
padding: 0 0 10px 10px;
@@ -1950,47 +1956,51 @@ div.cbi-value var,
}
.uci-change-list {
- font-family: monospace;
+ line-height: 170%;
+ white-space: pre;
}
+.uci-change-list del,
.uci-change-list ins,
-.uci-change-legend-label ins {
+.uci-change-list var,
+.uci-change-legend-label del,
+.uci-change-legend-label ins,
+.uci-change-legend-label var {
text-decoration: none;
- border: 1px solid #0f0;
- background-color: #cfc;
- display: block;
+ font-family: monospace;
+ font-style: normal;
+ border: 1px solid #ccc;
+ background: #eee;
padding: 2px;
+ display: block;
+ line-height: 15px;
+ margin-bottom: 1px;
+}
+
+.uci-change-list ins,
+.uci-change-legend-label ins {
+ border-color: #0f0;
+ background: #cfc;
}
.uci-change-list del,
.uci-change-legend-label del {
- text-decoration: none;
- border: 1px solid #f00;
- background-color: #fcc;
- display: block;
- font-style: normal;
- padding: 2px;
+ border-color: #f00;
+ background: #fcc;
}
.uci-change-list var,
.uci-change-legend-label var {
- text-decoration: none;
- border: 1px solid #ccc;
- background-color: #eee;
- display: block;
- font-style: normal;
- padding: 2px;
- line-height: 19px;
- white-space: pre;
+ border-color: #ccc;
+ background: #eee;
}
.uci-change-list var ins,
.uci-change-list var del {
- display: inline;
- /*border: none;*/
- white-space: pre;
- font-style: normal;
- padding: 0px;
+ display: inline-block;
+ border: none;
+ width: 100%;
+ padding: 0;
}
.uci-change-legend {
@@ -2010,14 +2020,23 @@ div.cbi-value var,
width: 10px;
height: 10px;
display: block;
+ position: relative;
}
.uci-change-legend-label var ins,
.uci-change-legend-label var del {
- line-height: 6px;
border: none;
+ position: absolute;
+ top: 2px;
+ left: 2px;
+ right: 2px;
+ bottom: 2px;
}
html body.apply-overlay-active {
height: calc(100vh - 63px);
}
+
+#applyreboot-section {
+ line-height: 300%;
+}
diff --git a/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm
index 6ad32efb47..4347f133a4 100644
--- a/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm
+++ b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm
@@ -136,12 +136,9 @@
if tree.nodes[category] and tree.nodes[category].ucidata then
local ucichanges = 0
+ local i, j
for i, j in pairs(require("luci.model.uci").cursor():changes()) do
- for k, l in pairs(j) do
- for m, n in pairs(l) do
- ucichanges = ucichanges + 1;
- end
- end
+ ucichanges = ucichanges + #j
end
if ucichanges > 0 then
diff --git a/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css
index d5e87ebef0..3e1b1cd2f1 100644
--- a/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css
+++ b/themes/luci-theme-freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css
@@ -586,6 +586,10 @@ html #menubar a:visited.warning {
margin-right: 2em;
}
+#applyreboot-section {
+ line-height: 300%;
+}
+
.lang_de #submenu_admin_uci {
width: 12em;
}
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 01fef2110a..fa0316343b 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
@@ -19,15 +19,20 @@
*/
/*
+ * Include custom css
+ */
+@import url("custom.css");
+
+/*
* Font generate by Icomoon<icomoon.io>
*/
@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;
}
@@ -255,7 +260,7 @@ footer > a {
width: calc(0% + 15rem);
height: 100%;
height: calc(100% - 4rem);
- background-color: white;
+ background-color: var(--menu-bg-color, #FFFFFF);
overflow-x: auto;
position: fixed;
}
@@ -281,18 +286,18 @@ footer > a {
}
header {
- background: #0099CC;
- color: white;
+ background: var(--header-bg, #0099CC);
+ color: var(--header-color, #FFFFFF);
}
-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;
+ color: var(--header-color, #FFFFFF);
text-decoration: none;
cursor: default;
vertical-align: text-bottom;
@@ -374,7 +379,7 @@ header > .container > .brand {
}
.main > .main-left > .nav > li a {
- color: #404040;
+ color: var(--menu-color, #404040);
display: block;
}
@@ -406,7 +411,7 @@ header > .container > .brand {
.main > .main-left > .nav > li:hover,
.main > .main-left > .nav > .slide > .menu:hover {
- background: #D4D4D4;
+ background: var(--submenu-bg-hover, #D4D4D4)
}
.main > .main-left > .nav > .slide:hover {
@@ -418,7 +423,7 @@ header > .container > .brand {
}
.main > .main-left > .nav > .slide > .slide-menu > .active {
- background-color: #0099CC;
+ background-color: var(--submenu-bg-hover-active, #0099CC);
}
.main > .main-left > .nav > .slide > .slide-menu > li > a {
@@ -431,7 +436,7 @@ header > .container > .brand {
}
.main > .main-left > .nav > .slide > .slide-menu > li:hover {
- background: #D4D4D4;
+ background: var(--submenu-bg-hover, #D4D4D4)
}
.main > .main-left > .nav > .slide > .slide-menu > .active:hover {
@@ -1226,7 +1231,7 @@ td > .ifacebadge,
min-height: 14rem;
padding: 0.8rem;
font-size: 0.8rem;
- font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+ font-family: monospace;
color: black;
}
@@ -1732,6 +1737,17 @@ body.lang_pl.node-main-login .cbi-value-title {
width: 12rem;
}
+/* applyreboot fix */
+
+#applyreboot-container {
+ margin: 2rem;
+}
+
+#applyreboot-section {
+ margin: 2rem;
+ line-height: 300%;
+}
+
@media screen and (max-width: 1600px) {
.main-left {
width: calc(0% + 13rem);
diff --git a/themes/luci-theme-material/htdocs/luci-static/material/custom.css b/themes/luci-theme-material/htdocs/luci-static/material/custom.css
new file mode 100644
index 0000000000..b32eb2af1b
--- /dev/null
+++ b/themes/luci-theme-material/htdocs/luci-static/material/custom.css
@@ -0,0 +1,9 @@
+
+:root {
+ --header-bg: #0099CC;
+ --header-color: #FFFFFF;
+ --menu-bg-color: #FFFFFF;
+ --menu-color: #404040;
+ --submenu-bg-hover: #D4D4D4;
+ --submenu-bg-hover-active: #0099CC;
+}
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..c070b1a617 100644
--- a/themes/luci-theme-material/luasrc/view/themes/material/header.htm
+++ b/themes/luci-theme-material/luasrc/view/themes/material/header.htm
@@ -160,13 +160,9 @@
-- calculate the number of unsaved changes
if tree.nodes[category] and tree.nodes[category].ucidata then
local ucichanges = 0
-
+ local i, j
for i, j in pairs(require("luci.model.uci").cursor():changes()) do
- for k, l in pairs(j) do
- for m, n in pairs(l) do
- ucichanges = ucichanges + 1;
- end
- end
+ ucichanges = ucichanges + #j
end
if ucichanges > 0 then
@@ -203,7 +199,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 +212,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>
diff --git a/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css
index 197166b73a..5becfc5ba5 100644
--- a/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css
+++ b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css
@@ -379,6 +379,11 @@ textarea#syslog {
border-color: #444444;
}
+#applyreboot-section {
+ margin: 2rem;
+ line-height: 300%;
+}
+
.lang_he #maincontent {
direction: rtl;
}
@@ -1392,44 +1397,49 @@ select + .cbi-button {
.uci-change-list {
font-family: monospace;
+ white-space: pre;
}
+.uci-change-list del,
.uci-change-list ins,
-.uci-change-legend-label ins {
+.uci-change-list var,
+.uci-change-legend-label del,
+.uci-change-legend-label ins,
+.uci-change-legend-label var {
text-decoration: none;
- border: 1px solid #00FF00;
- background-color: #CCFFCC;
- display: block;
+ font-style: normal;
+ border: 1px solid #ccc;
+ background: #eee;
padding: 2px;
+ display: block;
+ line-height: 15px;
+ margin-bottom: 1px;
+}
+
+.uci-change-list ins,
+.uci-change-legend-label ins {
+ border-color: #0f0;
+ background: #cfc;
}
.uci-change-list del,
.uci-change-legend-label del {
- text-decoration: none;
- border: 1px solid #FF0000;
- background-color: #FFCCCC;
- display: block;
- font-style: normal;
- padding: 2px;
+ border-color: #f00;
+ background: #fcc;
}
.uci-change-list var,
.uci-change-legend-label var {
- text-decoration: none;
- border: 1px solid #CCCCCC;
- background-color: #EEEEEE;
- display: block;
- font-style: normal;
- padding: 2px;
+ border-color: #ccc;
+ background: #eee;
}
.uci-change-list var ins,
.uci-change-list var del {
- /*display: inline;*/
+ display: inline-block;
border: none;
- white-space: pre;
- font-style: normal;
- padding: 0px;
+ width: 100%;
+ padding: 0;
}
.uci-change-legend {
@@ -1447,15 +1457,20 @@ select + .cbi-button {
.uci-change-legend-label>var {
float: left;
margin-right: 4px;
- width: 10px;
- height: 10px;
+ width: 12px;
+ height: 12px;
display: block;
+ position: relative;
}
.uci-change-legend-label var ins,
.uci-change-legend-label var del {
- line-height: 6px;
border: none;
+ position: absolute;
+ top: 1px;
+ left: 1px;
+ right: 1px;
+ bottom: 1px;
}
diff --git a/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm b/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm
index e77f9a4bfe..6fc657ddce 100644
--- a/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm
+++ b/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm
@@ -129,12 +129,9 @@
local function render_changes()
if tree.nodes[category] and tree.nodes[category].ucidata then
local ucic = 0
+ local i, j
for i, j in pairs(require("luci.model.uci").cursor():changes()) do
- for k, l in pairs(j) do
- for m, n in pairs(l) do
- ucic = ucic + 1;
- end
- end
+ ucic = ucic + #j
end
if ucic > 0 then
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-08 18:13:14 +0000