diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2018-10-20 18:02:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-20 18:02:11 +0200 |
| commit | 5e994c6179beea6259414064318af9675d537f15 (patch) | |
| tree | c73fc58521bf954b0e923d71b185567b40d20f52 | |
| parent | 9e6949849d7a34d17a7e43c79038f26a9b98d879 (diff) | |
| parent | 8095ba5a2df02af99784a33cecea23ea284cfb9a (diff) | |
Merge pull request #2196 from TDT-AG/pr/20181001-luci-theme-material
luci-theme-material: make font configurable and minor fixes
| -rw-r--r-- | themes/luci-theme-material/htdocs/luci-static/material/cascade.css | 6 | ||||
| -rw-r--r-- | themes/luci-theme-material/htdocs/luci-static/material/custom.css | 1 |
2 files changed, 4 insertions, 3 deletions
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 8fa45d980..65aaf73be 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 { @@ -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 { @@ -1611,7 +1611,7 @@ header > .container > .pull-right > * { } .node-main-login > .main .cbi-value-title { - width: 7rem; + width: 8rem; } .node-main-login > .main #maincontent { 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 b32eb2af1..adb9c753e 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"; } |