Merge pull request #2196 from TDT-AG/pr/20181001-luci-theme-material

luci-theme-material: make font configurable and minor fixes
This commit is contained in:
Jo-Philipp Wich 2018-10-20 18:02:11 +02:00 committed by GitHub
commit 5e994c6179
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions

View file

@ -125,7 +125,7 @@ html, body {
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
height: 100%; 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 { select {
@ -235,8 +235,8 @@ footer > a {
.main > .loading > span > .loading-img { .main > .loading > span > .loading-img {
animation: anim-rotate 2s infinite linear; animation: anim-rotate 2s infinite linear;
margin-right: 0.2rem;
display: inline-block; display: inline-block;
margin: 5rem;
} }
@keyframes anim-rotate { @keyframes anim-rotate {
@ -1611,7 +1611,7 @@ header > .container > .pull-right > * {
} }
.node-main-login > .main .cbi-value-title { .node-main-login > .main .cbi-value-title {
width: 7rem; width: 8rem;
} }
.node-main-login > .main #maincontent { .node-main-login > .main #maincontent {

View file

@ -6,4 +6,5 @@
--menu-color: #404040; --menu-color: #404040;
--submenu-bg-hover: #D4D4D4; --submenu-bg-hover: #D4D4D4;
--submenu-bg-hover-active: #0099CC; --submenu-bg-hover-active: #0099CC;
--font-body: "Microsoft Yahei", "WenQuanYi Micro Hei", "sans-serif", "Helvetica Neue", "Helvetica", "Hiragino Sans GB";
} }