Merge branch 'develop'

Prestarocket · Prestarocket · commit dfda6e79062e · 2020-05-05T01:16:48.000+02:00
diff --git a/_dev/css/components/block-social.scss b/_dev/css/components/block-social.scss
@@ -20,13 +20,12 @@
   background-position: center center;
   &.facebook {
     background-image: url(../img/facebook.svg);
-
   }
   &.twitter {
     background-image: url(../img/twitter.svg);
   }
-  &.googleplus {
-    background-image: url(../img/gplus.svg);
+  &.linkedin {
+    background-image: url(../img/linkedin.svg);
   }
   &.pinterest {
     background-image: url(../img/pinterest.svg);
@@ -39,7 +38,6 @@
   }
   &.vimeo{
     background-image: url(../img/vimeo.svg);
-
   }
   &.instagram{
     background-image: url(../img/instagram.svg);
@@ -153,4 +151,4 @@
 //}
 //.instagram {
 //  background-image: url(../img/instagram.svg);
-//}
+//}
diff --git a/_dev/img/linkedin.svg b/_dev/img/linkedin.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="#FFFFFF" d="M4.98 3.5c0 1.381-1.11 2.5-2.48 2.5s-2.48-1.119-2.48-2.5c0-1.38 1.11-2.5 2.48-2.5s2.48 1.12 2.48 2.5zm.02 4.5h-5v16h5v-16zm7.982 0h-4.968v16h4.969v-8.399c0-4.67 6.029-5.052 6.029 0v8.399h4.988v-10.131c0-7.88-8.922-7.593-11.018-3.714v-2.155z"/></svg>

Original file line number	Diff line number	Diff line change
`@@ -20,13 +20,12 @@`
`20`	`20`	`background-position: center center;`
`21`	`21`	`&.facebook {`
`22`	`22`	`background-image: url(../img/facebook.svg);`
`23`		`-`
`24`	`23`	`}`
`25`	`24`	`&.twitter {`
`26`	`25`	`background-image: url(../img/twitter.svg);`
`27`	`26`	`}`
`28`		`- &.googleplus {`
`29`		`- background-image: url(../img/gplus.svg);`
	`27`	`+ &.linkedin {`
	`28`	`+ background-image: url(../img/linkedin.svg);`
`30`	`29`	`}`
`31`	`30`	`&.pinterest {`
`32`	`31`	`background-image: url(../img/pinterest.svg);`
`@@ -39,7 +38,6 @@`
`39`	`38`	`}`
`40`	`39`	`&.vimeo{`
`41`	`40`	`background-image: url(../img/vimeo.svg);`
`42`		`-`
`43`	`41`	`}`
`44`	`42`	`&.instagram{`
`45`	`43`	`background-image: url(../img/instagram.svg);`
`@@ -153,4 +151,4 @@`
`153`	`151`	`//}`
`154`	`152`	`//.instagram {`
`155`	`153`	`// background-image: url(../img/instagram.svg);`
`156`		`-//}`
	`154`	`+//}`