Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1 #64

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

1 #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
21861b2
add git ignore
ivchenkodima Apr 28, 2017
fac440e
Merge pull request #46 from ivchenkodima/gitignore
ivchenkodima Apr 28, 2017
c47af5e
1
ValuievVlad Apr 28, 2017
bc4cb0b
The kitten was added
Lora-Uroshlieva Apr 28, 2017
79eac28
add text
Apr 28, 2017
f9f1933
add meta-tag desctiption, add robots.txt
Apr 28, 2017
dd03d29
add tramp
tanyaparkhomenko Apr 28, 2017
87db194
text
polosenko Apr 28, 2017
e7dba15
Merge pull request #47 from ivchenkodima/uroshlieva_1
ivchenkodima Apr 28, 2017
6773530
Merge pull request #50 from ivchenkodima/parkhomenko_1
tanyaparkhomenko Apr 28, 2017
a938349
Merge pull request #52 from ivchenkodima/bruslik_1
ivchenkodima Apr 28, 2017
2a22ad0
Merge pull request #48 from ivchenkodima/gnydyn_1
ivchenkodima Apr 28, 2017
b615e63
Merge pull request #51 from ivchenkodima/polosenko_1
ivchenkodima Apr 28, 2017
5f29c17
Merge branch 'master' into Valuiev_1
ivchenkodima Apr 28, 2017
db63409
Merge pull request #49 from ivchenkodima/Valuiev_1
ivchenkodima Apr 28, 2017
344450b
1
tanyaparkhomenko Apr 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
node_modules/
.idea/
build/
11 changes: 9 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"start": "gulp",
"build": "gulp build"
},

"author": "php",
"license": "ISC",
"dependencies": {
Expand All @@ -30,5 +29,13 @@
"postcss": "^5.2.4",
"postcss-cli": "^2.6.0",
"rimraf": "^2.5.4"
}
},
"repository": {
"type": "git",
"url": "git+https://github.com/ivchenkodima/git_second.git"
},
"bugs": {
"url": "https://github.com/ivchenkodima/git_second/issues"
},
"homepage": "https://github.com/ivchenkodima/git_second#readme"
}
Binary file added src/img/funny-kitten-rub-my-belly.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/robots.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Disallow: /wp-admin
6 changes: 6 additions & 0 deletions src/templates/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,10 @@
<span>zur Bosch Website</span>
</div>
<div class="footer__bosch">© Robert Bosch Hausgeräte GmbH</div>
<div>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.</div>
</div>
6 changes: 4 additions & 2 deletions src/templates/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<div class="header">
<img src="./img/header-top.png" class="header__line" alt="">
<img src="https://images.unian.net/photos/2016_11/1478617363-4677-donald-tramp.jpg" class="header__line" alt="">
<div class="header__container">
<img src="./img/bosh.png" class="header__logo" alt="">
<p> lorem </p>
</div>
</div>
</div>

3 changes: 2 additions & 1 deletion src/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<!DOCTYPE html>
<html>
<link lang="de">
<title>Bosсh</title>
<title>Холодильники Bosсh б/у из Германии - только у нас!</title>
<meta charset="utf-8">
<meta name=desctiption content="Холодильники Bosсh бу из Германии можер недорого купить в нашем интернет магазине">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<link rel="stylesheet" href="./css/styles.css">
Expand Down
6 changes: 6 additions & 0 deletions src/templates/main.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
<h1 class="main__title">Einfach zur perfekten Waschmaschine.</h1>
<p class="main__description">Entdecken Sie die vielfältigen Auswahlmöglichkeiten und konfigu</p>
<div class="main__container">
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.
//= configurator.html
//= content.html
</div>
Expand Down