Skip to content

Commit 67985f6

Browse files
bertiquebertique
committed
Revert "Fix base url"
This reverts commit deebe5d.
1 parent deebe5d commit 67985f6

File tree

5 files changed

+27
-27
lines changed

5 files changed

+27
-27
lines changed

‎_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Michael Dick
33
email: b.michael.dick@gmail.com
44
description: "The personal website of Michael Dick."
55
keywords: "Michael Dick, Product Manager, Seattle"
6-
baseurl: ""
6+
baseurl: "https://michaeldick.me"
77
twitter_username: midi2dot0
88
github_username: bertique
99
linkedin_username: in/dickm

‎_includes/footer.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ <h5>Artisanally Crafted in Seattle, WA - Copyright 2014-2017 Michael Dick</h5>
1010
<!-- Placed at the end of the document so the pages load faster -->
1111

1212

13-
<script type="text/javascript" src="{{ "/js/bootstrap.min.js" | prepend: site.url }}"></script>
14-
<script type="text/javascript" src="{{ "/js/jquery.easing.1.3.js" | prepend: site.url }}"></script>
15-
<script type="text/javascript" src="{{ "/js/smoothscroll.js" | prepend: site.url }}"></script>
16-
<script type="text/javascript" src="{{ "/js/toucheffects.js" | prepend: site.url }}"></script>
13+
<script type="text/javascript" src="{{ "/js/bootstrap.min.js" | prepend: site.baseurl }}"></script>
14+
<script type="text/javascript" src="{{ "/js/jquery.easing.1.3.js" | prepend: site.baseurl }}"></script>
15+
<script type="text/javascript" src="{{ "/js/smoothscroll.js" | prepend: site.baseurl }}"></script>
16+
<script type="text/javascript" src="{{ "/js/toucheffects.js" | prepend: site.baseurl }}"></script>
1717
<script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-557afcaa349bb389" async="async"></script>
1818

19-
<!-- <script type="text/javascript" src="{{ "/js/jquery-func.js" | prepend: site.url }}"></script> -->
19+
<!-- <script type="text/javascript" src="{{ "/js/jquery-func.js" | prepend: site.baseurl }}"></script> -->
2020

2121
</footer>

‎_includes/head.html

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,31 @@
55
<meta name="viewport" content="width=device-width">
66

77
<meta property="og:title" content="{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}" />
8-
<meta property="og:image" content="{% if page.image %}{{ page.image | prepend: site.url }}{% else %}{{ "/img/profile.jpg" | prepend: site.url }}{% endif %}" />
8+
<meta property="og:image" content="{% if page.image %}{{ page.image | prepend: site.baseurl }}{% else %}{{ "/img/profile.jpg" | prepend: site.baseurl }}{% endif %}" />
99
<meta property="og:description" content="{% if page.description %}{{ page.description }}{% else %}{{ site.description }}{% endif %}" />
10-
<meta property="og:url" content="{{ page.url | replace:'index.html','' | prepend: site.url }}" />
10+
<meta property="og:url" content="{{ page.url | replace:'index.html','' | prepend: site.baseurl }}" />
1111
<meta property="og:type" content="website" />
1212

1313
<meta name="description" content="{% if page.description %}{{ page.description }}{% else %}{{ site.description }}{% endif %}">
1414
<meta name="keywords" content="{% if page.keywords %}{{ page.keywords }}{% else %}{{ site.keywords }}{% endif %}">
1515

16-
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.url }}">
16+
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl }}">
1717

18-
<link rel="shortcut icon" href="{{ "/favicon.ico" | prepend: site.url }}" type="image/x-icon" />
18+
<link rel="shortcut icon" href="{{ "/favicon.ico" | prepend: site.baseurl }}" type="image/x-icon" />
1919

2020
<!-- Bootstrap core CSS -->
21-
<link href="{{ "/css/bootstrap.css" | prepend: site.url }}" rel="stylesheet">
21+
<link href="{{ "/css/bootstrap.css" | prepend: site.baseurl }}" rel="stylesheet">
2222

2323
<!-- Custom styles for this template -->
24-
<link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.url }}">
25-
<link rel="stylesheet" href="{{ "/css/icomoon.css" | prepend: site.url }}">
26-
<link rel="stylesheet" href="{{ "/css/animate-custom.css" | prepend: site.url }}">
24+
<link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
25+
<link rel="stylesheet" href="{{ "/css/icomoon.css" | prepend: site.baseurl }}">
26+
<link rel="stylesheet" href="{{ "/css/animate-custom.css" | prepend: site.baseurl }}">
2727

2828
<link href='https://fonts.googleapis.com/css?family=Lato:300,400,700,300italic,400italic' rel='stylesheet' type='text/css'>
2929
<link href='https://fonts.googleapis.com/css?family=Raleway:400,300,700' rel='stylesheet' type='text/css'>
3030

31-
<script type="text/javascript" src="{{ "/js/jquery.min.js" | prepend: site.url }}"></script>
32-
<script type="text/javascript" src="{{ "/js/modernizr.custom.js" | prepend: site.url }}"></script>
31+
<script type="text/javascript" src="{{ "/js/jquery.min.js" | prepend: site.baseurl }}"></script>
32+
<script type="text/javascript" src="{{ "/js/modernizr.custom.js" | prepend: site.baseurl }}"></script>
3333

