Merge branch 'master' of github.com:coralproject/talk into viewing-options

This commit is contained in:
Belen Curcio
2017-10-06 11:02:46 -03:00
16 changed files with 212 additions and 104 deletions
@@ -20,19 +20,20 @@
}
.header {
background-color: transparent;
box-shadow: none;
min-height: 58px;
display: block;
max-width: 1280px;
margin: 0 auto;
background-color: #696969;
box-shadow: 0 2px 2px 0 rgba(0,0,0,.14), 0 3px 1px -2px rgba(0,0,0,.2), 0 1px 5px 0 rgba(0,0,0,.12);
}
.header > div {
background-color: #696969;
position: relative;
padding: 0;
box-shadow: 0 2px 2px 0 rgba(0,0,0,.14), 0 3px 1px -2px rgba(0,0,0,.2), 0 1px 5px 0 rgba(0,0,0,.12);
width: 1280px;
margin: 0 auto;
height: 58px;
}