google
/
material-design-lite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge conflicts.

master
Jonathan Garbee 2015-07-16 09:55:46 -04:00
parent 9799f6ccf2 805538b8b8
commit a9f71bc096
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/footer/_mega_footer.scss
View File

@ -37,7 +37,7 @@
}
.mdl-mega-footer--left-section,
.mld-mega-footer__left-section {
.mdl-mega-footer__left-section {
margin-bottom: $footer-min-padding;
}

12
templates/blog/styles.css
View File

@ -1,18 +1,10 @@
body {
background-image: url('images/bg.jpg');
background-size: cover;
background-attachment: fixed;
/* FIXME: Temp. workaround for vertical scrollbars */
margin: 0;
}
body::before {
background-image: url('/images/head.jpg');
background-image: url('images/bg.jpg');
background-size: cover;
background-attachment: fixed;
content: '';
will-change: transform;
z-index: 1;
z-index: -1;
left: 0;
right: 0;
bottom: 0;