Skip to content

Feature #27

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
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Feature #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
395c931
step 5 done
mattreyes7 Aug 19, 2017
d2a60d9
step 5 done
mattreyes7 Aug 19, 2017
c7e84b0
added carousel
mattreyes7 Aug 20, 2017
49070a7
complete marketing columns
mattreyes7 Aug 21, 2017
0670eaf
complete footer
mattreyes7 Aug 21, 2017
740679b
pushing to correct branch
mattreyes7 Aug 21, 2017
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
126 changes: 100 additions & 26 deletions src/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,43 +8,117 @@
<title>HTML Portfolio</title>
</head>
<body>
<nav class="navbar navbar-default">
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#portfolio-collapse-menu">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#">Matt Reyes Design</a>
</div>

<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="portfolio-collapse-menu">
<ul class="nav navbar-nav">
<li><a href="#">Home</a></li>
<li><a href="#">About</a></li>
</ul>
</div>
<!-- /.navbar-collapse -->
</div>
<!-- /.container-fluid -->
</nav>
<!--
Previous project placeholder begins
-->
<div class="header">
<h1>Morgan McCircuit</h1>
<h2>I write code</h2>
</div>

<div class="tagline">
<h3>Who I am</h3>
<p>Hi, my name is Morgan and I love to write code that is efficient.</p>
Previous project placeholder begins
-->
<div id="portfolio-carousel" class="carousel slide" data-ride="carousel">
<!-- Indicators -->
<ol class="carousel-indicators">
<li data-target="#portfolio-carousel" data-slide-to="0" class="active"></li>
<li data-target="#portfolio-carousel" data-slide-to="1"></li>
<li data-target="#portfolio-carousel" data-slide-to="2"></li>
</ol>
<!-- start of carousel -->
<div class="carousel-inner" role="listbox">
<div class="item active">
<div class="container">
<div class="carousel-caption">
<h1>Who I am</h1>
<p>A Graphic Designer with Front-end experience.</p>
</div>
</div>
</div>
<div class="item">
<div class="container">
<div class="carousel-caption">
<h1>What I do</h1>
<p>As a graphic designer, I am proficent in Photoshop and Illustrator. The programming languages I use are HTML, CSS, JavaScript and jquery.
</p>
</div>
</div>
</div>
<div class="item">
<div class="container">
<div class="carousel-caption">
<h1>My other interests</h1>
<p>Baseball, Basketball, Football, video games, improving on my web design through videos and online courses.</p>
</div>
</div>
</div>
</div>
<!-- end of carousel -->

<a class="left carousel-control" href="#portfolio-carousel" role="button" data-slide="prev">
<span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
<span class="sr-only">Previous</span>
</a>
<a class="right carousel-control" href="#portfolio-carousel" role="button" data-slide="next">
<span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
<span class="sr-only">Next</span>
</a>
</div>

<div class="skills">
<h3>What I do</h3>
<p>Here are some of the languages I use on a day-to-day.</p>
<ul>
<li>HTML</li>
<li>CSS</li>
<li>JavaScript</li>
</ul>
<div class="marketing">
<div class="container">
<div class="row">
<div class="col-md-4">
<span class="glyphicon glyphicon-fire"></span>
<h2>Photoshop & Illustrator</h2>
<p>I enjoy creating simple designs that leave an impression.</p>
</div>
<div class="col-md-4">
<span class="glyphicon glyphicon-modal-window"></span>
<h2>HTML & CSS</h2>
<p>I enjoy integrating my graphic design skills with web development. </p>
</div>
<div class="col-md-4">
<span class="glyphicon glyphicon-sunglasses"></span>
<h2>JavaScript & jquery</h2>
<p>These languages bring my projects to life.</p>
</div>
</div>
</div>
</div>

<div class="contact">
<div class="footer">
<div class="container">
<h3>Get in touch</h3>
<p>I live in the cloud and can't be seen. Send messages to the good people at <a target="_blank" href="https://twitter.com/codeschool">Code School</a> and they'll notify me.</p>
<p>mattreyes615@gmail.com</p>
</div>
<!--
Previous project placeholder ends
(unused pieces will be deleted at the last task)
-->
</div>

<!--
Previous project placeholder ends
(unused pieces will be deleted at the last task)
-->


<script src="https://code.jquery.com/jquery-3.1.0.min.js" integrity="sha256-cCueBR6CsyA4/9szpPfrX3s49M9vUU5BgtiJj06wt/s=" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
<script src="https://code.jquery.com/jquery-3.1.0.min.js" integrity="sha256-cCueBR6CsyA4/9szpPfrX3s49M9vUU5BgtiJj06wt/s=" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>

</body>
</html>
4 changes: 2 additions & 2 deletions src/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@ footer {
bottom: 0;
width: 100%;
/* Set the fixed height of the footer here */
height: 160px;
height: 100px;
background: #444;
color: white;
text-shadow: 1px 1px 1px black;
padding: 40px 0;
/*padding: 40px 0;*/
}

/* RESPONSIVE CSS
Expand Down