Skip to content

Commit

Permalink
finished all versions
Browse files Browse the repository at this point in the history
  • Loading branch information
Timofey Jedi authored and Timofey Jedi committed Apr 5, 2016
1 parent 67d7cf5 commit b9315a2
Show file tree
Hide file tree
Showing 8 changed files with 278 additions and 178 deletions.
2 changes: 1 addition & 1 deletion Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ module.exports = function(grunt){
},
files: {
'index.html': 'views/pages/index.jade',
'views/pages/alfa-romeo.html':'views/pages/alfa-romeo.jade'
'alfa-romeo.html':'views/pages/alfa-romeo.jade'
}
}
}
Expand Down
8 changes: 7 additions & 1 deletion views/pages/alfa-romeo.html → alfa-romeo.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,13 @@ <h3>Alfa Romeo MiTo</h3>
</figure>
</div>
</main>
<footer>&copy; Автохаб 2016</footer>
<footer>
<div class="content"><span class="copy">

&copy; Автохаб 2016</span><a href="#">Правовое соглашение</a><a href="#">Техническая поддержка</a>
<p>Сделано в <span class="madein">Студии Вадима Скротского</span></p>
</div>
</footer>
<script src="/autohub/public/scripts/jquery-2.2.0.min.js"></script>
</body>
</html>
159 changes: 82 additions & 77 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<link rel="stylesheet" href="/autohub/public/css/main.css">
</head>
<body>
<header><a href="#" class="logo"></a><span class="total">Найдено 5658 предложений</span>
<header><a href="/" class="logo"></a><span class="total">Найдено 5658 предложений</span>
<nav class="nav"><a href="#">Разместить предложение</a></nav>
<nav class="mobile-nav">
<button class="add-logo"></button>
Expand Down Expand Up @@ -42,16 +42,16 @@
</menu>
</aside>
<main>
<div class="content">
<figure>
<div class="car"><img src="/autohub/public/img/img_1.png" alt="img1">
<p class="car-price">39 500$</p>
</div>
<figcaption>
<p class="car-name">Mercedez</p>
<p class="car-info"><span>2015</span><span>47 000 kм</span><span>Бензин 3.5</span><span>А</span></p>
</figcaption>
</figure><a href="/autohub/views/pages/alfa-romeo.html">
<div class="content"><a href="#">
<figure>
<div class="car"><img src="/autohub/public/img/img_1.png" alt="img1">
<p class="car-price">39 500$</p>
</div>
<figcaption>
<p class="car-name">Mercedez</p>
<p class="car-info"><span>2015</span><span>47 000 kм</span><span>Бензин 3.5</span><span>А</span></p>
</figcaption>
</figure></a><a href="/alfa-romeo.html">
<figure>
<div class="car"><img src="/autohub/public/img/img_2.png" alt="img1">
<p class="car-price">2500$</p>
Expand All @@ -60,71 +60,70 @@
<p class="car-name">Mercedez</p>
<p class="car-info"><span>2015</span><span>47 000 kм</span><span>Бензин 3.5</span><span>А</span></p>
</figcaption>
</figure></a>
<figure>
<div class="car"><img src="/autohub/public/img/img_3.png" alt="img1">
<p class="car-price">2500$</p>
</div>
<figcaption>
<p class="car-name">Mercedez</p>
<p class="car-info"><span>2015</span><span>47 000 kм</span><span>Бензин 3.5</span><span>А</span></p>
</figcaption>
</figure>
<figure>
<div class="car"><img src="/autohub/public/img/img_4.png" alt="img1">
<p class="car-price">2500$</p>
</div>
<figcaption>
<p class="car-name">Mercedez</p>
<p class="car-info"><span>2015</span><span>47 000 kм</span><span>Бензин 3.5</span><span>А</span></p>
</figcaption>
</figure>
<figure>
<div class="car"><img src="/autohub/public/img/img_5.png" alt="img1">
<p class="car-price">2500$</p>
</div>
<figcaption>
<p class="car-name">Mercedez</p>
<p class="car-info"><span>2015</span><span>47 000 kм</span><span>Бензин 3.5</span><span>А</span></p>
</figcaption>
</figure>
<figure>
<div class="car"><img src="/autohub/public/img/img_6.png" alt="img1">
<p class="car-price">2500$</p>
</div>
<figcaption>
<p class="car-name">Mercedez</p>
<p class="car-info"><span>2015</span><span>47 000 kм</span><span>Бензин 3.5</span><span>А</span></p>
</figcaption>
</figure>
<figure>
<div class="car"><img src="/autohub/public/img/img_7.png" alt="img1">
<p class="car-price">2500$</p>
</div>
<figcaption>
<p class="car-name">Mercedez</p>
<p class="car-info"><span>2015</span><span>47 000 kм</span><span>Бензин 3.5</span><span>А</span></p>
</figcaption>
</figure>
<figure>
<div class="car"><img src="/autohub/public/img/img_8.png" alt="img1">
<p class="car-price">2500$</p>
</div>
<figcaption>
<p class="car-name">Mercedez</p>
<p class="car-info"><span>2015</span><span>47 000 kм</span><span>Бензин 3.5</span><span>А</span></p>
</figcaption>
</figure>
<figure>
<div class="car"><img src="/autohub/public/img/img_9.png" alt="img1">
<p class="car-price">2500$</p>
</div>
<figcaption>
<p class="car-name">Mercedez</p>
<p class="car-info"><span>2015</span><span>47 000 kм</span><span>Бензин 3.5</span><span>А</span></p>
</figcaption>
</figure>
</div>
</figure></a><a href="#">
<figure>
<div class="car"><img src="/autohub/public/img/img_3.png" alt="img1">
<p class="car-price">2500$</p>
</div>
<figcaption>
<p class="car-name">Mercedez</p>
<p class="car-info"><span>2015</span><span>47 000 kм</span><span>Бензин 3.5</span><span>А</span></p>
</figcaption>
</figure></a><a href="#">
<figure>
<div class="car"><img src="/autohub/public/img/img_4.png" alt="img1">
<p class="car-price">2500$</p>
</div>
<figcaption>
<p class="car-name">Mercedez</p>
<p class="car-info"><span>2015</span><span>47 000 kм</span><span>Бензин 3.5</span><span>А</span></p>
</figcaption>
</figure></a><a href="#">
<figure>
<div class="car"><img src="/autohub/public/img/img_5.png" alt="img1">
<p class="car-price">2500$</p>
</div>
<figcaption>
<p class="car-name">Mercedez</p>
<p class="car-info"><span>2015</span><span>47 000 kм</span><span>Бензин 3.5</span><span>А</span></p>
</figcaption>
</figure></a><a href="#">
<figure>
<div class="car"><img src="/autohub/public/img/img_6.png" alt="img1">
<p class="car-price">2500$</p>
</div>
<figcaption>
<p class="car-name">Mercedez</p>
<p class="car-info"><span>2015</span><span>47 000 kм</span><span>Бензин 3.5</span><span>А</span></p>
</figcaption>
</figure></a><a href="#">
<figure>
<div class="car"><img src="/autohub/public/img/img_7.png" alt="img1">
<p class="car-price">2500$</p>
</div>
<figcaption>
<p class="car-name">Mercedez</p>
<p class="car-info"><span>2015</span><span>47 000 kм</span><span>Бензин 3.5</span><span>А</span></p>
</figcaption>
</figure></a><a href="#">
<figure>
<div class="car"><img src="/autohub/public/img/img_8.png" alt="img1">
<p class="car-price">2500$</p>
</div>
<figcaption>
<p class="car-name">Mercedez</p>
<p class="car-info"><span>2015</span><span>47 000 kм</span><span>Бензин 3.5</span><span>А</span></p>
</figcaption>
</figure></a><a href="#">
<figure>
<div class="car"><img src="/autohub/public/img/img_9.png" alt="img1">
<p class="car-price">2500$</p>
</div>
<figcaption>
<p class="car-name">Mercedez</p>
<p class="car-info"><span>2015</span><span>47 000 kм</span><span>Бензин 3.5</span><span>А</span></p>
</figcaption>
</figure></a></div>
<div class="pager">
<ul>
<li class="active">1</li>
Expand All @@ -135,7 +134,13 @@
</ul>
</div>
</main>
<footer>&copy; Автохаб 2016</footer>
<footer>
<div class="content"><span class="copy">

