Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fixes-1
  • Loading branch information
@cyr15103
cyr15103 committed Dec 7, 2017
1 parent e91b67e commit 09ee871
Show file tree
Hide file tree
Showing 18 changed files with 217 additions and 48 deletions.
Binary file added Resume-Draft.pdf
View file
Binary file not shown.
Binary file added final proj/Resume.pdf
View file
Binary file not shown.
62 changes: 62 additions & 0 deletions final proj/_carousel.scss
View file
@@ -0,0 +1,62 @@
$offwhite:#e3e3e3;
$bluegrey:#9c9aa9;
$aqua:#5ec8c2;
$cranberry:#622c35;
$x-small: 768px;
$small: 769px;
$small-max: 992px;
$medium: 993px;
$medium-max: 1225px;
$large: 1226px;

#design-content {
margin-bottom:75px;
h2{
margin-top:75px;
}

p {
margin-bottom:50px;
}
}

.carousel-caption {
background-color:#27262f;
margin-bottom:-50px;
@media screen and (min-width: $medium) and (max-width: $medium-max) {
margin-bottom:-70px;
}
@media screen and (min-width: $small) and (max-width: $small-max) {
margin-bottom:-80px;
}
@media screen and (max-width: $x-small) {
margin-bottom:-40px;
}
h3 {
color:$offwhite;
padding:5px 0px 5px 0px;
@media screen and (min-width: $medium) and (max-width: $medium-max) {
padding:0px;
}
@media screen and (min-width: $small) and (max-width: $small-max) {
font-size:20px;
margin-top:-20px
}
@media screen and (max-width: $x-small) {
font-size:16px;
margin-top:-25px
}
}
p {
color:$bluegrey;
margin-top:-10px;
@media screen and (min-width: $small) and (max-width: $small-max) {
font-size:16px;
margin-top:-20px
}
@media screen and (max-width: $x-small) {
display:none
}
}
}

1 change: 1 addition & 0 deletions final proj/about-me.html
View file
Expand Up @@ -26,6 +26,7 @@
<h2>Cynthia Reinert</h2>
<h3>Designer and Artist</h3>
<p>I am a student artist and designer currectly attending UCONN Storrs studying Digital Media and Design with a concentration in Web Design. I also have background in the basics of 2D Animation and Art.As far as programs, I can use Adobe Photoshop, After Effects and Premiere, as well as the basics such as Microsoft word and Powerpoint. I have a passion for all things design, and possess a unique drive to create.</p>
<p>Download my resume <a href="Resume.pdf">here</a>.</p>
</div>
</div>
</div>
Expand Down
5 changes: 3 additions & 2 deletions final proj/art.html
View file
Expand Up @@ -19,6 +19,7 @@
<li class="col-lg-2 col-md-2 col-sm-3 col-xs-4" align="center"><a href="portfolio.html">Portfolio</a></li>
</ul>
</nav>

<div class="container">
<div id="art-content" >
<h2 align="center">Art</h2>
Expand All @@ -32,8 +33,8 @@
<img src="images/art-7.png" class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
</div>
<div class="row">
<img src="images/art-4.jpg" class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<img src="images/art-5.jpg" class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<img src="images/art-4.jpg" id="space-fix-3" class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<img src="images/art-5.jpg" id="space-fix-4" class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
</div>
</div>
</div>
Expand Down
82 changes: 46 additions & 36 deletions final proj/design.html
View file
Expand Up @@ -23,44 +23,53 @@
<div id="design-content" >
<h2 align="center">Design</h2>
<p align="center">Here are a few of the websites I've designed and coded.</p>
<div id="carousel-example-generic" class="carousel slide" data-ride="carousel">
<!-- Indicators -->
<ol class="carousel-indicators">
<li data-target="#carousel-example-generic" data-slide-to="0" class="active"></li>
<li data-target="#carousel-example-generic" data-slide-to="1"></li>
<li data-target="#carousel-example-generic" data-slide-to="2"></li>
</ol>
<div id="carousel-example-generic" class="carousel slide" data-ride="carousel">
<!-- Indicators -->
<!--
<ol class="carousel-indicators">
<li data-target="#carousel-example-generic" data-slide-to="0" class="active"></li>
<li data-target="#carousel-example-generic" data-slide-to="1"></li>
<li data-target="#carousel-example-generic" data-slide-to="2"></li>
</ol>-->

