Skip to content

pull request #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OliviaDyke wants to merge 2 commits into
base: master
Choose a base branch
from
Open

pull request #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7609ebe
added shane.html/css/js
OliviaDyke Jun 28, 2019
86ddd97
saved control s
OliviaDyke Jun 28, 2019
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
Empty file added pages/olivia_dyke/oliviadyke.css
View file
Open in desktop
Empty file.
Empty file added pages/olivia_dyke/oliviadyke.html
View file
Open in desktop
Empty file.
Empty file added pages/olivia_dyke/oliviadyke.js
View file
Open in desktop
Empty file.
8 changes: 4 additions & 4 deletions pages/shane_morris/shane.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
crossorigin="anonymous">
<link href="../../main.css" rel="stylesheet">
<!-- ADD YOUR CUSTOM STYLESHEET BELOW -->
<link href="shane.css" rel="stylesheet">
<link href="oliviadyke.css" rel="stylesheet">
</head>

<body>
Expand All @@ -30,8 +30,8 @@
<div class="container">
<div class="row">
<div class="col-lg-12 text-center">
<h2 class="section-heading text-uppercase">Shane Morris</h2>
<img class="rounded-circle profile-img" src="shane.jpg" alt="">
<h2 class="section-heading text-uppercase">Olivia Dyke</h2>
<img class="rounded-circle profile-img" src="oliviadyke.jpg" alt="">
<h3 class="section-subheading text-muted">Intern At Ghostery</h3>
<a class="profile-icon" href ="">
<i class="fas fa-envelope"></i>
Expand Down Expand Up @@ -132,6 +132,6 @@ <h2 class="section-heading">Key Takeaways</h2>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
<script src="main.js"></script>
<!-- ADD YOUR SCRIPT BELOW -->
<script src="shane.js"></script>
<script src="oliviadyke.js"></script>
</body>
</html>