fix conflics
This commit is contained in:
parent
b2f377da18
commit
1e8895f4b8
10 changed files with 144 additions and 64 deletions
|
|
@ -19,8 +19,8 @@ html, body {height: 100%;}
|
|||
|
||||
#footer {
|
||||
position: relative;
|
||||
margin-top: -91px; /* negative value of footer height */
|
||||
height: 91px;
|
||||
margin-top: -96px; /* negative value of footer height */
|
||||
height: 96px;
|
||||
clear:both;
|
||||
padding: 5px 2rem;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue