Merge branch 'master' into prod

This commit is contained in:
Christopher Neugebauer 2017-08-20 20:02:42 -07:00
commit 329b81d764
2 changed files with 2 additions and 2 deletions

View file

@ -2,7 +2,7 @@
During this phase, the program committee will score each proposal solely on the merits of its contents, without any identifying information or other knowledge about the speaker(s) proposing the talk.
## Phase two: identify-aware ranking and curation
## Phase two: identity-aware ranking and curation
The program committee will use the scored proposals in conjunction with speaker profiles to rank and organize a program meeting our goals for diversity of speakers and topics.

View file

@ -369,7 +369,7 @@ footer .footer-copy {
@media (max-width: 992px) and (min-width: 768px) {
.nav > li > a {
padding: 15px 9px;
padding: 15px 7px;
}
}