Merge branch 'master' into master
This commit is contained in:
commit
c18531ca21
9 changed files with 69 additions and 22 deletions
|
|
@ -3,7 +3,8 @@
|
|||
|
||||
#splash {
|
||||
// Counter the general padding for #content
|
||||
margin-bottom: -60px;
|
||||
margin-bottom: -65px;
|
||||
|
||||
section {
|
||||
padding-top: 60px;
|
||||
padding-bottom: 60px;
|
||||
|
|
@ -144,6 +145,10 @@
|
|||
}
|
||||
}
|
||||
|
||||
.social-media.trapezoid {
|
||||
border-top-color: #0C3559; // TODO: Use @conference color?
|
||||
}
|
||||
|
||||
#social-media{
|
||||
background: none repeat scroll 0 0 #0C3559;
|
||||
padding: 50px 20px;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue