Merge branch 'master' into prod

This commit is contained in:
Nick Seidenman (N6) 2017-01-18 15:57:46 +11:00
commit 8c1a05dd04
2 changed files with 0 additions and 9 deletions

View file

@ -581,7 +581,6 @@ table {
body { body {
font-size: 16px; font-size: 16px;
font-family: "Roboto", sans-serif; font-family: "Roboto", sans-serif;
line-height: 1.4;
color: #0c486c; color: #0c486c;
font-size: 4vw; font-size: 4vw;
} }
@ -642,13 +641,6 @@ a:hover, a:focus, a:active {
} }
ul > li,
ol > li {
list-style-position: outside;
margin-left: 1em;
}
blockquote { blockquote {
margin-left: 0; margin-left: 0;
padding-left: 20px; padding-left: 20px;

View file

@ -35,7 +35,6 @@ body {
.jumbotron h1 { .jumbotron h1 {
font-size: 3em; font-size: 3em;
font-family: 'Flux Regular'; font-family: 'Flux Regular';
background-color: #000;
} }
#announcements { #announcements {