Skip to content
This repository has been archived by the owner on Apr 11, 2022. It is now read-only.

Team fix #94

Closed
wants to merge 3 commits into from
Closed

Team fix #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf7881a
Team fix
Razor421 Nov 17, 2021
fc50909
Merge branch 'ASEAN-Build-The-Earth:main' into main
Razor421 Dec 11, 2021
ecad168
index small fixes
Razor421 Dec 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
137 changes: 51 additions & 86 deletions About_Us/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,7 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
<!-- Meta tags -->
<meta name="title" content="ASEAN Build The Earth">
<meta name="description" content="Official Website for ASEAN BTE">
<meta name="robots" content="index, follow">
<meta http-equiv="Content-Type" content="text/html">

<meta property="og:type" content="website">
<meta property="og:url" content="https://asean.buildtheearth.asia">
<meta property="og:title" content="ASEAN Build The Earth">
<meta property="og:description" content="Official Website for ASEAN BTE">

<meta property="twitter:card" content="summary_large_image">
<meta property="twitter:url" content="https://asean.buildtheearth.asia">
<meta property="twitter:title" content="ASEAN Build The Earth">
<meta property="twitter:description" content="Official Website for ASEAN BTE">

<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
<link rel="stylesheet" media="screen" href="https://fontlibrary.org//face/minecraftia" type="text/css" />
<link rel="stylesheet" href="./style.css">
<link rel="icon" href="../Assets/Images/icons/aseanbte_logo.png">
Expand Down Expand Up @@ -53,16 +36,12 @@
</li>
<li class="nav-item">
<a href="./index.html" class="nav-link p-3" style="font-size: large;"><i class="fas fa-atlas">
</i>&nbsp;About Us</a>
</i>&nbsp;About Us</a>
</li>
<li class="nav-item">
<li class="nav-item">
<a href="../Teams/index.html" class="nav-link p-3" style="font-size: large;">
<i class="fas fa-atlas"></i>&nbsp;Teams</a>
</li>
<li class="nav-item">
<a href="../FAQ/index.html" class="nav-link p-3" style="font-size: large;">
<i class="fas fa-question-circle"></i>&nbsp;FAQ</a>
</li>
</ul>
</div>
</div>
Expand All @@ -76,10 +55,10 @@ <h1>About Us</h1>
<h3 style="text-align: center; margin-bottom: 21px;">Contributors</h3>
<div class="container">
<div class="row">

<div class="col-lg-4">
<div class="card card-1 border-secondary">
<img src="../Assets/Images/avatars/tintinkung.jpg" alt="" class="avatar rounded-circle">
<h3 class="profile-name">tintinkung</h3>
<div class="card card-1">
<h3 style="font-size: 21px;">tintinkung</h3>
<p style="font-size: smaller;">Lorem ipsum dolor sit amet consectetur adipisicing elit. Est incidunt possimus
iure dolor, perferendis placeat nihil perspiciatis earum voluptas cupiditate, amet atque doloremque nesciunt
eum corporis eos minima beatae velit!</p>
Expand All @@ -89,59 +68,52 @@ <h3 class="profile-name">tintinkung</h3>
</div>

<div class="col-lg-4">
<div class="card card-1 border-secondary">
<img src="../Assets/Images/avatars/StoneMcYT.jpg" alt="" class="avatar rounded-circle">
<h3 class="profile-name">StoneMcYT</h3>
<p style="font-size: smaller;">Hey, I’m StoneMc also referred as Glowstone. I’m a programmer and the languages
I’m decent in area JavaScript, json? and hjson. I usually program the merlion as well as managing pull
requests</p>
<div class="card card-1">
<h3 style="font-size: 21px;">StoneMcYT</h3>
<p style="font-size: smaller;">Hey, I’m StoneMc also referred as Glowstone. I’m a programmer and the languages I’m decent in area JavaScript, json? and hjson. I usually program the merlion as well as managing pull requests</p>
<footer><a href="https://github.com/StoneMcYT"><i class="fab fa-github fa-2x" style="color: black;"></i></a>
</footer>
</div>
</div>

<div class="col-lg-4">
<div class="card card-1 border-secondary">
<img src="../Assets/Images/avatars/Kira272921.png" alt="" class="avatar rounded-circle">
<h3 class="profile-name">Kira</h3>
<p style="font-size: small;">Hey, I am Kira. I am a full stack dev and discord bot dev. I mostly work with
Python, HTML, CSS and JS. I am reacting learning Reactjs</p>
<div class="card card-1">
<h3 style="font-size: 21px;">Kira</h3>
<p style="font-size: small;">Lorem, ipsum dolor sit amet consectetur adipisicing elit. Eum enim ducimus
optio cumque at accusantium
nostrum delectus adipisci eius neque unde architecto quod, perferendis, aut dolores quia tenetur quibusdam
dolorem.</p>
<footer><a href="https://github.com/Kira"><i class="fab fa-github fa-2x" style="color: black;"></i></a>
</footer>
</div>
</div>

