Skip to content

Commit

Permalink
Sorted some url business
Browse files Browse the repository at this point in the history
  • Loading branch information
Oliver Stapleton committed Aug 17, 2014
1 parent 89d620c commit 34a8b16
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 23 deletions.
8 changes: 4 additions & 4 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ url: "http://yourdomain.com"
# Build settings
markdown: kramdown
permalink: /:categories/:title
excerpt_separator: <!--more-->
excerpt_separator: <!--more--> #use this in posts to define how long the excerpt of the post (that is shown on the Blog page) is

colors: #in hex code if not noted else
primary: "#00b3fe"
primary_rgb: "0,179,254" #rgb. needed for transparency
primary: "#00b3fe"
primary_rgb: "0,179,254" #rgb of the primary. Needed in some places for the transparency effect.
secondary: "#384452"
link: "#428bca"
link_hover: "#01b2fe"
Expand All @@ -23,7 +23,7 @@ colors: #in hex code if not noted else

### CONTACT SETTINGS ###

# Social networks usernames (many more available: google-plus, flickr, linkedin, etc). Shown in footer.
# Social networks usernames. Many more available: google-plus, flickr, linkedin, etc). Shown in footer.
social:
- title: dribbble
url:
Expand Down
2 changes: 1 addition & 1 deletion _includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="">
<meta name="author" content="">
<link rel="shortcut icon" href="assets/ico/favicon.ico">
<link rel="shortcut icon" href="{{ "assets/ico/favicon.ico" | prepend: site.baseurl }}">

<title>{{ site.title }}{% if page.title %} - {{ page.title }}{% endif %}</title>

Expand Down
1 change: 1 addition & 0 deletions _includes/members.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,6 @@ <h5 class="ctitle">{{ member.position }}</h5>
<div class="hline"></div>
</div><! --/col-lg-3 -->
{% endfor %}

</div><! --/row -->
</div><! --/container -->
10 changes: 5 additions & 5 deletions _includes/nav.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
</div>
<div class="navbar-collapse collapse navbar-right">
<ul class="nav navbar-nav">
<li {% if page.title == "Home" %}class="active"{% endif %}><a href="/">HOME</a></li>
<li {% if page.title == "Blog" %}class="active"{% endif %}><a href="/blog/">BLOG</a></li>
<li {% if page.title == "Portfolio" %}class="active"{% endif %}><a href="/portfolio/">PORTFOLIO</a></li>
<li {% if page.title == "About" %}class="active"{% endif %}><a href="/about/">ABOUT</a></li>
<li {% if page.title == "Contact" %}class="active"{% endif %}><a href="/contact/">CONTACT</a></li>
<li {% if page.title == "Home" %}class="active"{% endif %}><a href="{{"/" | prepend: site.baseurl }}">HOME</a></li>
<li {% if page.title == "Blog" %}class="active"{% endif %}><a href="{{"/blog/" | prepend: site.baseurl }}">BLOG</a></li>
<li {% if page.title == "Portfolio" %}class="active"{% endif %}><a href="{{"/portfolio/" | prepend: site.baseurl }}">PORTFOLIO</a></li>
<li {% if page.title == "About" %}class="active"{% endif %}><a href="{{"/about/" | prepend: site.baseurl }}">ABOUT</a></li>
<li {% if page.title == "Contact" %}class="active"{% endif %}><a href="{{"/contact/" | prepend: site.baseurl }}">CONTACT</a></li>
</ul>
</div><!--/.nav-collapse -->
</div>
Expand Down
4 changes: 2 additions & 2 deletions _includes/portfolio.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
{% for project in site.categories['project'] limit:include.limit %}
<div class="portfolio-item graphic-design">
<div class="he-wrap tpl6">
<img src="/assets/img/project/{{ project.img }}" alt="">
<img src="{{ "/assets/img/project/" | prepend: site.baseurl }}{{ project.img }}" alt="">
<div class="he-view">
<div class="bg a0" data-animate="fadeIn">
<h3 class="a1" data-animate="fadeInDown">{{ project.title }}</h3>
<a data-rel="prettyPhoto" href="/assets/img/project/{{ project.img }}" class="dmbutton a2" data-animate="fadeInUp"><i class="fa fa-search"></i></a>
<a data-rel="prettyPhoto" href="{{ "/assets/img/project/" | prepend: site.baseurl }}{{ project.img }}" class="dmbutton a2" data-animate="fadeInUp"><i class="fa fa-search"></i></a>
<a href="{{ project.url }}" class="dmbutton a2" data-animate="fadeInUp"><i class="fa fa-link"></i></a>
</div><!-- he bg -->
</div><!-- he view -->
Expand Down
1 change: 0 additions & 1 deletion _posts/project/2014-04-25-your-project-name.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ author: Marcel Newman
categories:
- project
img: portfolio_01.jpg
thumb: thumb02.jpg
carousel:
- single01.jpg
- single02.jpg
Expand Down
1 change: 0 additions & 1 deletion about.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
<div class="col-lg-6">
<img class="img-responsive" src="{{ "/assets/img/about.jpg" | prepend: site.baseurl }}" alt="">
</div>

<div class="col-lg-6">
<h4>More About Our Agency.</h4>
<p>Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. </p>
Expand Down
2 changes: 1 addition & 1 deletion feed.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ layout: none
<generator>Jekyll v{{ jekyll.version }}</generator>
{% for post in site.posts limit:10 %}
<item>
<title>{{ post.categories.first }}: {{ post.title | xml_escape }}</title>
<title>{{ post.categories.first | capitalize }}: {{ post.title | xml_escape }}</title>
<description>{{ post.content | xml_escape }}</description>
<pubDate>{{ post.date | date_to_rfc822 }}</pubDate>
<link>{{ post.url | prepend: site.baseurl | prepend: site.url }}</link>
Expand Down
9 changes: 1 addition & 8 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
permalink: /
---

<!-- *****************************************************************************************************************
SERVICE LOGOS
***************************************************************************************************************** -->
<div id="service">
<div class="container">
<div class="row centered">
Expand Down Expand Up @@ -34,16 +31,12 @@ <h4>Quality Theme</h4>

{% include portfolio.html title="LATEST WORKS" limit=10 %}

<!-- *****************************************************************************************************************
MIDDLE CONTENT
***************************************************************************************************************** -->

<div class="container mtb">
<div class="row">
<div class="col-lg-4 col-lg-offset-1">
<h4>More About Our Agency.</h4>
<p>{{ site.about }}</p>
<p><br/><a href="/about/" class="btn btn-theme">More Info</a></p>
<p><br/><a href="{{ "/about/" | prepend: site.baseurl }}" class="btn btn-theme">More Info</a></p>
</div>

<div class="col-lg-3">
Expand Down

0 comments on commit 34a8b16

Please sign in to comment.