<!-- Wrapper for slides -->
<div class="carousel-inner" role="listbox">
<div class="item active">
<img src="..." alt="...">
<div class="carousel-caption">
<h3>http://insidethreatconsulting.com/</h3>
<p>Simplistic Informational Website done for Inside Threat Training and Consulting</p>
</div>
</div>
<div class="item">
<img src="..." alt="...">
<div class="carousel-caption">
...
</div>
</div>
...
</div>
<!-- Wrapper for slides -->
<div class="carousel-inner" role="listbox">
<div class="item active">
<img src="images/web-1-2.png" alt="slide-1">
<div class="carousel-caption">
<h3>insidethreatconsulting.com</h3>
<p>Informational site for Inside Threat Training & Consulting</p>
</div>
</div>
<div class="item">
<img src="images/web-2.png" alt="slide-2">
<div class="carousel-caption">
<h3>Landing Page Project</h3>
<p>Class Project: Practice Using Sass</p>
</div>
</div>
<div class="item">
<img src="images/web-3.png" alt="slide-3">
<div class="carousel-caption">
<h3>Owltastic Recreation</h3>
<p>Class Project: Practice Using Bootstrap</p>
</div>
</div>
</div>

<!-- Controls -->
<a class="left carousel-control" href="#carousel-example-generic" 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="#carousel-example-generic" role="button" data-slide="next">
<span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
<span class="sr-only">Next</span>
</a>
<!-- Controls -->
<a class="left carousel-control" href="#carousel-example-generic" 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="#carousel-example-generic" role="button" data-slide="next">
<span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
<span class="sr-only">Next</span>
</a>
</div>
</div>
</div>
</div>
</div>
</div>


<footer class="row">
Expand All @@ -78,6 +87,7 @@
</div>
</footer>

<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
<script src="https://code.jquery.com/jquery-1.12.0.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
</body>
</html>
Binary file removed final proj/images/animation-pic.jpg
View file
Binary file not shown.
Binary file removed final proj/images/insidethreatconsulting.com_ (1).png
View file
Binary file not shown.
Binary file removed final proj/images/insidethreatconsulting.com_ (2).png
View file
Binary file not shown.
Binary file removed final proj/images/insidethreatconsulting.com_ (3).png
View file
Binary file not shown.
Binary file removed final proj/images/insidethreatconsulting.com_.png
View file
Binary file not shown.
Binary file removed final proj/images/sunset-mobile.png
View file
Binary file not shown.
Binary file added final proj/images/web-1-2.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added final proj/images/web-2.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added final proj/images/web-3.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
76 changes: 70 additions & 6 deletions final proj/main.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions final proj/main.css.map
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 33 additions & 2 deletions final proj/main.scss
View file
@@ -1,6 +1,7 @@
@import 'nav';
@import 'footer';
@import 'portfolio';
@import 'carousel';
$x-small: 768px;
$small: 769px;
$small-max: 992px;
Expand All @@ -23,6 +24,12 @@ body {

#about-content {
padding:50px 0px 50px 50px;
a {
color:$bluegrey;
}
a:hover{
color:saturate(lighten($cranberry, 30%),5%);
}
}

#sunset {
Expand Down Expand Up @@ -111,13 +118,37 @@ iframe {
}

#art-content {
margin: 75px 0px 75px 0px;

img {
border-radius:40px;
}
img:hover {
opacity:.5;
}
@media screen and (min-width: $medium) {
margin: 75px 0px 100px 0px;
#space-fix {
margin: 50px 0px 0px 0px;
}
#space-fix-2 {
margin: 65px 0px 0px 0px;
}
#space-fix-3 {
margin: -10px 0px 0px 0px;
}
#space-fix-4 {
margin: 65px 0px 0px 0px;
}
}
@media screen and (max-width: $small-max) {
margin: 75px 0px 50px 0px;
img {
margin-bottom:50px;
}
}
p {
margin-bottom:75px;
}

}


0 comments on commit 09ee871

Please sign in to comment.