Skip to content

Commit 065e26f

Browse files
committed
Merge branch 'feature/jekyll-pages'
2 parents f6bf194 + c0587eb commit 065e26f

34 files changed

+15243
-713
lines changed

Diff for: package.json

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"name": "spbpython.guru",
3+
"version": "1.0.0",
4+
"description": "SPB Python Community",
5+
"author": "SPB Python Community",
6+
"private": true,
7+
"scripts": {
8+
"dev": "node build/dev-server.js",
9+
"build": "node build/build.js"
10+
},
11+
"dependencies": {
12+
"extract-text-webpack-plugin": "^1.0.1",
13+
"jquery": "^3.0.0"
14+
},
15+
"devDependencies": {
16+
"babel-core": "^6.17.0",
17+
"babel-loader": "^6.2.5",
18+
"babel-plugin-transform-runtime": "^6.0.0",
19+
"babel-preset-es2015": "^6.16.0",
20+
"babel-preset-stage-2": "^6.0.0",
21+
"css-loader": "^0.23.0",
22+
"css-skeleton": "^1.0.1",
23+
"file-loader": "^0.8.4",
24+
"fullpage.js": "^2.8.1",
25+
"function-bind": "^1.0.2",
26+
"http-proxy-middleware": "^0.12.0",
27+
"image-webpack-loader": "^3.0.0",
28+
"jquery": "^3.0.0",
29+
"json-loader": "^0.5.4",
30+
"ora": "^0.2.0",
31+
"webpack": "^1.12.2",
32+
"webpack-dev-middleware": "^1.4.0",
33+
"webpack-hot-middleware": "^2.6.0",
34+
"webpack-merge": "^0.8.3"
35+
}
36+
}

Diff for: sources/_includes/footer.html

+1-15
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,5 @@
1-
<script src="https://code.jquery.com/jquery-2.2.4.min.js"
2-
integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44="
3-
crossorigin="anonymous"></script>
4-
<script src='{{ "/js/jquery.fullPage.min.js" | prepend: site.baseurl }}'></script>
1+
<script src='{{ "/bundles/app.js" | prepend: site.baseurl }}'></script>
52

6-
<script>
7-
$(document).ready(function () {
8-
$('#fullpage').fullpage({
9-
anchors: ['wellcome', 'community', 'links'],
10-
navigation: true,
11-
navigationPosition: 'right',
12-
navigationTooltips: ['First', 'Second', 'Third']
13-
})
14-
})
15-
16-
</script>
173
<script>(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
184
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
195
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)

Diff for: sources/_includes/head.html

+1-5
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@
4545
<link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic" rel=stylesheet
4646
type=text/css>
4747

48-
49-
<link rel="stylesheet" href='{{ "/css/normalize.css" | prepend: site.baseurl }}'>
50-
<link rel="stylesheet" href='{{ "/css/app.css" | prepend: site.baseurl }}'>
51-
<link rel="stylesheet" href='{{ "/css/jquery.fullPage.css" | prepend: site.baseurl }}'>
52-
48+
<link rel="stylesheet" href='{{ "/bundles/app.css" | prepend: site.baseurl }}'>
5349
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
5450
</head>

Diff for: sources/about.md

-11
This file was deleted.

Diff for: sources/css/app.css renamed to sources/assets/css/main.css

+22-13
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,14 @@ a {
2727
}
2828

2929
.forkme {
30-
display: block;
31-
position: absolute;
32-
top: 0;
33-
right: 0;
34-
width: 149px;
35-
height: 149px;
36-
}
37-
.forkme img{
38-
width: 100%;
39-
height: 100%;
30+
display: block;
31+
position: absolute;
32+
top: 0;
33+
right: 0;
34+
width: 149px;
35+
height: 149px;
36+
background-image: url(../images/networks/forkme.png);
37+
background-size: 149px;
4038
}
4139

4240

@@ -79,13 +77,24 @@ a {
7977
}
8078

8179

82-
.meetup {
80+
.network-icon {
8381
width: 150px;
82+
background-size: 150px;
83+
display: inline-block;
84+
height: 150px;
85+
}
86+
87+
.meetup {
88+
background-image: url(../images/networks/meetup.png);
89+
height: 150px;
90+
display: inline-block;
91+
width: 200px;
92+
background-size: 200px;
8493
}
8594
.telegram {
86-
width: 150px;
8795
margin-left: 30px;
96+
background-image: url(../images/networks/telegram.png);
8897
}
8998
.google-plus {
90-
width: 150px;
99+
background-image: url(../images/networks/google-plus.png);
91100
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Diff for: sources/assets/js/main.js

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import $ from 'jquery'
2+
import '../css/normalize.css'
3+
import 'css-skeleton'
4+
import 'fullpage.js'
5+
import 'fullpage.js/dist/jquery.fullPage.css'
6+
7+
import '../css/main.css'
8+
9+
$(document).ready(function () {
10+
$('#fullpage').fullpage({
11+
anchors: ['wellcome', 'community', 'links'],
12+
navigation: true,
13+
navigationPosition: 'right',
14+
navigationTooltips: ['First', 'Second', 'Third']
15+
})
16+
})

Diff for: sources/bundles/1686c0cd9e793af82207bb56ebb548e5.jpg

585 KB
Loading

Diff for: sources/bundles/38af14961a15df610670d5c4a93a4b49.jpg

239 KB
Loading

Diff for: sources/bundles/45fb99203920ec23f585c2e359e688b0.jpg

436 KB
Loading

Diff for: sources/bundles/6a2b605d5202cfd41b677650456ce369.png

18.5 KB
Loading

Diff for: sources/bundles/824f9ea8ed50133a9de4fe2510b2393e.png

15.3 KB
Loading

Diff for: sources/bundles/8b7fee64d2aca7a2a488f4d279babb8d.png

18.8 KB
Loading

Diff for: sources/bundles/a052723d47967c81c4072d84aa31550b.jpg

1.39 MB
Loading

0 commit comments

Comments
 (0)