Merge remote-tracking branch 'upstream/master'

This commit is contained in:
skullmasher 2016-11-01 04:45:49 +01:00
commit aec7fbdd6f
5 changed files with 16 additions and 22 deletions

View file

@ -21,16 +21,16 @@ html {
body {
font-size: $base-font-size;
background-color: $base-background;
background-color: $alpha-color;
color: $base-color;
font-family: $font-stack-common;
line-height: $line-height;
}
a {
color: $base-color-link;
color: $zeta-color;
&:hover, &:focus, &:active {
color: $base-color-link-hover;
color: $base-color;
}
}
@ -186,4 +186,4 @@ svg {
img {
height: auto;
}
}