Skip to content

Commit 85a5a62

Browse files
invalidusrnameinvalidusrname
authored
Code Scanning Alert fix: external links (#77)
1 parent 348c83e commit 85a5a62

File tree

3 files changed

+190
-147
lines changed

3 files changed

+190
-147
lines changed

‎_layouts/default.html‎

Lines changed: 77 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,106 @@
11
<!DOCTYPE html>
22
<html lang="en">
3-
<head>
4-
<meta charset="utf-8">
5-
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
6-
<meta http-equiv="X-UA-Compatible" content="ie=edge">
7-
<title>{{page.title}} | {{site.name}}</title>
83

9-
{% seo %}
4+
<head>
5+
<meta charset="utf-8">
6+
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
7+
<meta http-equiv="X-UA-Compatible" content="ie=edge">
8+
<title>{{page.title}} | {{site.name}}</title>
109

11-
<link rel="shortcut icon" type="image/x-icon" href="{{site.baseurl}}/{{site.favicon}}">
10+
{% seo %}
1211

13-
<!-- Font Awesome Icons -->
14-
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/all.css" integrity="sha384-mzrmE5qonljUremFsqc01SB46JvROS7bZs3IO2EmfFsd15uHvIt+Y8vEf7N7fWAU" crossorigin="anonymous">
12+
<link rel="shortcut icon" type="image/x-icon" href="{{site.baseurl}}/{{site.favicon}}">
1513

16-
<!-- Google Fonts-->
17-
<link href="https://fonts.googleapis.com/css?family=Lora:400,400i,700" rel="stylesheet">
14+
<!-- Font Awesome Icons -->
15+
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/all.css"
16+
integrity="sha384-mzrmE5qonljUremFsqc01SB46JvROS7bZs3IO2EmfFsd15uHvIt+Y8vEf7N7fWAU" crossorigin="anonymous">
1817

19-
<!-- Bootstrap Modified -->
20-
<link rel="stylesheet" href="{{site.baseurl}}/assets/css/main.css">
18+
<!-- Google Fonts-->
19+
<link href="https://fonts.googleapis.com/css?family=Lora:400,400i,700" rel="stylesheet">
2120

22-
<!-- Theme Stylesheet -->
23-
<link rel="stylesheet" href="{{site.baseurl}}/assets/css/theme.css">
21+
<!-- Bootstrap Modified -->
22+
<link rel="stylesheet" href="{{site.baseurl}}/assets/css/main.css">
2423

25-
<!-- Jquery on header to make sure everything works, the rest of the scripts in footer for fast loading -->
26-
<script
27-
src="https://code.jquery.com/jquery-3.3.1.min.js"
28-
integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8="
29-
crossorigin="anonymous"></script>
24+
<!-- Theme Stylesheet -->
25+
<link rel="stylesheet" href="{{site.baseurl}}/assets/css/theme.css">
3026

31-
{% include tracking-header.html %}
27+
<!-- Jquery on header to make sure everything works, the rest of the scripts in footer for fast loading -->
28+
<script src="https://code.jquery.com/jquery-3.3.1.min.js"
29+
integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
3230

31+
{% include tracking-header.html %}
3332

34-
</head>
3533

36-
<body class="{% if page.url == "/" %} homefirstpage {% endif %}">
34+
</head>
3735

38-
<!-- Navbar -->
39-
<nav id="MagicMenu" class="topnav navbar navbar-expand-lg navbar-light bg-white fixed-top">
40-
<div class="container">
41-
<a class="navbar-brand" href="{{ site.baseurl }}/"><strong>{{site.name}}</strong></a>
42-
<button class="navbar-toggler collapsed" type="button" data-toggle="collapse" data-target="#navbarColor02" aria-controls="navbarColor02" aria-expanded="false" aria-label="Toggle navigation">
43-
<span class="navbar-toggler-icon"></span>
44-
</button>
45-
<div class="navbar-collapse collapse" id="navbarColor02" style="">
46-
<ul class="navbar-nav mr-auto d-flex align-items-center">
47-
{% include menu-header.html %}
48-
</ul>
49-
<ul class="navbar-nav ml-auto d-flex align-items-center">
50-
{% include search-lunr.html %}
51-
</ul>
52-
</div>
53-
</div>
54-
</nav>
36+
<body class="{% if page.url == " /" %} homefirstpage {% endif %}">
37+
38+
<!-- Navbar -->
39+
<nav id="MagicMenu" class="topnav navbar navbar-expand-lg navbar-light bg-white fixed-top">
40+
<div class="container">
41+
<a class="navbar-brand" href="{{ site.baseurl }}/"><strong>{{site.name}}</strong></a>
42+
<button class="navbar-toggler collapsed" type="button" data-toggle="collapse"
43+
data-target="#navbarColor02" aria-controls="navbarColor02" aria-expanded="false"
44+
aria-label="Toggle navigation">
45+
<span class="navbar-toggler-icon"></span>
46+
</button>
47+
<div class="navbar-collapse collapse" id="navbarColor02" style="">
48+
<ul class="navbar-nav mr-auto d-flex align-items-center">
49+
{% include menu-header.html %}
50+
</ul>
51+
<ul class="navbar-nav ml-auto d-flex align-items-center">
52+
{% include search-lunr.html %}
53+
</ul>
54+
</div>
55+
</div>
56+
</nav>
5557

56-
<!-- Search Results -->
57-
<div id="lunrsearchresults">
58-
<ul class="mb-0"></ul>
59-
</div>
58+
<!-- Search Results -->
59+
<div id="lunrsearchresults">
60+
<ul class="mb-0"></ul>
61+
</div>
6062

61-
<!-- Content -->
62-
<main role="main" class="site-content">
63-
{{ content }}
64-
</main>
63+
<!-- Content -->
64+
<main role="main" class="site-content">
65+
{{ content }}
66+
</main>
6567

6668

67-
<!-- Scripts: popper, bootstrap, theme, lunr -->
68-
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.6/umd/popper.min.js" integrity="sha384-wHAiFfRlMFy6i5SRaxvfOCifBUQy1xHdJ/yoi7FRNXMRBu5WHdZYu1hA6ZOblgut" crossorigin="anonymous"></script>
69+
<!-- Scripts: popper, bootstrap, theme, lunr -->
70+
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.6/umd/popper.min.js"
71+
integrity="sha384-wHAiFfRlMFy6i5SRaxvfOCifBUQy1xHdJ/yoi7FRNXMRBu5WHdZYu1hA6ZOblgut"
72+
crossorigin="anonymous"></script>
6973

70-
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/js/bootstrap.min.js" integrity="sha384-B0UglyR+jN6CkvvICOB2joaf5I4l3gm9GU6Hc1og6Ls7i6U/mkkaduKaBhlAXv9k" crossorigin="anonymous"></script>
74+
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/js/bootstrap.min.js"
75+
integrity="sha384-B0UglyR+jN6CkvvICOB2joaf5I4l3gm9GU6Hc1og6Ls7i6U/mkkaduKaBhlAXv9k"
76+
crossorigin="anonymous"></script>
7177

72-
<script src="{{site.baseurl}}/assets/js/theme.js"></script>
78+
<script src="{{site.baseurl}}/assets/js/theme.js"></script>
7379

7480

75-
<!-- Footer -->
76-
<footer class="bg-white border-top p-3 text-muted small">
77-
<div class="container">
78-
<div class="row align-items-center justify-content-between">
79-
<div>
80-
<span class="navbar-brand mr-2 mb-0"><strong>Charlotte Ruby</strong></span>
81-
<span>Copyright © <script>document.write(new Date().getFullYear())</script>.</span>
81+
<!-- Footer -->
82+
<footer class="bg-white border-top p-3 text-muted small">
83+
<div class="container">
84+
<div class="row align-items-center justify-content-between">
85+
<div>
86+
<span class="navbar-brand mr-2 mb-0"><strong>Charlotte Ruby</strong></span>
87+
<span>Copyright ©
88+
<script>document.write(new Date().getFullYear())</script>.
89+
</span>
8290

83-
<a class="text-dark ml-1" target="_blank" href="https://github.com/charlotte-ruby/charlotte-ruby.github.io"><i class="fab fa-github"></i></a>
84-
<a class="text-dark ml-1" target="_blank" href="https://twitter.com/cltrb"><i class="fab fa-twitter"></i></a>
91+
<a class="text-dark ml-1" target="_blank" rel="noopener noreferrer"
92+
href="https://github.com/charlotte-ruby/charlotte-ruby.github.io"><i
93+
class="fab fa-github"></i></a>
94+
<a class="text-dark ml-1" target="_blank" rel="noopener noreferrer"
95+
href="https://twitter.com/cltrb"><i class="fab fa-twitter"></i></a>
8596

97+
</div>
98+
</div>
8699
</div>
87-
</div>
88-
</div>
89-
</footer>
100+
</footer>
90101

91-
{% include tracking-footer.html %}
102+
{% include tracking-footer.html %}
92103

93-
</body>
104+
</body>
94105

95106
</html>

‎_layouts/post.html‎

Lines changed: 92 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,46 @@
44

55
{% assign author = site.authors[page.author] %}
66
<div class="container">
7-
<div class="jumbotron jumbotron-fluid mb-3 pl-0 pt-0 pb-0 bg-white position-relative">
7+
<div class="jumbotron jumbotron-fluid mb-3 pl-0 pt-0 pb-0 bg-white position-relative">
88
<div class="h-100 tofront">
9-
<div class="row {% if page.image %} justify-content-between {% else %} justify-content-center {% endif %}">
10-
<div class="{% if page.image %} col-md-6 {% else %} col-md-8 {% endif %} pr-0 pr-md-4 pt-4 pb-4 align-self-center">
9+
<div
10+
class="row {% if page.image %} justify-content-between {% else %} justify-content-center {% endif %}">
11+
<div
12+
class="{% if page.image %} col-md-6 {% else %} col-md-8 {% endif %} pr-0 pr-md-4 pt-4 pb-4 align-self-center">
1113
<p class="text-uppercase font-weight-bold">
12-
<span class="catlist">
13-
{% for category in page.categories %}
14-
<a class="sscroll text-danger" href="{{site.baseurl}}/categories#{{ category | downcase }}">{{ category | downcase }}</a><span class="sep">, </span>
15-
{% endfor %}
16-
</span>
14+
<span class="catlist">
15+
{% for category in page.categories %}
16+
<a class="sscroll text-danger"
17+
href="{{site.baseurl}}/categories#{{ category | downcase }}">{{
18+
category | downcase }}</a><span class="sep">, </span>
19+
{% endfor %}
20+
</span>
1721
</p>
1822
<h1 class="display-4 mb-4 article-headline">{{ page.title }}</h1>
1923
<div class="d-flex align-items-center">
20-
{% if author.avatar %}
21-
<img class="rounded-circle" src="{{author.avatar}}" alt="{{author.name}}" width="70"/>
22-
{% endif %}
24+
{% if author.avatar %}
25+
<img class="rounded-circle" src="{{author.avatar}}"
26+
alt="{{author.name}}" width="70" />
27+
{% endif %}
2328

24-
{% if author.twitter %}
25-
<small class="ml-3"> {{ author.name }} <span><a target="_blank" href="{{ author.twitter }}" class="btn btn-outline-success btn-sm btn-round ml-1">Follow</a></span>
26-
<span class="text-muted d-block mt-1">{{ page.date | date: '%b %d, %Y' }} · {% include meta-read-time.html %}</span>
29+
{% if author.twitter %}
30+
<small class="ml-3"> {{ author.name }} <span><a target="_blank"
31+
rel="noopener noreferrer"
32+
href="{{ author.twitter }}"
33+
class="btn btn-outline-success btn-sm btn-round ml-1">Follow</a></span>
34+
<span class="text-muted d-block mt-1">{{ page.date | date: '%b
35+
%d, %Y' }} · {% include meta-read-time.html %}</span>
2736
</small>
28-
{% endif %}
37+
{% endif %}
2938
</div>
3039
</div>
31-
{% if page.image %}
40+
{% if page.image %}
3241
<div class="col-md-6 pr-0 align-self-center">
33-
<img class="rounded" src="{% if page.image contains "://" %}{{ page.image }}{% else %}{{ site.baseurl }}/{{ page.image }}{% endif %}" alt="{{ page.title }}">
42+
<img class="rounded" src="{% if page.image contains " ://" %}{{ page.image }}{%
43+
else %}{{ site.baseurl }}/{{ page.image }}{% endif %}"
44+
alt="{{ page.title }}">
3445
</div>
35-
{% endif %}
46+
{% endif %}
3647
</div>
3748
</div>
3849
</div>
@@ -44,75 +55,93 @@ <h1 class="display-4 mb-4 article-headline">{{ page.title }}</h1>
4455

4556
<div class="container-lg pt-4 pb-4">
4657
<div class="row justify-content-center">
47-
58+
4859
<div class="col-md-12 col-lg-8">
49-
50-
<!-- Article -->
51-
<article class="article-post">
52-
{{ content }}
60+
61+
<!-- Article -->
62+
<article class="article-post">
63+
{{ content }}
5364
</article>
54-
65+
5566
<!-- Tags -->
5667
<div class="mb-4">
5768
<span class="taglist">
58-
{% for tag in page.tags %}
59-
<a class="sscroll btn btn-light btn-sm font-weight-bold" href="{{site.baseurl}}/tags#{{ tag | downcase }}">{{ tag | downcase }}</a>
60-
{% endfor %}
69+
{% for tag in page.tags %}
70+
<a class="sscroll btn btn-light btn-sm font-weight-bold"
71+
href="{{site.baseurl}}/tags#{{ tag | downcase }}">{{ tag | downcase
72+
}}</a>
73+
{% endfor %}
6174
</span>
6275
</div>
63-
64-
<!-- Mailchimp Subscribe Form -->
65-
{% if site.mailchimp-list.length %}
76+
77+
<!-- Mailchimp Subscribe Form -->
78+
{% if site.mailchimp-list.length %}
6679
<div class="border p-5 bg-lightblue">
6780
<div class="row justify-content-between">
6881
<div class="col-md-6 mb-2 mb-md-0">
6982
<h5 class="font-weight-bold">Join Newsletter</h5>
70-
Get the latest news right in your inbox. We never spam!
83+
Get the latest news right in your inbox. We never spam!
7184
</div>
7285
<div class="col-md-6">
7386
<div class="row">
74-
<form action="{{site.mailchimp-list}}" method="post" name="mc-embedded-subscribe-form" class="wj-contact-form validate w-100" target="_blank" novalidate>
75-
<div class="mc-field-group">
76-
77-
<input type="email" placeholder="Enter e-mail address" name="EMAIL" class="required email form-control w-100" id="mce-EMAIL" autocomplete="on" required>
78-
79-
80-
<button type="submit" value="Subscribe" name="subscribe" class="heart btn btn-success btn-block w-100 mt-2">Subscribe</button>
81-
82-
</div>
83-
</form>
87+
<form action="{{site.mailchimp-list}}" method="post"
88+
name="mc-embedded-subscribe-form"
89+
class="wj-contact-form validate w-100" target="_blank"
90+
rel="noopener noreferrer" novalidate>
91+
<div class="mc-field-group">
92+
93+
<input type="email"
94+
placeholder="Enter e-mail address"
95+
name="EMAIL"
96+
class="required email form-control w-100"
97+
id="mce-EMAIL" autocomplete="on"
98+
required>
99+
100+
101+
<button type="submit" value="Subscribe"
102+
name="subscribe"
103+
class="heart btn btn-success btn-block w-100 mt-2">Subscribe</button>
104+
105+
</div>
106+
</form>
84107
</div>
85108
</div>
86109
</div>
87110
</div>
88-
{% endif %}
111+
{% endif %}
112+
113+
<!-- Comments -->
114+
{% if page.comments != false %}
115+
{% include comments.html %}
116+
{% endif %}
89117

90-
<!-- Comments -->
91-
{% if page.comments != false %}
92-
{% include comments.html %}
93-
{% endif %}
94-
95118
</div>
96-
97-
119+
120+
98121
</div>
99122
</div>
100123

101124

102125
<!-- Aletbar Prev/Next -->
103126
<div class="alertbar">
104-
<div class="container">
105-
<div class="row prevnextlinks small font-weight-bold">
106-
{% if page.previous.url %}
107-
<div class="col-md-6 rightborder pl-0">
108-
<a class="text-dark" href="{{ site.baseurl }}{{ page.previous.url }}">{% if page.previous.image %} <img height="30px" class="mr-1" src="{{site.baseurl}}/{{page.previous.image}}" alt="{{page.previous.title}}}" > {% endif %} {{page.previous.title}}</a>
109-
</div>
110-
{% endif %}
111-
{% if page.next.url %}
112-
<div class="col-md-6 text-right pr-0">
113-
<a class="text-dark" href="{{ site.baseurl }}{{ page.next.url }}"> {{page.next.title}} {% if page.next.image %} <img height="30px" class="ml-1" src="{{site.baseurl}}/{{page.next.image}}" alt="{{page.next.title}}"> {% endif %}</a>
114-
</div>
115-
{% endif %}
116-
</div>
117-
</div>
127+
<div class="container">
128+
<div class="row prevnextlinks small font-weight-bold">
129+
{% if page.previous.url %}
130+
<div class="col-md-6 rightborder pl-0">
131+
<a class="text-dark" href="{{ site.baseurl }}{{ page.previous.url }}">{% if
132+
page.previous.image %} <img height="30px" class="mr-1"
133+
src="{{site.baseurl}}/{{page.previous.image}}"
134+
alt="{{page.previous.title}}}"> {% endif %} {{page.previous.title}}</a>
135+
</div>
136+
{% endif %}
137+
{% if page.next.url %}
138+
<div class="col-md-6 text-right pr-0">
139+
<a class="text-dark" href="{{ site.baseurl }}{{ page.next.url }}"> {{page.next.title}}
140+
{% if page.next.image %} <img height="30px" class="ml-1"
141+
src="{{site.baseurl}}/{{page.next.image}}" alt="{{page.next.title}}"> {%
142+
endif %}</a>
143+
</div>
144+
{% endif %}
145+
</div>
146+
</div>
118147
</div>

0 commit comments

Comments
 (0)