diff --git a/Documents/poster.pdf b/Documents/poster.pdf new file mode 100644 index 0000000000000000000000000000000000000000..d73bf8c676e7b74277b1da0aff2ccca7ab897fc8 Binary files /dev/null and b/Documents/poster.pdf differ diff --git a/css/style.css b/css/style.css index d85f077cf3c130e2c6034fdf04df39e6da5ba5ad..00a60400c83f39945942fc6f18bb5c51f0fbb8ea 100644 --- a/css/style.css +++ b/css/style.css @@ -93,7 +93,13 @@ a:focus { color: initial; } -.btn, +.btn { + + background-color: #414144; + color: #e7e7e8; + + +} .btn:focus { outline: none !important; -webkit-box-shadow: none; @@ -688,6 +694,13 @@ hr.rounded { width: 30%; align-items: center; } +.center3 { + display: block; + margin-left: auto; + margin-right: auto; + width: 80%; + align-items: center; +} /* .main{ width: 100%; diff --git a/documents.html b/documents.html index 8b11ba28b5b2d201bc598a10452f828d112da256..588dd28024f02187bb69c7d40c7d51e156bd10e1 100644 --- a/documents.html +++ b/documents.html @@ -83,11 +83,11 @@ </div> </div> - <div class="col-md-4 align-self-center text-center text-md-left" style="padding: 15px 5px"> - <a href="documents/requirementspecification.pdf" class="btn btn-main btn-main-sm" style="width: 100%;">Requirement Specification</a> + <div class="col-md-4 doc" style="padding: 15px 5px ; "> + <a href="documents/requirementspecification.pdf" class="btn" style="width: 100%;">Requirement Specification</a> </div> - <div class="col-md-4 align-self-center text-center text-md-left" style="padding: 15px 5px"> + <div class="col-md-4 doc" style="padding: 15px 5px"> <a href="documents/designspecification.pdf" class="btn btn-main btn-main-sm" style="width: 100%;">Design Specification</a> </div> @@ -109,7 +109,13 @@ </div> </div> -</section> + + <div class="col-md-12 "> + <div class="img-box1" style = "align-items: center"> + <img src="Documents/poster.pdf" alt="" class="center" style="max-width: 500px;"> + </div> + </div> + diff --git a/images/Amina2.png b/images/Amina2.png index 58fa120172b31a4fb6a17bd09bfdb7011bb55289..b57d6ad6a2c07712c1009779ae55e5a9e607484d 100644 Binary files a/images/Amina2.png and b/images/Amina2.png differ diff --git a/images/Christoffer2.png b/images/Christoffer2.png index ecbbbcee7cf9a95f502d5f94536a0c14ecc30aaf..fe5c0dee06c14a2e404061bd98cdf33150db6eb5 100644 Binary files a/images/Christoffer2.png and b/images/Christoffer2.png differ diff --git a/images/Eric2.png b/images/Eric2.png new file mode 100644 index 0000000000000000000000000000000000000000..b4b507f0c12393c115856f17bfaa642360a0bb7f Binary files /dev/null and b/images/Eric2.png differ diff --git a/images/Karl2.png b/images/Karl2.png new file mode 100644 index 0000000000000000000000000000000000000000..d34b401bc72a14a37723d539937c34609d80e5c5 Binary files /dev/null and b/images/Karl2.png differ diff --git a/images/Robert2.png b/images/Robert2.png index e22a8db3fe9b4da8cf529078df587441f1a5ff63..be97072c539d100de5f5249513cfa4b3b147588f 100644 Binary files a/images/Robert2.png and b/images/Robert2.png differ diff --git a/images/motioncapture.png b/images/motioncapture.png new file mode 100644 index 0000000000000000000000000000000000000000..b53ebda4cf3369ce3fe575e804a9b7c0a0b58fef Binary files /dev/null and b/images/motioncapture.png differ diff --git a/index.html b/index.html index abdf4f00cea43521935331e65a3f3503dd2cf626..a45ca7ed1f4f27f1a2619be1e6d0d682af07ec64 100644 --- a/index.html +++ b/index.html @@ -248,7 +248,7 @@ <div class="col-md-6 "> <div class="img-box"> - <img src="images/gif.gif" alt=""> + <img src="images/motioncapture.png" alt=""> </div> </div> <div class="col-md-6"> @@ -343,7 +343,7 @@ <img src="images/Victor2.png"> </div> <div class="caption"> - <h3>Viktor Ryman</h3> + <h3>Victor Ryman</h3> <p>Project Leader</p> <div class="social-links"> <a href="#"><i class="fab fa-linkedin"></i></a> @@ -359,11 +359,11 @@ <div class="col-md-4"> <div class="profile-card"> <div class="img"> - <img src="images/Victor2.png"> + <img src="images/Eric2.png"> </div> <div class="caption"> - <h3>Karl Persson</h3> - <p>Front End Developer</p> + <h3>Eric Lundell</h3> + <p>Testing</p> <div class="social-links"> <a href="#"><i class="fab fa-linkedin"></i></a> </div> @@ -378,7 +378,7 @@ </div> <div class="caption"> <h3>Robert Carsk</h3> - <p>Front End Developer</p> + <p>Simulation</p> <div class="social-links"> <a href="#"><i class="fab fa-linkedin"></i></a> </div> @@ -393,7 +393,7 @@ </div> <div class="caption"> <h3>Amina Coric</h3> - <p>Front End Developer</p> + <p>Design</p> <div class="social-links"> <a href="#"><i class="fab fa-linkedin"></i></a> </div> @@ -401,16 +401,16 @@ </div> </div> </div> - <div class="row" style="padding: 50px 0px 0px 0px;"> + <div class="row" style="padding: 50px 0px 50px 0px;"> <div class="col-md-4"> <div class="profile-card"> <div class="img"> - <img src="images/Victor2.png"> + <img src="images/Karl2.png"> </div> <div class="caption"> <h3>Karl Persson</h3> - <p>Front End Developer</p> + <p>Hardware</p> <div class="social-links"> <a href="#"><i class="fab fa-linkedin"></i></a> </div> @@ -421,11 +421,11 @@ <div class="col-md-4"> <div class="profile-card"> <div class="img"> - <img src="images/Robert2.png"> + <img src="images/Christoffer2.png"> </div> <div class="caption"> - <h3>Robert Carsk</h3> - <p>Front End Developer</p> + <h3>Christoffer Johannesson</h3> + <p>Software</p> <div class="social-links"> <a href="#"><i class="fab fa-linkedin"></i></a> </div> @@ -436,11 +436,11 @@ <div class="col-md-4"> <div class="profile-card"> <div class="img"> - <img src="images/Amina2.png"> + <img src="images/Daniel2.png"> </div> <div class="caption"> - <h3>Amina Coric</h3> - <p>Front End Developer</p> + <h3>Daniel Thomas</h3> + <p>Documentation</p> <div class="social-links"> <a href="#"><i class="fab fa-linkedin"></i></a> </div>