Skip to content

Commit 93d3ce3

Browse files
p-l-p-l-
authored
Merge pull request #12 from gpotter2/master
Update download page
2 parents bb1f5c9 + 0bebfe3 commit 93d3ce3

File tree

10 files changed

+143
-67
lines changed

10 files changed

+143
-67
lines changed

‎Gemfile.lock‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@ GEM
1313
execjs
1414
coffee-script-source (1.11.1)
1515
colorator (1.1.0)
16-
concurrent-ruby (1.0.5)
16+
concurrent-ruby (1.1.4)
1717
ethon (0.11.0)
1818
ffi (>= 1.3.0)
1919
execjs (2.7.0)
20-
faraday (0.15.3)
20+
faraday (0.15.4)
2121
multipart-post (>= 1.2, < 3)
2222
ffi (1.9.25)
2323
forwardable-extended (2.6.0)
2424
gemoji (3.0.0)
2525
github-pages (163)
2626
activesupport (= 4.2.9)
2727
github-pages-health-check (= 1.3.5)
28-
jekyll (~> 3.6.3)
28+
jekyll (= 3.5.2)
2929
jekyll-avatar (= 0.5.0)
3030
jekyll-coffeescript (= 1.0.2)
3131
jekyll-default-layout (= 0.1.4)
@@ -70,12 +70,12 @@ GEM
7070
octokit (~> 4.0)
7171
public_suffix (~> 2.0)
7272
typhoeus (~> 0.7)
73-
html-pipeline (2.8.4)
73+
html-pipeline (2.9.1)
7474
activesupport (>= 2)
7575
nokogiri (>= 1.4)
7676
i18n (0.9.5)
7777
concurrent-ruby (~> 1.0)
78-
jekyll (~> 3.6.3)
78+
jekyll (3.5.2)
7979
addressable (~> 2.4)
8080
colorator (~> 1.0)
8181
jekyll-sass-converter (~> 1.0)
@@ -180,20 +180,20 @@ GEM
180180
jekyll (~> 3.3)
181181
minitest (5.11.3)
182182
multipart-post (2.0.0)
183-
net-dns (0.8.0)
183+
net-dns (0.9.0)
184184
nokogiri (1.8.5)
185185
mini_portile2 (~> 2.3.0)
186-
octokit (4.12.0)
186+
octokit (4.13.0)
187187
sawyer (~> 0.8.0, >= 0.5.3)
188-
pathutil (0.16.1)
188+
pathutil (0.16.2)
189189
forwardable-extended (~> 2.6)
190190
public_suffix (2.0.5)
191191
rb-fsevent (0.10.3)
192192
rb-inotify (0.9.10)
193193
ffi (>= 0.5.0, < 2)
194194
rouge (1.11.1)
195195
safe_yaml (1.0.4)
196-
sass (3.6.0)
196+
sass (3.7.2)
197197
sass-listen (~> 4.0.0)
198198
sass-listen (4.0.0)
199199
rb-fsevent (~> 0.9, >= 0.9.4)

‎_config.yml‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# url is the full website URL
44
# baseurl is the website's URL without the hostname
55

6-
# If you are building a simple GitHub user page (http://username.github.io) then use these settings:
6+
# If you are building a simple GitHub user page (https://username.github.io) then use these settings:
77
url: "https://secdev.github.io"
88
baseurl: ""
99

@@ -102,6 +102,9 @@ url-pretty: "scapy.net"
102102

103103
# --- Web Statistics Section --- #
104104

105+
# Fill in your Google Analytics gtag.js ID to track your website using gtag
106+
#gtag: ""
107+
105108
# Fill in your Google Analytics ID to track your website using GA
106109
#google_analytics: ""
107110

@@ -117,9 +120,15 @@ url-pretty: "scapy.net"
117120
# uri: "demo.wiki.pro"
118121
# opt-out: true
119122

120-
# --- Misc --- #
123+
# --- Comments --- #
124+
121125
# Fill in your Disqus shortname (NOT the userid) if you want to support Disqus comments
122-
#disqus: ""
126+
# disqus: ""
127+
128+
# To use Facebook Comments, fill in a Facebook App ID
129+
# fb_comment_id: ""
130+
131+
# --- Misc --- #
123132

124133
# Facebook App ID
125134
# fb_app_id: ""
@@ -227,9 +236,11 @@ prose:
227236
label: "Publish"
228237
help: "Check to publish post, uncheck to hide."
229238

239+
plugins_dir:
240+
- jekyll-sitemap
241+
230242
plugins:
231243
- jekyll-paginate
232-
- jekyll-sitemap
233244

234245
# Beautiful Jekyll / Dean Attali
235246
# 2fc73a3a967e97599c9763d05e564189

‎_includes/footer-scripts.html‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,3 @@
3030
{% endif %}
3131
{% endfor %}
3232
{% endif %}
33-
34-
{% include google_analytics.html %}