&copy; Автохаб 2016</span><a href="#">Правовое соглашение</a><a href="#">Техническая поддержка</a>
<p>Сделано в <span class="madein">Студии Вадима Скротского</span></p>
</div>
</footer>
<script src="/autohub/public/scripts/jquery-2.2.0.min.js"></script>
<script src="/autohub/public/scripts/my_scripts.js"></script>
</body>
Expand Down
37 changes: 36 additions & 1 deletion public/css/main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ header {
background: #fff;
box-shadow: 0px 1px 5px 0px rgba(0,0,0,0.2);
}
header .total {
.total {
display: none;
}
/*=====================ИКОНКИ===================*/
Expand Down Expand Up @@ -279,6 +279,10 @@ footer {
text-align: center;
padding: 0 0 20px 0;
}
footer a,
footer p {
display: none;
}
@media screen and (min-width: 768px) {
header {
padding-left: 1.5%;
Expand All @@ -288,6 +292,13 @@ footer {
margin: 0;
margin-top: 55px;
margin-left: 20%;
margin-bottom: 40px;
}
.total {
display: inline-block;
position: relative;
left: 11%;
bottom: 15px;
}
.content {
max-width: 1200px;
Expand Down Expand Up @@ -322,11 +333,17 @@ footer {
width: 31.7%;
margin: 0.5%;
}
figure:hover {
box-shadow: 0px 3px 8px 0px rgba(0,0,0,0.5);
}
.preview {
width: 50%;
margin: 0 auto;
margin-left: 15%;
}
.preview:hover {
box-shadow: 0px 1px 5px 0px rgba(0,0,0,0.1);
}
.price-list-filter li:not(:first-child) {
padding: 7px 10px;
border: 1px solid #999;
Expand Down Expand Up @@ -385,6 +402,24 @@ footer {
.check {
display: none;
}
footer {
font-size: 13px;
text-align: left;
}
footer .madein {
color: #666;
}
footer a {
display: inline-block;
margin-right: 2%;
}
footer p {
display: inline-block;
float: right;
}
footer .copy {
margin-right: 10%;
}
}
/*===============================PREVIEW*================*/
/*
Expand Down
39 changes: 33 additions & 6 deletions public/css/main.styl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ header
top: 0
background: #fff
box-shadow: 0px 1px 5px 0px rgba(0,0,0,0.2)
.total
display: none

.total
display: none

/*=====================ИКОНКИ===================*/
.down-logo, .check, .close-logo, .phone-logo
Expand Down Expand Up @@ -233,19 +233,26 @@ hr
footer
text-align: center
padding: 0 0 20px 0

footer a, footer p
display: none


@media screen and (min-width: 768px)
header
padding-left: 1.5%
padding-right: 2%

main
margin: 0
margin-top: 55px
margin-left: 20%

margin-bottom: 40px

.total
display: inline-block
position: relative
left: 11%
bottom: 15px
.content
max-width: 1200px
width: 100%
Expand Down Expand Up @@ -278,11 +285,17 @@ footer
float: left
width: 31.7%
margin: 0.5%
&:hover
box-shadow: 0px 3px 8px 0px rgba(0, 0, 0, 0.5)


.preview
width: 50%
margin: 0 auto
margin-left: 15%
&:hover
box-shadow: 0px 1px 5px 0px rgba(0, 0, 0, 0.1)


.price-list-filter li
&:not(:first-child)
Expand Down Expand Up @@ -340,6 +353,20 @@ footer

.check
display: none

footer
font-size: 13px
text-align: left
.madein
color: #666
a
display: inline-block
margin-right: 2%
p
display: inline-block
float: right
.copy
margin-right: 10%

/*===============================PREVIEW*================*/

Expand Down
5 changes: 5 additions & 0 deletions routes.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ app.get('/', function(req, res, next){
next();
});

app.get('/alfa-romeo', function(req, res, next){
req.url = '/alfa-romeo.html';
next();
});

app.get('/*.html', function(req,res, next){
res.render('pages/' + req.params[0], {
root: '',
Expand Down
8 changes: 7 additions & 1 deletion views/pages/alfa-romeo.jade
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,13 @@ html
hr(color='#D8D8D8', size='0')
p Екатерина
footer
&copy; Автохаб 2016
.content
span.copy
|&copy; Автохаб 2016
a(href="#") Правовое соглашение
a(href="#") Техническая поддержка
p Сделано в
span.madein Студии Вадима Скротского
script(src='#{staticRoot}/scripts/jquery-2.2.0.min.js')


Expand Down
Loading

0 comments on commit b9315a2

Please sign in to comment.