Merge remote-tracking branch 'upstream/master'
merge with upstream
This commit is contained in:
commit
8159cf6b1a
|
@ -1,4 +1,4 @@
|
|||
@import url(http://fonts.googleapis.com/css?family=Libre+Baskerville:400,700);
|
||||
@import url(https://fonts.googleapis.com/css?family=Libre+Baskerville:400,700);
|
||||
|
||||
|
||||
body{
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
@import url(http://fonts.googleapis.com/css?family=Grand+Hotel);
|
||||
@import url(https://fonts.googleapis.com/css?family=Grand+Hotel);
|
||||
body{background:#f2f2f2}body h2{font-weight:normal;color:#444}
|
||||
a{color: #45b29d}a:hover{color: #444;}
|
||||
.navigation .nav-head{text-transform:uppercase;color:#999;margin:20px 0}.navigation .nav-head:nth-child(1n+2){border-top:1px solid #ccc;padding-top:20px}
|
||||
|
|
Loading…
Reference in New Issue
Block a user