Skip to content
This repository has been archived by the owner on Dec 21, 2022. It is now read-only.

Commit

Permalink
add real projects
Browse files Browse the repository at this point in the history
  • Loading branch information
vinilzen committed Jun 2, 2016
1 parent 03964eb commit 3c5e485
Show file tree
Hide file tree
Showing 14 changed files with 246 additions and 523 deletions.
29 changes: 27 additions & 2 deletions css/newcult.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/newcult.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion css/newcult.min.css

Large diffs are not rendered by default.

Binary file modified img/_tomesto.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 modified img/_zakazaka.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
407 changes: 1 addition & 406 deletions index.html

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion index.min.html

This file was deleted.

138 changes: 71 additions & 67 deletions jade/index.jade

Large diffs are not rendered by default.

12 changes: 8 additions & 4 deletions js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ $(document).ready(function() {
}
}

setInterval(updateGradient,10);
var refreshIntervalId = setInterval(updateGradient,10);


var sw = $('.site-wrapper'),
Expand Down Expand Up @@ -162,7 +162,7 @@ $(document).ready(function() {
}
});

$('.masthead-nav a[href^="#"]').click(function(e) {
$('.masthead-nav a[href^="#"], a.more-service[href^="#"]').click(function(e) {

var $el = $(this),
target = $el.attr('href');
Expand Down Expand Up @@ -288,21 +288,24 @@ $(document).ready(function() {

function hoverIn () {
$(this).addClass('item-hover');

if ( $(window).width() > 1023 && project_active ) {

clearTimeout(timer);

var img = $(this).attr('data-img');

if (img){

clearInterval(refreshIntervalId);

$('body').addClass('fadeout');

$('.title-slide.active').addClass('transparent');

timer2 = setTimeout(function(){
$('body').attr('class','');
$('.after').css({'background-image': 'url(img/_'+img+'.jpg'});
$('.after').css('background-image',"url('img/_"+img+".jpg')");
$('body').addClass('body-project-universal');
$('.cover-dark').css({'background': 'none'})
}, 200);
Expand All @@ -325,6 +328,7 @@ $(document).ready(function() {
$('body').attr('class','');
$('.after').css({'background-image': 'none'});
$('.cover-dark').css({'background-color': '#191919'});
refreshIntervalId = setInterval(updateGradient,10);
}, 200);
}
}
Expand Down
2 changes: 1 addition & 1 deletion js/main.min.js

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

156 changes: 117 additions & 39 deletions prepros.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -287,19 +287,6 @@
],
"type": "sass"
},
"bb3b1b39": {
"id": "bb3b1b39",
"path": "img/_tomesto.jpg",
"output": "img/_tomesto.jpg",
"name": "_tomesto.jpg",
"category": "IMAGE",
"size": 174410,
"type": "jpg",
"initialSize": 174410,
"optimized": false,
"height": 1440,
"width": 1920
},
"2dd81534": {
"id": "2dd81534",
"path": "img/_velogorod.jpg",
Expand All @@ -313,19 +300,6 @@
"height": 1338,
"width": 1920
},
"55225d24": {
"id": "55225d24",
"path": "img/_zakazaka.jpg",
"output": "img/_zakazaka.jpg",
"name": "_zakazaka.jpg",
"category": "IMAGE",
"size": 70880,
"type": "jpg",
"initialSize": 70880,
"optimized": false,
"height": 1280,
"width": 1920
},
"862dbb9c": {
"id": "862dbb9c",
"path": "img/logo_1.png",
Expand Down Expand Up @@ -465,7 +439,7 @@
"0d1f4deb": {
"id": "0d1f4deb",
"path": "jade/index.jade",
"output": "index.min.html",
"output": "index.html",
"name": "index.jade",
"category": "HTML",
"autoCompile": true,
Expand All @@ -475,31 +449,135 @@
"parents": [],
"type": "jade"
},
"40c9d5a0": {
"id": "40c9d5a0",
"path": "index.min.html",
"output": "index.min.html",
"name": "index.min.html",
"category": "JUST_WATCH",
"customOutput": false,
"imported": false,
"parents": [],
"type": "html"
},
"2e8f9ea2": {
"id": "2e8f9ea2",
"path": "README.md",
"output": "README.html",
"name": "README.md",
"category": "HTML",
"autoCompile": true,
"autoCompile": false,
"sanitize": false,
"gfm": true,
"wrapWithHtml": false,
"customOutput": false,
"imported": false,
"parents": [],
"type": "markdown"
},
"3ed1bf95": {
"id": "3ed1bf95",
"path": "img/_docturu.jpg",
"output": "img/_docturu.jpg",
"name": "_docturu.jpg",
"category": "IMAGE",
"size": 437108,
"type": "jpg",
"initialSize": 437108,
"optimized": false,
"height": 0,
"width": 0
},
"b99b151c": {
"id": "b99b151c",
"path": "img/_tm.jpg",
"output": "img/_tm.jpg",
"name": "_tm.jpg",
"category": "IMAGE",
"size": 758183,
"type": "jpg",
"initialSize": 758183,
"optimized": false,
"height": 0,
"width": 0
},
"a3f700bb": {
"id": "a3f700bb",
"path": "img/_tomesto_old.jpg",
"output": "img/_tomesto_old.jpg",
"name": "_tomesto_old.jpg",
"category": "IMAGE",
"size": 174410,
"type": "jpg",
"initialSize": 174410,
"optimized": false,
"height": 0,
"width": 0
},
"bb3b1b39": {
"id": "bb3b1b39",
"path": "img/_tomesto.jpg",
"output": "img/_tomesto.jpg",
"name": "_tomesto.jpg",
"category": "IMAGE",
"size": 716187,
"type": "jpg",
"initialSize": 716187,
"optimized": false,
"height": 0,
"width": 0
},
"86e463f0": {
"id": "86e463f0",
"path": "img/_zakazaka_old.jpg",
"output": "img/_zakazaka_old.jpg",
"name": "_zakazaka_old.jpg",
"category": "IMAGE",
"size": 70880,
"type": "jpg",
"initialSize": 70880,
"optimized": false,
"height": 0,
"width": 0
},
"55225d24": {
"id": "55225d24",
"path": "img/_zakazaka.jpg",
"output": "img/_zakazaka.jpg",
"name": "_zakazaka.jpg",
"category": "IMAGE",
"size": 432804,
"type": "jpg",
"initialSize": 432804,
"optimized": false,
"height": 0,
"width": 0
},
"f26cfbb5": {
"id": "f26cfbb5",
"path": "img/_suzuki.jpg",
"output": "img/_suzuki.jpg",
"name": "_suzuki.jpg",
"category": "IMAGE",
"size": 619990,
"type": "jpg",
"initialSize": 619990,
"optimized": false,
"height": 0,
"width": 0
},
"9c31b940": {
"id": "9c31b940",
"path": "img/_tvil.jpg",
"output": "img/_tvil.jpg",
"name": "_tvil.jpg",
"category": "IMAGE",
"size": 897951,
"type": "jpg",
"initialSize": 897951,
"optimized": false,
"height": 0,
"width": 0
},
"4938ce1c": {
"id": "4938ce1c",
"path": "mail.php",
"output": "mail.php",
"name": "mail.php",
"category": "JUST_WATCH",
"customOutput": false,
"imported": false,
"parents": [],
"type": "php"
}
},
"deploymentHistory": {},
Expand Down
6 changes: 6 additions & 0 deletions scss/contact.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
a:focus {outline:none;}
::-moz-focus-inner {border:0;}
.tel {
font-weight: bold;
font-family: $Proxima_Nova;
Expand Down Expand Up @@ -58,6 +60,10 @@
}
&.btn-default {

&:any-link {
color: #333;
}

border: 1px solid transparent;
&:hover {
border: 1px solid #fff;
Expand Down
8 changes: 7 additions & 1 deletion scss/project.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,20 @@
.item-project {
padding: 20px 10px 3.4rem 6vw;
cursor: pointer;
h3 {

&.item-project-also {
cursor: default;
}

h3, h3 a {
font-family: $Proxima_Nova;
line-height: 1em;
color: rgba(255,255,255,.25);
margin-top: 2.7rem;
margin-bottom: -0.4rem;
transition: color 0.3s ease;
font-size: 114px;
text-decoration: none;
@media (max-width: 1000px) {
font-size: 7.6rem;
}
Expand Down
6 changes: 6 additions & 0 deletions scss/typo.scss
Original file line number Diff line number Diff line change
Expand Up @@ -258,4 +258,10 @@ width: 56.693px;
fill: #fff;
}
}
}
.nowrap {
white-space: nowrap;
}
.btn-link:any-link {
color: #333;
}

0 comments on commit 3c5e485

Please sign in to comment.