From 5fc51693aca783ce8a2f04919dfa16991def1d16 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Mon, 1 Oct 2018 13:35:34 +0200 Subject: luci-theme-material: make font configurable Move font selection into custom.css Signed-off-by: Florian Eckert --- themes/luci-theme-material/htdocs/luci-static/material/cascade.css | 2 +- themes/luci-theme-material/htdocs/luci-static/material/custom.css | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'themes/luci-theme-material') 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 8fa45d9809..d997bcfffd 100644 --- a/themes/luci-theme-material/htdocs/luci-static/material/cascade.css +++ b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css @@ -125,7 +125,7 @@ html, body { margin: 0px; padding: 0px; height: 100%; - font-family: Microsoft Yahei, WenQuanYi Micro Hei, sans-serif, "Helvetica Neue", Helvetica, Hiragino Sans GB; + font-family: var(--font-body, "Microsoft Yahei", "WenQuanYi Micro Hei", "sans-serif", "Helvetica Neue", "Helvetica", "Hiragino Sans GB"); } select { diff --git a/themes/luci-theme-material/htdocs/luci-static/material/custom.css b/themes/luci-theme-material/htdocs/luci-static/material/custom.css index b32eb2af1b..adb9c753e2 100644 --- a/themes/luci-theme-material/htdocs/luci-static/material/custom.css +++ b/themes/luci-theme-material/htdocs/luci-static/material/custom.css @@ -6,4 +6,5 @@ --menu-color: #404040; --submenu-bg-hover: #D4D4D4; --submenu-bg-hover-active: #0099CC; + --font-body: "Microsoft Yahei", "WenQuanYi Micro Hei", "sans-serif", "Helvetica Neue", "Helvetica", "Hiragino Sans GB"; } -- cgit v1.2.3 From 0f8b5402a22b6c3689ab1e17ff6ab2060d090481 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Mon, 1 Oct 2018 14:49:02 +0200 Subject: luci-theme-material: fix word wrap on german i18n for username Signed-off-by: Florian Eckert --- themes/luci-theme-material/htdocs/luci-static/material/cascade.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'themes/luci-theme-material') 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 d997bcfffd..29c2a664e6 100644 --- a/themes/luci-theme-material/htdocs/luci-static/material/cascade.css +++ b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css @@ -1611,7 +1611,7 @@ header > .container > .pull-right > * { } .node-main-login > .main .cbi-value-title { - width: 7rem; + width: 8rem; } .node-main-login > .main #maincontent { -- cgit v1.2.3 From 8095ba5a2df02af99784a33cecea23ea284cfb9a Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Fri, 12 Oct 2018 10:58:14 +0200 Subject: luci-theme-material: fix css to show loading-img again Signed-off-by: Florian Eckert --- themes/luci-theme-material/htdocs/luci-static/material/cascade.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'themes/luci-theme-material') 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 29c2a664e6..65aaf73be0 100644 --- a/themes/luci-theme-material/htdocs/luci-static/material/cascade.css +++ b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css @@ -235,8 +235,8 @@ footer > a { .main > .loading > span > .loading-img { animation: anim-rotate 2s infinite linear; - margin-right: 0.2rem; display: inline-block; + margin: 5rem; } @keyframes anim-rotate { -- cgit v1.2.3