Skip to content

Commit

Permalink
restructured folders and added in mobile responsive
Browse files Browse the repository at this point in the history
  • Loading branch information
dominathan committed May 23, 2016
1 parent 3d33aba commit af960c4
Show file tree
Hide file tree
Showing 13 changed files with 203 additions and 18 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
3 changes: 3 additions & 0 deletions painterest/css/_ipad.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@media (min-width: 768px) and (max-width: 1024px) {

}
61 changes: 61 additions & 0 deletions painterest/css/_mobile.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
@media (min-width: 320px) and (max-width: 767px) {
.mobile-hidden {
display: none;
}

nav h4 {
padding-top: 3%;
}

.main-container {
.my-profile {
position: absolute;
top: 75px;
left: 2px;
padding-top: 20px;
width: 98%;
margin: 0 auto;
h4 {
display: none;
}
img {
width: 92%;
max-height: 265px;
}
p {
display: none;
}
}
.favorite-people, footer {
display: none;
}
section.photos {
background-color: rgba(0,0,0,0.4);
width: 100%;
margin: 0 auto;
position: absolute;
top: 356px;
.four-photos li.mobile-hidden, .three-photos li.mobile-hidden {
display: none;
}
.four-photos li {
width: 49%;
}
.three-photos li {
width: 95%;
}

.four-photos img {
width: 56%;
padding-left: 20%;
max-height: 100px;
}

.three-photos img {
max-height: 125px;
width: 77%;
padding-left: 11%;
}
}
}
}
File renamed without changes.
File renamed without changes.
2 changes: 2 additions & 0 deletions painterest/styles.scss → painterest/css/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@
@import 'favorites';
@import 'photos';
@import 'bio';
@import 'ipad';
@import 'mobile';
37 changes: 19 additions & 18 deletions painterest/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,19 @@
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Painterest</title>
<link href="https://cdnjs.cloudflare.com/ajax/libs/normalize/4.1.1/normalize.css" rel="stylesheet">
<link href="main.css" rel="stylesheet">
<link href="styles.css" rel="stylesheet">
</head>
<body>
<header>
<nav>
<h4>PainTerest</h4>
<ul>
<li><a href="#">About</a></li>
<li><a href="#">Contact</a></li>
<li><a href="#">Placebo</a></li>
<li><a href="./index.html">Home</a></li>
<li class="mobile-hidden"><a href="./templates/about.html">About</a></li>
<li class="mobile-hidden"><a href="./templates/contact.html">Contact</a></li>
</ul>
</nav>
</header>
Expand Down Expand Up @@ -64,45 +65,45 @@ <h4>PainTerest</h4>
<ul>
<li><img src="http://placekitten.com/200/300" alt="" /></li>
<li><img src="http://placekitten.com/200/300" alt="" /></li>
<li><img src="http://placekitten.com/200/300" alt="" /></li>
<li><img src="http://placekitten.com/200/300" alt="" /></li>
<li class="mobile-hidden"><img src="http://placekitten.com/200/300" alt="" /></li>
<li class="mobile-hidden"><img src="http://placekitten.com/200/300" alt="" /></li>
</ul>
</div>
<div class="three-photos">
<ul>
<li><img src="http://lorempixel.com/400/200/animals/" alt="" /></li>
<li><img src="http://lorempixel.com/400/200/animals/" alt="" /></li>
<li><img src="http://lorempixel.com/400/200/animals/" alt="" /></li>
<li><img src="http://www.fillmurray.com/200/300" alt="" /></li>
<li class="mobile-hidden"><img src="http://www.fillmurray.com/200/300" alt="" /></li>
<li class="mobile-hidden"><img src="http://www.fillmurray.com/200/300" alt="" /></li>
</ul>
</div>
<div class="four-photos">
<ul>
<li><img src="http://placekitten.com/200/300" alt="" /></li>
<li><img src="http://placekitten.com/200/300" alt="" /></li>
<li><img src="http://placekitten.com/200/300" alt="" /></li>
<li><img src="http://placekitten.com/200/300" alt="" /></li>
<li class="mobile-hidden"><img src="http://placekitten.com/200/300" alt="" /></li>
<li class="mobile-hidden"><img src="http://placekitten.com/200/300" alt="" /></li>
</ul>
</div>
<div class="three-photos">
<ul>
<li><img src="http://lorempixel.com/400/200/animals/" alt="" /></li>
<li><img src="http://lorempixel.com/400/200/animals/" alt="" /></li>
<li><img src="http://lorempixel.com/400/200/animals/" alt="" /></li>
<li><img src="http://www.fillmurray.com/200/300" alt="" /></li>
<li class="mobile-hidden"><img src="http://www.fillmurray.com/200/300" alt="" /></li>
<li class="mobile-hidden"><img src="http://www.fillmurray.com/200/300" alt="" /></li>
</ul>
</div>
<div class="four-photos">
<ul>
<li><img src="http://placekitten.com/200/300" alt="" /></li>
<li><img src="http://placekitten.com/200/300" alt="" /></li>
<li><img src="http://placekitten.com/200/300" alt="" /></li>
<li><img src="http://placekitten.com/200/300" alt="" /></li>
<li class="mobile-hidden"><img src="http://placekitten.com/200/300" alt="" /></li>
<li class="mobile-hidden"><img src="http://placekitten.com/200/300" alt="" /></li>
</ul>
</div>
<div class="three-photos">
<ul>
<li><img src="http://lorempixel.com/400/200/animals/" alt="" /></li>
<li><img src="http://lorempixel.com/400/200/animals/" alt="" /></li>
<li><img src="http://lorempixel.com/400/200/animals/" alt="" /></li>
<li class="mobile-hidden"><img src="http://lorempixel.com/400/200/animals/" alt="" /></li>
<li class="mobile-hidden"><img src="http://lorempixel.com/400/200/animals/" alt="" /></li>
</ul>
</div>
</section>
Expand Down
42 changes: 42 additions & 0 deletions painterest/main.css → painterest/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,45 @@ header {

.my-profile p {
padding: 0 47px; }

@media (min-width: 320px) and (max-width: 767px) {
.mobile-hidden {
display: none; }
nav h4 {
padding-top: 3%; }
.main-container .my-profile {
position: absolute;
top: 75px;
left: 2px;
padding-top: 20px;
width: 98%;
margin: 0 auto; }
.main-container .my-profile h4 {
display: none; }
.main-container .my-profile img {
width: 92%;
max-height: 265px; }
.main-container .my-profile p {
display: none; }
.main-container .favorite-people, .main-container footer {
display: none; }
.main-container section.photos {
background-color: rgba(0, 0, 0, 0.4);
width: 100%;
margin: 0 auto;
position: absolute;
top: 356px; }
.main-container section.photos .four-photos li.mobile-hidden, .main-container section.photos .three-photos li.mobile-hidden {
display: none; }
.main-container section.photos .four-photos li {
width: 49%; }
.main-container section.photos .three-photos li {
width: 95%; }
.main-container section.photos .four-photos img {
width: 56%;
padding-left: 20%;
max-height: 100px; }
.main-container section.photos .three-photos img {
max-height: 125px;
width: 77%;
padding-left: 11%; } }
38 changes: 38 additions & 0 deletions painterest/templates/about.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>Painterest</title>
<link href="https://cdnjs.cloudflare.com/ajax/libs/normalize/4.1.1/normalize.css" rel="stylesheet">
<link href="../styles.css" rel="stylesheet">
</head>
<body>
<header>
<nav>
<h4>PainTerest</h4>
<ul>
<li><a href="../index.html">Home</a></li>
<li><a href="./about.html">About</a></li>
<li><a href="./contact.html">Contact</a></li>
</ul>
</nav>
</header>

<div class="container">
<h1>Cool stuff about managing pain</h1>
<p>
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
</p>
</div>


<footer>
<ul>
<li>By Ironyardians</li>
<li>Happiness</li>
<li>Feet Smell</li>
</ul>
</footer>
</body>

</html>
38 changes: 38 additions & 0 deletions painterest/templates/contact.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>Painterest</title>
<link href="https://cdnjs.cloudflare.com/ajax/libs/normalize/4.1.1/normalize.css" rel="stylesheet">
<link href="../styles.css" rel="stylesheet">
</head>
<body>
<header>
<nav>
<h4>PainTerest</h4>
<ul>
<li><a href="../index.html">Home</a></li>
<li><a href="./about.html">About</a></li>
<li><a href=".a/contact.html">Contact</a></li>
</ul>
</nav>
</header>

<div class="">
<h1>Do not contact me</h1>
<p>
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
</p>
</div>


<footer>
<ul>
<li>By Ironyardians</li>
<li>Happiness</li>
<li>Feet Smell</li>
</ul>
</footer>
</body>

</html>

0 comments on commit af960c4

Please sign in to comment.