aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMarvin Borner2018-09-04 12:52:55 +0200
committerMarvin Borner2018-09-04 12:52:55 +0200
commitb080586bbf21fbb38d21f1f83a0fea28199627fe (patch)
tree3bdfda1aace47a1696bce0f5e5b7aaa110c18fa8
parent4a42ba993730fd80c99f83dbc4ed761ddf62da79 (diff)
parentc15f1b5f4982014b579f6516df8a7086241b223e (diff)
Merge remote-tracking branch 'origin/master'
-rw-r--r--CNAME1
-rw-r--r--assets/css/style.css28
-rw-r--r--index.html12
3 files changed, 36 insertions, 5 deletions
diff --git a/CNAME b/CNAME
new file mode 100644
index 0000000..3137e29
--- /dev/null
+++ b/CNAME
@@ -0,0 +1 @@
+texx.me \ No newline at end of file
diff --git a/assets/css/style.css b/assets/css/style.css
index 45fcd43..9d83d77 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -14,8 +14,8 @@
}
html, body {
- min-height: 100vh;
- width: 100vw;
+ min-height: 100%;
+ width: 100%;
overflow: hidden;
}
@@ -25,8 +25,8 @@ html, body {
.ContentWrapper {
display: flex;
- min-height: 100vh;
- width: 100vw;
+ height: 100% !important;
+ width: 100%;
flex-direction: column;
flex-wrap: wrap;
justify-content: center;
@@ -95,4 +95,24 @@ a:hover {
background: radial-gradient(circle at 30% 107%, #fdf497 0%, #fdf497 5%, #fd5949 45%,#d6249f 60%,#285AEB 90%);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
+}
+
+.fa-whatsapp {
+ color: #25d366;
+}
+
+.fa-telegram-plane {
+ color: #0088cc;
+}
+
+.fa-envelope {
+ color: #f1ed21;
+}
+
+.fa-github {
+ color: #939393;
+}
+
+.name {
+ font-size: 12px;
} \ No newline at end of file
diff --git a/index.html b/index.html
index 13351cc..0f658d6 100644
--- a/index.html
+++ b/index.html
@@ -73,21 +73,31 @@
<h1>Team</h1>
<div class="Social">
<div class="marvin">
+ <p class="name">Marvin Borner, Developer & Inventor</p>
<a href="https://marvinborner.me/" target="_blank"><img src="https://avatars3.githubusercontent.com/u/32108934" alt="Marvin Borner"></a>
<a href="https://instagram.com/marvinborner.me/" target="_blank"><i class="fab fa-instagram"></i></a>
<a href="https://t.me/marvinborner" target="_blank"><i class="fab fa-telegram-plane"></i></a>
+ <a href="https://wa.me/+4915755219293" target="_blank"><i class="fab fa-whatsapp"></i></a>
+ <a href="mailto:marvin@borners.de?subject=Texx-Website"><i class="far fa-envelope"></i></a>
+ <a href="https://github.com/marvinborner" target="_blank"><i class="fab fa-github"></i></a>
</div>
<hr>
<div class="marco">
+ <p class="name">Marco Alexander Fischer, Web Developer</p>
<a href="https://www.marcoalexanderfischer.de/" target="_blank"><img src="https://avatars0.githubusercontent.com/u/33265753" alt="Marco Alexander Fischer"></a>
- <a href="https://instagram.com/hyteyt/" target="_blank"><i class="fab fa-instagram"></i></a>
+ <a href="https://instagram.com/hyteyt_marco/" target="_blank"><i class="fab fa-instagram"></i></a>
<a href="https://t.me/hyteyt" target="_blank"><i class="fab fa-telegram-plane"></i></a>
+ <a href="https://wa.me/+491704887928" target="_blank"><i class="fab fa-whatsapp"></i></a>
+ <a href="mailto:mail@marcoalexanderfischer.de?subject=Texx-Website"><i class="far fa-envelope"></i></a>
+ <a href="https://github.com/hyteyt" target="_blank"><i class="fab fa-github"></i></a>
</div>
<hr>
<div class="aakash">
+ <p class="name">Aakash Pawar, Designer</p>
<a href="https://icarusap.site/" target="_blank"><img src="https://icarusap.site/assets/images/Aakash_avatar.png" alt="Aakash Pawar"></a>
<a href="https://instagram.com/ic.a.r.us/" target="_blank"><i class="fab fa-instagram"></i></a>
<a href="https://t.me/IcarusAP" target="_blank"><i class="fab fa-telegram-plane"></i></a>
+ <a href="mailto:aakash19.98pawar@gmail.com?subject=Texx-Website"><i class="far fa-envelope"></i></a>
</div>
</div>
</div>