<div class="col-lg-4">
<div class="card card-2 border-secondary">
<h3 class="profile-name">S4ge_Rites</h3>
<img src="../Assets/Images/avatars/S4ge_Rites.png" alt="" class="avatar rounded-circle">
<div class="card card-2">
<h3 style="font-size: 21px;">S4ge_Rites</h3>
<p style="font-size: smaller;">Lorem ipsum dolor, sit amet consectetur adipisicing elit. Ipsum quasi error
expedita perspiciatis a ab
perferendis accusantium, harum dolore voluptatem obcaecati consequuntur et sint accusamus. Quis quae
reiciendis repudiandae blanditiis.</p>
<footer><a href="https://github.com/S4ge-Rites"><i class="fab fa-github fa-2x"
style="color: rgb(0, 0, 0);"></i></a>
<footer><a href="https://github.com/S4ge-Rites"><i class="fab fa-github fa-2x" style="color: black;"></i></a>
</footer>
</div>
</div>

<div class="col-lg-4">
<div class="card card-2 border-secondary">
<img src="../Assets/Images/avatars/Razorz.png" alt="" class="avatar rounded-circle">
<h3 class="profile-name">Razor421</h3>
<p style="font-size: smaller;">Hello I am Razor and I am a junior dev at ASEAN BTE.
im decent at HTML and im learning some CSS and JS.
I spend some time coding and playing minecraft, where im building
a very cool base.</p>
<div class="card card-2">
<h3 style="font-size: 21px;">Razor421</h3>
<p style="font-size: smaller;">hey! i'm Razor, the resident junior web developer. i pride myself with doing the best work possible,
and i beleive i am quite decent at html and css, although i do need some more training. i'm also a very frequent minecraft player, where i am currently
building a massive base.</p>
<footer><a href="https://github.com/Razor421"><i class="fab fa-github fa-2x" style="color: black;"></i></a>
</footer>
</div>
</div>

<div class="col-lg-4">
<div class="card card-2 border-secondary">
<img src="../Assets/Images/avatars/CookieGMVN.png" alt="" class="avatar rounded-circle">
<h3 class="profile-name">CookieGMVN</h3>
<div class="card card-2">
<h3 style="font-size: 21px;">CookieGMVN</h3>
<p style="font-size: smaller;">Lorem ipsum dolor, sit amet consectetur adipisicing elit. Ipsum quasi error
expedita perspiciatis a ab
perferendis accusantium, harum dolore voluptatem obcaecati consequuntur et sint accusamus. Quis quae
Expand All @@ -152,9 +124,8 @@ <h3 class="profile-name">CookieGMVN</h3>
</div>

<div class="col-lg-4">
<div class="card card-2 border-secondary">
<img src="../Assets/Images/avatars/CommanderAstern.png" alt="" class="avatar rounded-circle">
<h3 class="profile-name">CommanderAstern</h3>
<div class="card card-2">
<h3 style="font-size: 21px;">CommanderAstern</h3>
<p style="font-size: smaller;">Lorem ipsum dolor, sit amet consectetur adipisicing elit. Ipsum quasi error
expedita perspiciatis a ab
perferendis accusantium, harum dolore voluptatem obcaecati consequuntur et sint accusamus. Quis quae
Expand All @@ -166,9 +137,8 @@ <h3 class="profile-name">CommanderAstern</h3>
</div>

<div class="col-lg-4">
<div class="card card-2 border-secondary">
<img src="../Assets/Images/avatars/Adhiraj.jpg" alt="" class="avatar rounded-circle">
<h3 class="profile-name">Adhiraj</h3>
<div class="card card-2">
<h3 style="font-size: 21px;">Adhiraj</h3>
<p style="font-size: smaller;">Lorem ipsum dolor, sit amet consectetur adipisicing elit. Ipsum quasi error
expedita perspiciatis a ab perferendis accusantium, harum dolore voluptatem obcaecati consequuntur et sint
accusamus. Quis quae reiciendis repudiandae blanditiis.</p>
Expand All @@ -178,9 +148,8 @@ <h3 class="profile-name">Adhiraj</h3>
</div>

