Fixed merge conflicts.
This commit is contained in:
commit
ec2a5e212a
15 changed files with 87 additions and 121 deletions
|
@ -7,7 +7,8 @@
|
|||
// Center block
|
||||
@mixin center-block {
|
||||
display: block;
|
||||
margin: 0 auto;
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
}
|
||||
|
||||
// Clearfix
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue