sharpetronics/jekyll-algolia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix merge conflict on calc

Browse Source
This commit is contained in:
Pixelastic 2018-01-26 17:39:55 +01:00
parent 764d4d7ac0
commit d7310222dd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs-src/src/stylesheets/pages/_index.scss
View File

@ -224,8 +224,8 @@
left: 0; left: 0;
background: background:
url(../assets/images/illu-funnel.svg) center 0% no-repeat, url(../assets/images/illu-funnel.svg) center 0% no-repeat,
url(../assets/images/touch-point.svg) calc(100% / 2 - 10px) 285px no-repeat, url(../assets/images/touch-point.svg) calc(50% - 10px) 285px no-repeat,
url(../assets/images/touch-point.svg) calc(100% / 2 - 10px) 435px no-repeat, url(../assets/images/touch-point.svg) calc(50% - 10px) 435px no-repeat,
url(../assets/images/servers.svg) center 100% no-repeat; url(../assets/images/servers.svg) center 100% no-repeat;
pointer-events: none; pointer-events: none;
z-index: 10; z-index: 10;