<div class="col-lg-4">
<div class="card card-2 border-secondary" style="margin-bottom: 21px;">
<img src="../Assets/Images/avatars/iOnly.png" alt="" class="avatar rounded-circle">
<h3 class="profile-name">iOnly</h3>
<div class="card card-2" style="margin-bottom: 21px;">
<h3 style="font-size: 21px;">iOnly</h3>
<p style="font-size: smaller;">Lorem ipsum dolor, sit amet consectetur adipisicing elit. Ipsum quasi error
expedita perspiciatis a ab perferendis accusantium, harum dolore voluptatem obcaecati consequuntur et sint
accusamus. Quis quae reiciendis repudiandae blanditiis.</p>
Expand All @@ -198,9 +167,8 @@ <h3 style="text-align: center; margin-bottom: 21px; margin-top: 15px;">Leaders</
<div class="row">
<div class="col-lg-4">

<div class="card card-3 border-secondary">
<img src="../Assets/Images/avatars/HER0BOSS.png" alt="" class="avatar rounded-circle">
<h3 class="profile-name">HER0B0SS</h3>
<div class="card card-3">
<h3 style="font-size: 21px;">HER0B0SS</h3>
<p style="font-size: smaller;">Lorem ipsum dolor sit amet consectetur adipisicing elit. Est incidunt possimus
iure dolor, perferendis placeat nihil perspiciatis earum voluptas cupiditate, amet atque doloremque nesciunt
eum corporis eos minima beatae velit!</p>
Expand All @@ -210,19 +178,19 @@ <h3 class="profile-name">HER0B0SS</h3>
</div>

<div class="col-lg-4">
<div class="card card-3 border-secondary">
<img src="../Assets/Images/avatars/! MegaPlace.png" alt="" class="avatar rounded-circle">
<h3 class="profile-name">! MegaPlace</h3>
<p style="font-size: smaller;">Hi I'm MegaPlace or people called me Mega. I'm leader for part of Thailand. I
am researcher and a bit of artist by using clipstudio, krita and medibang. I quickly plan the layout who
will build where. I mostly busy with irl and planning over a month about events and website.</p>
<div class="card card-3">
<h3 style="font-size: 21px;">! MegaPlace</h3>
<p style="font-size: smaller;">Lorem ipsum dolor sit amet consectetur adipisicing elit. Est incidunt possimus
iure dolor, perferendis placeat nihil perspiciatis earum voluptas cupiditate, amet atque doloremque nesciunt
eum corporis eos minima beatae velit!</p>
<footer><a href="https://github.com/"><i class="fab fa-github fa-2x" style="color: black;"></i></a>
</footer>
</div>
</div>

<div class="col-lg-4">
<div class="card card-3 border-secondary">
<img src="../Assets/Images/avatars/aa.png" alt="" class="avatar rounded-circle">
<h3 class="profile-name">aa.</h3>
<div class="card card-3">
<h3 style="font-size: 21px;">aa.</h3>
<p style="font-size: smaller;">Lorem ipsum dolor sit amet consectetur adipisicing elit. Est incidunt possimus
iure dolor, perferendis placeat nihil perspiciatis earum voluptas cupiditate, amet atque doloremque nesciunt
eum corporis eos minima beatae velit!</p>
Expand All @@ -232,33 +200,30 @@ <h3 class="profile-name">aa.</h3>
</div>

<div class="col-lg-4">
<div class="card card-4 border-secondary">
<img src="../Assets/Images/avatars/tintinkung.jpg" alt="" class="avatar rounded-circle">
<h3 class="profile-name">dirtytin</h3>
<div class="card card-4">
<h3 style="font-size: 21px;">dirtytin</h3>
<p style="font-size: smaller;">Lorem ipsum dolor sit amet consectetur adipisicing elit. Est incidunt possimus
iure dolor, perferendis placeat nihil perspiciatis earum voluptas cupiditate, amet atque doloremque nesciunt
eum corporis eos minima beatae velit!</p>
<footer><a href="https://github.com/"><i class="fab fa-github fa-2x" style="color: black;"></i></a>
</footer>
</div>
</div>

<div class="col-lg-4">
<div class="card card-4 border-secondary">
<img src="../Assets/Images/avatars/phats.png" alt="" class="avatar rounded-circle">
<h3 class="profile-name">! Phats</h3>
<div class="card card-4">
<h3 style="font-size: 21px;">! Phats</h3>
<p style="font-size: smaller;">Lorem ipsum dolor sit amet consectetur adipisicing elit. Est incidunt possimus
iure dolor, perferendis placeat nihil perspiciatis earum voluptas cupiditate, amet atque doloremque nesciunt
eum corporis eos minima beatae velit!</p>
<footer><a href="https://github.com/"><i class="fab fa-github fa-2x" style="color: black;"></i></a>
</footer>
</div>
</div>