‎_includes/footer.html‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33
<div class="row">
44
<div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
55
<ul class="list-inline text-center footer-links">
6-
{%- for link in site.social-network-links -%}
7-
{%- assign curkey = link[0] -%}
8-
{%- assign element = site.data.SocialNetworks[curkey] -%}
6+
{% for link in site.social-network-links %}
7+
{% assign curkey = link[0] %}
8+
{% assign element = site.data.SocialNetworks[curkey] %}
99
<li>
10-
{%- if curkey == 'rss' -%}
10+
{% if curkey == 'rss' %}
1111
<a href="{{ '/feed.xml' | prepend: site.baseurl }}" title="{{ element.name }}">
12-
{%- elsif curkey == 'yelp' -%}
12+
{% elsif curkey == 'yelp' %}
1313
<a href="https://{{ site.social-network-links[curkey] }}.yelp.com" title="{{ element.name }}">
14-
{%- else -%}
14+
{% else %}
1515
<a href="{{element.baseURL}}{{ site.social-network-links[curkey] }}" title="{{ element.name }}">
16-
{%- endif -%}
16+
{% endif %}
1717
<span class="fa-stack fa-lg" aria-hidden="true">
1818
<i class="fa fa-circle fa-stack-2x"></i>
1919
<i class="fa {{ element.icon }} fa-stack-1x fa-inverse"></i>
2020
</span>
2121
<span class="sr-only">{{ element.name }}</span>
2222
</a>
2323
</li>
24-
{%- endfor -%}
24+
{% endfor %}
2525
</ul>
2626
<p class="copyright text-muted">
2727
{{ site.author.name }}
@@ -43,7 +43,7 @@
4343
<!-- Please don't remove this, keep my open source work credited :) -->
4444
<p class="theme-by text-muted">
4545
Theme by
46-
<a href="http://deanattali.com/beautiful-jekyll/">beautiful-jekyll</a>
46+
<a href="https://deanattali.com/beautiful-jekyll/">beautiful-jekyll</a>
4747
</p>
4848
</div>
4949
</div>

‎_includes/google_analytics.html‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
{% if site.google_analytics %}
2-
<!-- Google Analytics -->
3-
<script>
4-
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
5-
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
6-
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
7-
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
8-
ga('create', '{{ site.google_analytics }}', 'auto');
9-
ga('send', 'pageview');
10-
</script>
11-
<!-- End Google Analytics -->
12-
{% endif %}
2+
<!-- Google Analytics -->
3+
<script>
4+
(function (i, s, o, g, r, a, m) {
5+
i['GoogleAnalyticsObject'] = r; i[r] = i[r] || function () {
6+
(i[r].q = i[r].q || []).push(arguments)
7+
}, i[r].l = 1 * new Date(); a = s.createElement(o),
8+
m = s.getElementsByTagName(o)[0]; a.async = 1; a.src = g; m.parentNode.insertBefore(a, m)
9+
})(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
10+
ga('create', '{{ site.google_analytics }}', 'auto');
11+
ga('send', 'pageview');
12+
</script>
13+
<!-- End Google Analytics -->
14+
{% endif %}

‎css/button.css‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
.row {
2+
display: flex;
3+
}
4+
.button {
5+
/* On index.md and download.md */
6+
background-color: #ECECEC;
7+
border: solid 2px #99AAB5;
8+
padding: 1em;
9+
border-radius: 2px;
10+
text-align: center;
11+
font-family: 'Catamaran', sans-serif;
12+
font-size: 12pt;
13+
color: #000;
14+
flex: 1;
15+
display: flex;
16+
justify-content: center;
17+
align-items: center;
18+
text-decoration: none;
19+
margin-left: 2%;
20+
}
21+
.button:hover {
22+
background-color: #FFFFFF;
23+
}
24+
.button svg, .button img {
25+
height: 40%;
26+
width: 60%;
27+
}
28+
.button_main {
29+
/* On index.md */
30+
width: 40%;
31+
height: 10%;
32+
margin: auto;
33+
border-radius: 15px;
34+
font-size: 1.3em;
35+
font-weight: 800;
36+
font-family: arial;
37+
}
38+
.button_text {
39+
margin: 0px;
40+
margin-top: 1em;
41+
}
42+
.button:hover .button_text {
43+
color: #404040;
44+
}

‎demo.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Quick demo - an interactive session
33
date: 2018-04-19 14:00:00
44
---
55

6-
### Please also have a look at the [interactive tutorial](http://www.secdev.org/projects/scapy/doc/usage.html#interactive-tutorial) in the official documentation, that may be more up to date.
6+
### Please also have a look at the [interactive tutorial](https://scapy.readthedocs.io/en/latest/usage.html#interactive-tutorial) in the official documentation, that may be more up to date.
77

88
If you are new to python and you really don't understand a word because of that, or if you want to learn this language, take an hour to read the very good tutorial from Guido Van Rossum here: [http://docs.python.org/tutorial/](http://docs.python.org/tutorial/). After that, you'll know python :) (really!). For a more in-depth tutorial [Dive Into Python](http://www.diveintopython.net/toc/index.html) is a very good start too.
99

0 commit comments

Comments
 (0)