Skip to content

Commit

Permalink
Merge pull request #32 from singhp1992/mediaq
Browse files Browse the repository at this point in the history
Mediaq
  • Loading branch information
singhp1992 authored Jul 5, 2019
2 parents 6be36ba + 7d62cb1 commit a6fa812
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 37 deletions.
2 changes: 1 addition & 1 deletion contact.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<header>
<img src="images/me.png" alt="Drawing of Jane Smith" class="profile-image">
<h1 class="tag name">Hello, I’m Preeti.</h1>
<h1 class="tag name shadow">Hello, I’m Preeti.</h1>
<p><a class="tag location" href="https://unmistakablylawrence.com/" target="_blank">Originally from: Lawrence, Kansas, USA.</a></p>
<p><a class="tag location" href="https://theculturetrip.com/europe/the-netherlands/articles/where-to-eat-stroopwafels-in-amsterdam/"
target="_blank">Currently in: Amsterdam, NL.</a>
Expand Down
3 changes: 2 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ <h1 class="tag name shadow">Hello, I’m Preeti.</h1>
<main class="flex">
<div class="card left">
<h2>About Me</h2>
<p>I’m an aspiring front-end developer based in Amsterdam. I've lived in lots of different places - England, Spain, France, USA, Netherlands - and I'm interested in many things
<p>I’m an aspiring full-stack developer based in Amsterdam. I've lived in lots of different places - England, Spain, France, USA, Netherlands - and I'm interested in many things
. I’m excited to bring my life experience to the process of building fantastic looking websites!</p>
<ul>
<li>To learn more, <a href="resume.html">view my resume.</a></li>
Expand Down Expand Up @@ -57,6 +57,7 @@ <h2>Hobbies & Interests</h2>
<!-- <li>All things falafel! - checkout my blog</li> <a href="" target="_blank">here!</a> -->
<li>Yoga</li>
<li>Learning new languages</li>
<li>Teaching English</li>
<li>Educational tech</li>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion resume.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<header>
<img src="images/me.png" alt="Drawing of Jane Smith" class="profile-image">
<h1 class="tag name">Hello, I’m Preeti.</h1>
<h1 class="tag name shadow">Hello, I’m Preeti.</h1>
<p><a class="tag location" href="https://unmistakablylawrence.com/" target="_blank">Originally from: Lawrence, Kansas, USA.</a></p>
<p><a class="tag location" href="https://theculturetrip.com/europe/the-netherlands/articles/where-to-eat-stroopwafels-in-amsterdam/"
target="_blank">Currently in: Amsterdam, NL.</a>
Expand Down
67 changes: 33 additions & 34 deletions styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ a {
}

.shadow {
text-shadow: 2px 1px #ffffff;
text-shadow: 1px 1px #ffffff;
}

/* Section Styles */
Expand Down Expand Up @@ -87,6 +87,11 @@ header .profile-image:hover {
display: table;
margin: 10px auto;
}

/* .hello {
text-shadow: 2px 2px white;
} */

.location {
background-color: #222;
color: rgb(130, 212, 130);
Expand All @@ -97,20 +102,12 @@ header .location:hover {
transition: all .5s;
}

.card {
margin: 30px;
padding: 20px 40px 40px;
max-width: 333px;
background: #fff;
border-radius: 10px;
}

.left {
text-align: left;
}

.resume {
margin: 30px;
margin: 10px auto;
padding: 20px 40px 40px;
max-width: 500px;
text-align: left;
Expand Down Expand Up @@ -159,6 +156,14 @@ ul.skills {
transition: all .5s;
}

.card {
margin: 10px auto;
padding: 20px 40px 40px;
max-width: 333px;
background: #fff;
border-radius: 10px;
}

footer {
width: 100%;
min-height: 30px;
Expand Down Expand Up @@ -212,30 +217,6 @@ a.social:hover {
line-height: 1.6;
}

/* Tool tips - not sure if I will use this quite yet*/

.tooltip {
position: relative;
display: inline-block;
}

.tooltip .tooltiptext {
visibility: hidden;
width: 120px;
background-color: black;
color: #fff;
text-align: center;
border-radius: 6px;
padding: 5px 0;
position: absolute;
z-index: 1;

}

.tooltip:hover .tooltiptext {
visibility: visible;
}

/* Mediaqueries */
@media screen and (min-width: 768px) {

Expand Down Expand Up @@ -270,3 +251,21 @@ a.social:hover {

}

@media (min-width: 770px) and (max-width: 1024px) {

.card {
margin-left: 10px;
margin-right: 10px;
}

.resume {
margin-left: 10px;
margin-right: 10px;
min-width: 375px;
}
}

@media (min-width: 1025px) {

}

0 comments on commit a6fa812

Please sign in to comment.