samuel-p/samuel-philipp.de
samuel-p/samuel-philipp.de
1
0
Fork 0
Code Issues Pull requests 3 Releases Activity Actions

Compare commits

base: samuel-p:6cad61e387de5a0d52472c1bb02ce68e1f3cf993
Branches Tags
samuel-p:main
samuel-p:renovate/sass-1.x
samuel-p:renovate/postcss-8.x
samuel-p:renovate/actions-upload-artifact-4.x
samuel-p:develop
..
compare: samuel-p:e97f5b26bc49bdbe276bdd99fdc2faf96d3d2174
Branches Tags
samuel-p:renovate/sass-1.x
samuel-p:renovate/postcss-8.x
samuel-p:renovate/actions-upload-artifact-4.x
samuel-p:develop
samuel-p:main

2 commits
6cad61e387 ... e97f5b26bc

Author SHA1 Message Date
samuel-p
e97f5b26bc
Merge remote-tracking branch 'origin/develop' into develop
Some checks failed
continuous-integration/drone/push Build is failing
Details 
# Conflicts:
#	package.json
 2021-05-29 20:43:57 +02:00
samuel-p
b522be7b33
some updates 
updated Mastodon account
 2021-05-29 20:42:05 +02:00
3 changed files with 24 additions and 13 deletions
Show stats Expand all files Collapse all files

19
package.json
View file

@ -15,20 +15,21 @@
"browser-sync": "^2.26.14" "browser-sync": "^2.26.14"
}, },
"devDependencies": { "devDependencies": {
"gulp": "4.0.2", "autoprefixer": "10.2.6",
"cssnano": "5.0.5",
"del": "6.0.0", "del": "6.0.0",
"lazypipe": "1.0.2", "gulp": "4.0.2",
"gulp-concat": "2.6.1",
"gulp-flatmap": "1.0.2", "gulp-flatmap": "1.0.2",
"gulp-header": "2.0.9", "gulp-header": "2.0.9",
"gulp-rename": "2.0.0",
"gulp-concat": "2.6.1",
"gulp-terser": "2.0.1",
"gulp-optimize-js": "1.1.0", "gulp-optimize-js": "1.1.0",
"gulp-sass": "4.1.0",
"gulp-postcss": "9.0.0", "gulp-postcss": "9.0.0",
"cssnano": "5.0.1", "gulp-rename": "2.0.0",
"autoprefixer": "10.2.5", "gulp-sass": "4.1.0",
"node-sass-tilde-importer": "^1.0.2" "gulp-terser": "2.0.1",
"lazypipe": "1.0.2",
"node-sass-tilde-importer": "^1.0.2",
"postcss": "^8.2.9"
}, },
"dependencies": { "dependencies": {
"@fortawesome/fontawesome-free": "^5.15.3", "@fortawesome/fontawesome-free": "^5.15.3",

17
src/index.html
View file

@ -36,10 +36,19 @@
<body> <body>
<div class="site-container"> <div class="site-container">
<div class="content"> <div class="content">
<div class="follow"> <div class="follow text-right">
<a rel="me" href="https://social.tchncs.de/@samuel_p"> <div class="mb-3">
<img alt="Mastodon Follow" src="https://shields.sp-codes.de/mastodon/follow/249926?domain=https%3A%2F%2Fsocial.tchncs.de&style=social"> <a rel="me" href="https://social.sp-codes.de/@samuel_p">
</a> <img alt="Mastodon Follow"
src="https://shields.sp-codes.de/mastodon/follow/106249673823954342?domain=https%3A%2F%2Fsocial.sp-codes.de&logoColor=black&style=social">
</a>
</div>
<div>
<a rel="me" href="https://pixel.tchncs.de/samuel-p">
<img alt="Pixelfed Follow"
src="https://shields.sp-codes.de/mastodon/follow/233656854528528384?domain=https%3A%2F%2Fpixel.tchncs.de&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCIgd2lkdGg9IjI0IiBoZWlnaHQ9IjI0Ij48cGF0aCBmaWxsPSJub25lIiBkPSJNMCAwSDI0VjI0SDB6Ii8%2BPHBhdGggZD0iTTEyIDJjNS41MjMgMCAxMCA0LjQ3NyAxMCAxMHMtNC40NzcgMTAtMTAgMTBTMiAxNy41MjMgMiAxMiA2LjQ3NyAyIDEyIDJ6bTEuMDMxIDYuMDk5aC0yLjYyNGMtLjk4OCAwLTEuNzg5Ljc3Ni0xLjc4OSAxLjczM3Y2Ljc0OGwyLjU5NS0yLjQ3MWgxLjgxOGMxLjcxMyAwIDMuMTAxLTEuMzQ1IDMuMTAxLTMuMDA1cy0xLjM4OC0zLjAwNS0zLjEtMy4wMDV6Ii8%2BPC9zdmc%2B&logoColor=black&style=social">
</a>
</div>
</div> </div>
<div id="developer" class="image"></div> <div id="developer" class="image"></div>
<div id="magician" class="image"></div> <div id="magician" class="image"></div>

1
src/scss/main.scss
View file

@ -3,6 +3,7 @@
@import "~bootstrap/scss/utilities/align"; @import "~bootstrap/scss/utilities/align";
@import "~bootstrap/scss/utilities/spacing"; @import "~bootstrap/scss/utilities/spacing";
@import "~bootstrap/scss/utilities/display"; @import "~bootstrap/scss/utilities/display";
@import "~bootstrap/scss/utilities/text";
@import "~@fortawesome/fontawesome-free/scss/fontawesome"; @import "~@fortawesome/fontawesome-free/scss/fontawesome";
@import "~@fortawesome/fontawesome-free/scss/solid"; @import "~@fortawesome/fontawesome-free/scss/solid";
@import "~@fortawesome/fontawesome-free/scss/brands"; @import "~@fortawesome/fontawesome-free/scss/brands";