<div class="col-lg-4">
<div class="card card-4 border-secondary">
<img src="../Assets/Images/avatars/richard head.png" alt="" class="avatar rounded-circle">
<h3 class="profile-name">Richard Head</h3>
<div class="card card-4">
<h3 style="font-size: 21px;">Richard Head</h3>
<p style="font-size: smaller;">Lorem ipsum dolor sit amet consectetur adipisicing elit. Est incidunt possimus
iure dolor, perferendis placeat nihil perspiciatis earum voluptas cupiditate, amet atque doloremque nesciunt
eum corporis eos minima beatae velit!</p>
Expand All @@ -275,4 +240,4 @@ <h3 class="profile-name">Richard Head</h3>
crossorigin="anonymous"></script>
</body>

</html>
</html>
43 changes: 9 additions & 34 deletions Contact_Us/contact.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,6 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
<!-- Meta tags -->
<meta name="title" content="ASEAN Build The Earth">
<meta name="description" content="Official Website for ASEAN BTE">
<meta name="robots" content="index, follow">
<meta http-equiv="Content-Type" content="text/html">

<meta property="og:type" content="website">
<meta property="og:url" content="https://asean.buildtheearth.asia">
<meta property="og:title" content="ASEAN Build The Earth">
<meta property="og:description" content="Official Website for ASEAN BTE">

<meta property="twitter:card" content="summary_large_image">
<meta property="twitter:url" content="https://asean.buildtheearth.asia">
<meta property="twitter:title" content="ASEAN Build The Earth">
<meta property="twitter:description" content="Official Website for ASEAN BTE">
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
<link rel="stylesheet" media="screen" href="https://fontlibrary.org//face/minecraftia" type="text/css" />
Expand Down Expand Up @@ -56,21 +41,15 @@
<a href="../Teams/index.html" class="nav-link p-3" style="font-size: large;">
<i class="fas fa-atlas"></i>&nbsp;Teams</a>
</li>
<li class="nav-item">
<a href="../FAQ/index.html" class="nav-link p-3" style="font-size: large;">
<i class="fas fa-question-circle"></i>&nbsp;FAQ</a>
</li>
</ul>
</div>
</div>
</nav>

<section class="contact" id="contact">
<div class="contactDetails">
<span>
<h2><i class="fas fa-paper-plane"></i> Contact Us</h2>
<p>Lorem ipsum, dolor sit amet consectetur adipisicing elit. Eius soluta eveniet delectus nemo, reiciendis
repellendus.</p>
<p>welcome to the contact us page, here we have a short form for people who wish to contact us. alternativley, you can click one of the many buttons below.</p>
<div class="icons">
<!-- TEMPOLARY ICON can be remove / change any time -->
<img class="icon" src="../Assets/Images/icons/facebook.png" alt="Facebook">
Expand All @@ -82,10 +61,9 @@ <h2><i class="fas fa-paper-plane"></i> Contact Us</h2>
</div>
<div class="contactForm">
<h2>Contact Us</h2>

<form>
<span>
<label><i class="fas fa-user"></i> Name</label>
<label><i class="fas fa-user"></i> Full Name</label>
<input type="text" placeholder="Type Name">
</span>
<span>
Expand All @@ -96,24 +74,21 @@ <h2>Contact Us</h2>
<label><i class="fas fa-pencil-alt"></i> Your Message</label>
<textarea placeholder="Type Message"></textarea>
</span>
<button id="scrollActivate" type="button" class="btn btn-light viewmore"><span>
<i class="fas fa-chevron-down"></i>
<button id="scrollActivate" type="button" class="btn btn-light viewmore"><span><i
class="fas fa-chevron-down"></i>
Send Message</span></button>
</form>
</div>
</section>

<!-- WORK-IN-PROGRESS smptjs email sending extension for contact-us
**this will move to new branch to prevent confusion when editing styling of this page, will merge after page is more stable.

<script src="https://smtpjs.com/v3/smtp.js"></script>
<script src="./contact.js"></script>
-->

<!-- <h1>Contact Us</h1>
<hr>
<p>You can join our <a href="https://discord.com/invite/fQtSgpF">Discord</a> and ask around or DM Merlion#0572 for conversations with staff members or other teams.</p>
<a href = "mailto: [email protected]">Offcial Email</a> -->
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"
integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous">
</script>

</script>
</body>

</html>
Loading