Skip to content

Commit

Permalink
Finished Tiles
Browse files Browse the repository at this point in the history
Time 3.5 hrs
  • Loading branch information
Raskatan authored Jan 16, 2017
1 parent 0b7d194 commit 6023387
Show file tree
Hide file tree
Showing 14 changed files with 184 additions and 6 deletions.
52 changes: 51 additions & 1 deletion css/style.css

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

2 changes: 1 addition & 1 deletion css/style.css.map

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

Binary file added images/reduced/photo01.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/reduced/photo02.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/reduced/photo03.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/reduced/photo04.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/reduced/photo05.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/reduced/photo06.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/reduced/photo07.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/reduced/photo08.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/reduced/photo09.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/reduced/photo10.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
64 changes: 63 additions & 1 deletion sass/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,21 @@ $blue: #015F83;
$red: #DF4664;
$green: #6BA439;

.blue{
h4.blue{
color: $blue;
}

h3.blue{
border-color: $blue;
}

h3.red{
border-color: $red;
}

h3.green{
border-color: $green;
}

*{
margin: 0;
Expand All @@ -30,6 +42,12 @@ h2{
line-height: 100%;
}

h3{
font-size: 18px;
margin-bottom: 10px;
line-height: 100%;
}

h4{
font-size: 18px;
margin-bottom: 10px;
Expand Down Expand Up @@ -115,6 +133,50 @@ article{
font-weight: bold;
}
}
}
}

.tiles{
h3{
display: block;
border-bottom-width: 2px;
border-bottom-style: solid;
padding-bottom: 10px;
margin-bottom: 36px;
font-weight: bold;
}
.row{
display: flex;
flex-direction: row;
flex-wrap: no-wrap;
justify-content: space-between;
align-items: flex-start;
align-content: stretch;
margin-bottom: 90px;
@media screen and (max-width: 600px){
flex-direction: column;
}
article{
width: 30%;
margin-right: 5%;
&:last-child{
margin-right: 0;
}
@media screen and (max-width: 600px){
width: 100%;
margin: 0;
}
img{
width: 100%;
height: calc(width*1.6);
margin-bottom: 10px;
}
h3{
border: none;
margin-bottom: 10px;
padding: 0;
}
}
}
}

Expand Down
72 changes: 69 additions & 3 deletions tiles.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,76 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
link rel="stylesheet" type="text/css" href="css/style.css">
<title>Adam Christensen's Tile Test</title>
<link rel="stylesheet" type="text/css" href="css/style.css">
<title>Adam Christensen's Tiles Test</title>
</head>
<body>
<arti
<article class="tiles">
<header>
</header>
<h3 class="red">In your area</h3>
<div class="row">
<article>
<img src="images/reduced/photo03.jpg">
<h3>Cras mattis consectetur</h3>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec posuere est ex, ac commodo massa facilisis sed. Vivamus non nulla at nulla consequat pulvinar ac quis ante.</p>
<p>Maecenas mollis laoreet </p>
</article>
<article>
<img src="images/reduced/photo02.jpg">
<h3>Cras mattis consectetur</h3>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec posuere est ex, ac commodo massa facilisis sed. Vivamus non nulla at nulla consequat pulvinar ac quis ante.</p>
<p>Maecenas mollis laoreet </p>
</article>
<article>
<img src="images/reduced/photo04.jpg">
<h3>Cras mattis consectetur</h3>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec posuere est ex, ac commodo massa facilisis sed. Vivamus non nulla at nulla consequat pulvinar ac quis ante.</p>
<p>Maecenas mollis laoreet </p>
</article>
</div>
<h3 class="blue">News</h3>
<div class="row">
<article>
<img src="images/reduced/photo05.jpg">
<h3>Cras mattis consectetur</h3>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec posuere est ex, ac commodo massa facilisis sed. Vivamus non nulla at nulla consequat pulvinar ac quis ante.</p>
<p>Maecenas mollis laoreet </p>
</article>
<article>
<img src="images/reduced/photo06.jpg">
<h3>Cras mattis consectetur</h3>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec posuere est ex, ac commodo massa facilisis sed. Vivamus non nulla at nulla consequat pulvinar ac quis ante.</p>
<p>Maecenas mollis laoreet </p>
</article>
<article>
<img src="images/reduced/photo07.jpg">
<h3>Cras mattis consectetur</h3>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec posuere est ex, ac commodo massa facilisis sed. Vivamus non nulla at nulla consequat pulvinar ac quis ante.</p>
<p>Maecenas mollis laoreet </p>
</article>
</div>
<h3 class="green">Inspirational</h3>
<div class="row">
<article>
<img src="images/reduced/photo09.jpg">
<h3>Cras mattis consectetur</h3>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec posuere est ex, ac commodo massa facilisis sed. Vivamus non nulla at nulla consequat pulvinar ac quis ante.</p>
<p>Maecenas mollis laoreet </p>
</article>
<article>
<img src="images/reduced/photo08.jpg">
<h3>Cras mattis consectetur</h3>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec posuere est ex, ac commodo massa facilisis sed. Vivamus non nulla at nulla consequat pulvinar ac quis ante.</p>
<p>Maecenas mollis laoreet </p>
</article>
<article>
<img src="images/reduced/photo10.jpg">
<h3>Cras mattis consectetur</h3>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec posuere est ex, ac commodo massa facilisis sed. Vivamus non nulla at nulla consequat pulvinar ac quis ante.</p>
<p>Maecenas mollis laoreet </p>
</article>
</div>
</article>
</body>
</html>

0 comments on commit 6023387

Please sign in to comment.