3434
{% include googleAnalytics.html %}
3535
</head>

‎_includes/header.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
99
<span class="icon icon-list" style="font-size:30px; color:#3498db;"></span>
1010
</button>
11-
<a class="navbar-brand hidden-xs hidden-sm smoothScroll" href="{{ "/#home" | prepend: site.url }}"><strong>Michael Dick</strong></a>
11+
<a class="navbar-brand hidden-xs hidden-sm smoothScroll" href="{{ "/#home" | prepend: site.baseurl }}"><strong>Michael Dick</strong></a>
1212
</div>
1313
<div class="navbar-collapse collapse">
1414
<ul class="nav navbar-nav">
15-
<li><a href="{{ "/#greywrap" | prepend: site.url }}" class="smoothScroll">Home</a></li>
16-
<li><a href="{{ "/#projects" | prepend: site.url }}" class="smoothScroll">Projects</a></li>
17-
{% if site.posts != empty %}<li><a href="{{ "/#blog" | prepend: site.url }}" class="smoothScroll">Blog</a></li> {% endif %}
15+
<li><a href="{{ "/#greywrap" | prepend: site.baseurl }}" class="smoothScroll">Home</a></li>
16+
<li><a href="{{ "/#projects" | prepend: site.baseurl }}" class="smoothScroll">Projects</a></li>
17+
{% if site.posts != empty %}<li><a href="{{ "/#blog" | prepend: site.baseurl }}" class="smoothScroll">Blog</a></li> {% endif %}
1818
</ul>
1919
</div><!--/.nav-collapse -->
2020
</div>

‎index.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ <h2>Hi,</h2>
2727
<a href="https://twitter.com/{{ site.twitter_username }}" target="_blank" class="icon icon-twitter2"></a></p>
2828
</div>
2929
<div class="col-lg-8 centered">
30-
<img class="img-responsive" src="{{ "/img/macbook.png" | prepend: site.url }}" align="">
30+
<img class="img-responsive" src="{{ "/img/macbook.png" | prepend: site.baseurl }}" align="">
3131
</div>
3232
</div><!-- row -->
3333
</div>
@@ -54,11 +54,11 @@ <h2>Hi,</h2>
5454
<div class="col-md-4 ">
5555
<div class="grid mask">
5656
<figure>
57-
<img class="img-responsive" src="{{ page.image | prepend: site.url }}" alt="">
57+
<img class="img-responsive" src="{{ page.image | prepend: site.baseurl }}" alt="">
5858
<figcaption>
5959
<h5>{{ page.title }}</h5>
6060
{% if page.permalink %}
61-
<a href="{{ page.permalink | prepend: site.url }}" class="btn btn-primary btn-lg">Take a Look</a>
61+
<a href="{{ page.permalink | prepend: site.baseurl }}" class="btn btn-primary btn-lg">Take a Look</a>
6262
{% else %}
6363
<a data-toggle="modal" href="#myModal{{ forloop.index }}" class="btn btn-primary btn-lg">Take a Look</a>
6464
{% endif %}
@@ -78,10 +78,10 @@ <h5>{{ page.title }}</h5>
7878
<h4 class="modal-title">{{ page.title }}</h4>
7979
</div>
8080
<div class="modal-body">
81-
<p><img class="img-responsive" src="{{ page.image | prepend: site.url }}" alt="" style="width:300px"></p>
81+
<p><img class="img-responsive" src="{{ page.image | prepend: site.baseurl }}" alt="" style="width:300px"></p>
8282
<p>{{ page.excerpt | markdownify }}</p>
8383
{% if page.permalink %}
84-
<p><b><a href="{{ page.permalink | prepend: site.url }}">Visit Project Site</a></b></p>
84+
<p><b><a href="{{ page.permalink | prepend: site.baseurl }}">Visit Project Site</a></b></p>
8585
{% endif %}
8686
</div>
8787
<div class="modal-footer">
@@ -116,7 +116,7 @@ <h4 class="modal-title">{{ page.title }}</h4>
116116
<div class="col-lg-12 blog-bg">
117117
<div class="col-lg-3 centered">
118118
<br>
119-
<p><img class="img img-circle" src="{{ "/img/profile.jpg" | prepend: site.url }}" width="120px" height="120px"></p>
119+
<p><img class="img img-circle" src="{{ "/img/profile.jpg" | prepend: site.baseurl }}" width="120px" height="120px"></p>
120120
<h4>Michael</h4>
121121
<a href="https://twitter.com/{{ site.twitter_username }}" class="icon icon-twitter"></a>
122122
</div>
@@ -126,7 +126,7 @@ <h4>Michael</h4>
126126
<h2>{{ post.title}}</h2>
127127
<h5>Published {{ post.date | date: "%B %-d" }}.</h5>
128128
{{ post.excerpt }}
129-
<p><a href="{{ post.url | prepend: site.url }}" class="icon icon-link"> Read More</a></p>
129+
<p><a href="{{ post.url | prepend: site.baseurl }}" class="icon icon-link"> Read More</a></p>
130130
<br>
131131
</div>
132132
{% endfor %}

0 commit comments

Comments
 (0)