Merge branch 'master' into develop-0.12.0

This commit is contained in:
afc163 2016-01-20 17:32:38 +08:00
commit 0d00aaf011

View File

@ -186,7 +186,6 @@ a.logo {
.nav ul li { .nav ul li {
float: left; float: left;
padding: 0 22px;
text-align: center; text-align: center;
} }
@ -195,6 +194,7 @@ a.logo {
width: 100%; width: 100%;
height: 100%; height: 100%;
display: block; display: block;
padding: 0 22px;
} }
a.nav-link-disabled { a.nav-link-disabled {