Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make theme compatible with Jekyll remote_theme feature #14

Open
wants to merge 28 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
445dcfd
Added Gemfile
lsolesen Apr 21, 2018
297f1bb
Made language a configuration
lsolesen Apr 21, 2018
d911db2
Made the HTML title configurable
lsolesen Apr 21, 2018
eaa56e1
Make it possible to make a meta description
lsolesen Apr 21, 2018
5f86c66
Refactored contact
lsolesen Apr 21, 2018
bf69f42
Enabled Travis integration
lsolesen Apr 21, 2018
9efb893
Added default to language
lsolesen Apr 21, 2018
cb2cc67
Remove http(s): from links
lsolesen Apr 21, 2018
150407d
Refactored a little bit
lsolesen Apr 21, 2018
a9fee20
Refactored contact
lsolesen Apr 21, 2018
1861d2d
Refactored navigation (#4)
lsolesen Apr 21, 2018
661d5c6
Make it possible to translate the UI (#5)
lsolesen Apr 21, 2018
d184b3b
Refactored services (#6)
lsolesen Apr 21, 2018
7b9fa6a
Fixing for only two services
lsolesen Apr 21, 2018
7e172b1
Fixing for only two services
lsolesen Apr 21, 2018
77123ed
Use locale instead of language
lsolesen Apr 21, 2018
f6b81d8
Refactored index.html to have the actual content instead of the layout
lsolesen Apr 22, 2018
bdb32bf
Refactored services for easier inclusions of different pages
lsolesen Apr 22, 2018
af18407
Fixes to services and aside
lsolesen Apr 22, 2018
38f6798
Refactored call to action
lsolesen Apr 22, 2018
a1263e1
Refactored portfolio and better Travis (#3)
lsolesen Apr 22, 2018
29d69f7
Refactored header.html
lsolesen Apr 22, 2018
31fa945
Fixed top link and services adjustment
lsolesen Apr 22, 2018
1c06665
Support analytics (#2)
lsolesen Apr 22, 2018
d9dc5d8
Added skins
lsolesen Apr 22, 2018
6c33db7
Fixing hash
lsolesen Apr 24, 2018
dc862be
Fixed error with bootstrap inclusion
lsolesen Jan 31, 2019
3f943b7
jekyll-include-cache is not used
lsolesen Jan 31, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
language: ruby
rvm:
- 2.2
script:
- bundle exec jekyll build
- bundle exec htmlproofer ./_site --assume-extension --only-4xx --check-favicon --check-html
env:
global:
- NOKOGIRI_USE_SYSTEM_LIBRARIES=true # speeds up installation of html-proofer
3 changes: 3 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source "https://rubygems.org"
gem 'html-proofer'
gemspec
135 changes: 135 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
PATH
remote: .
specs:
creative-theme-jekyll (1.0.0)
jekyll (~> 3.7)
jekyll-data (~> 1.0)
jekyll-feed (~> 0.10)
jekyll-gist (~> 1.5)
jekyll-include-cache (~> 0.1)
jekyll-paginate (~> 1.1)
jekyll-sitemap (~> 1.2)
jemoji (~> 0.10)

GEM
remote: https://rubygems.org/
specs:
activesupport (5.2.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
colorator (1.1.0)
colorize (0.8.1)
concurrent-ruby (1.1.4)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
ethon (0.12.0)
ffi (>= 1.3.0)
eventmachine (1.2.7)
faraday (0.15.4)
multipart-post (>= 1.2, < 3)
ffi (1.10.0)
forwardable-extended (2.6.0)
gemoji (3.0.0)
html-pipeline (2.10.0)
activesupport (>= 2)
nokogiri (>= 1.4)
html-proofer (3.9.2)
activesupport (>= 4.2, < 6.0)
addressable (~> 2.3)
colorize (~> 0.8)
mercenary (~> 0.3.2)
nokogiri (~> 1.8.1)
parallel (~> 1.3)
typhoeus (~> 1.3)
yell (~> 2.0)
http_parser.rb (0.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jekyll (3.7.4)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
i18n (~> 0.7)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 2.0)
kramdown (~> 1.14)
liquid (~> 4.0)
mercenary (~> 0.3.3)
pathutil (~> 0.9)
rouge (>= 1.7, < 4)
safe_yaml (~> 1.0)
jekyll-data (1.0.0)
jekyll (~> 3.3)
jekyll-feed (0.11.0)
jekyll (~> 3.3)
jekyll-gist (1.5.0)
octokit (~> 4.2)
jekyll-include-cache (0.1.0)
jekyll (~> 3.3)
jekyll-paginate (1.1.0)
jekyll-sass-converter (1.5.2)
sass (~> 3.4)
jekyll-sitemap (1.2.0)
jekyll (~> 3.3)
jekyll-watch (2.1.2)
listen (~> 3.0)
jemoji (0.10.1)
gemoji (~> 3.0)
html-pipeline (~> 2.2)
jekyll (~> 3.0)
kramdown (1.17.0)
liquid (4.0.0)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
mercenary (0.3.6)
mini_portile2 (2.3.0)
minitest (5.11.3)
multipart-post (2.0.0)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
octokit (4.13.0)
sawyer (~> 0.8.0, >= 0.5.3)
parallel (1.12.1)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (2.0.5)
rake (10.5.0)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
rouge (2.2.1)
ruby_dep (1.5.0)
safe_yaml (1.0.4)
sass (3.7.3)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sawyer (0.8.1)
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
thread_safe (0.3.6)
typhoeus (1.3.1)
ethon (>= 0.9.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
yell (2.0.7)

PLATFORMS
ruby

DEPENDENCIES
bundler (~> 1.15)
creative-theme-jekyll!
html-proofer
rake (~> 10.0)

BUNDLED WITH
1.16.6
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,4 @@ See it live in action at <https://volny.github.io/creative-theme-jekyll/>
## To use the Creative Theme template in your project

- Start by adding your info in `_config.yml`
- In `_layouts/front.html` reorder or remove section as you prefer.

- In `index.html` reorder or remove section as you prefer.
10 changes: 7 additions & 3 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
# Site settings
title:
locale: en
title: Creative - Start Bootstrap Theme
email:
description: > # this means to ignore newlines until "baseurl:"
baseurl: "" # the subpath of your site, e.g. /blog/
url: "" # the base hostname & protocol for your site

twitter_username:
github_username:
# Analytics
analytics:
provider : "google-universal" # false # false (default), "google", "google-universal", "custom"
google:
tracking_id : ""

# Build settings
markdown: kramdown
15 changes: 15 additions & 0 deletions _data/contact.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
- name: Twitter
icon: fa fa-twitter fa-3x
url: https://twitter.com/ # http://twitter.com/username
text: ""
offset: 2
- name: Email
icon: fa fa-envelope-o fa-3x
url: "" # mailto:[email protected]
text: ""
offset: 1
- name: Github
icon: fa fa-github fa-3x
url: https://github.com/lsolesen/creative-theme-jekyll
text: creative-theme
offset: 1
9 changes: 9 additions & 0 deletions _data/navigation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
main:
- title: "About"
url: "#about"
- title: "Services"
url: "#services"
- title: "Portfolio"
url: "#portfolio"
- title: "Contact"
url: "#contact"
23 changes: 23 additions & 0 deletions _data/ui-text.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# User interface text and labels

# English (default)
# -----------------
en: &DEFAULT_EN
toggle_navigation : "Toggle navigation"
contact_heading : "Let's Get In Touch!"
contact_text : "Ready to start your next project with us? That's great! Give us a call or send us an email and we will get back to you as soon as possible!"
en-US:
<<: *DEFAULT_EN
en-CA:
<<: *DEFAULT_EN
en-GB:
<<: *DEFAULT_EN
en-AU:
<<: *DEFAULT_EN

# Danish
# ------
da: &DEFAULT_DA
toggle_navigation : "Vis/skjul navigationen"
da-DK:
<<: *DEFAULT_DA
8 changes: 8 additions & 0 deletions _includes/analytics-providers/google-universal.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
ga('create', '{{ site.analytics.google.tracking_id }}', 'auto');
ga('send', 'pageview');
</script>
8 changes: 8 additions & 0 deletions _includes/analytics.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{% if jekyll.environment == 'production' and site.analytics.provider and page.analytics != false %}

{% case site.analytics.provider %}
{% when "google-universal" %}
{% include /analytics-providers/google-universal.html %}
{% endcase %}

{% endif %}
17 changes: 9 additions & 8 deletions _includes/aside.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<aside class="bg-dark">
<div class="container text-center">
<div class="call-to-action">
<h2>Free Download at Start Bootstrap!</h2>
<a href="#" class="btn btn-default btn-xl wow tada">Download Now!</a>
</div>
</div>
</aside>
<aside class="bg-dark">
<div class="container text-center">
<div class="call-to-action">
<h2>{{ include.heading | default: page.aside.heading }}</h2>
<p>{{ include.text | default: page.aside.text }}</p>
<a href="{{ include.cta_url | default: page.aside.cta_url }}" class="btn btn-default btn-xl wow tada">{{ include.cta_text | default: page.aside.cta_text }}</a>
</div>
</div>
</aside>
6 changes: 3 additions & 3 deletions _includes/call-to-action.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<div class="container">
<div class="row">
<div class="col-lg-8 col-lg-offset-2 text-center">
<h2 class="section-heading">We've got what you need!</h2>
<h2 class="section-heading">{{ include.heading | default: page.cta.heading }}</h2>
<hr class="light">
<p class="text-faded">Start Bootstrap has everything you need to get your new website up and running in no time! All of the templates and themes on Start Bootstrap are open source, free to download, and easy to use. No strings attached!</p>
<a href="#" class="btn btn-default btn-xl">Get Started!</a>
<p class="text-faded">{{ include.text | default: page.cta.text }}</p>
<a href="{{ include.url | default: page.cta.url }}" class="btn btn-default btn-xl">{{ include.button | default: page.cta.button }}</a>
</div>
</div>
</div>
Expand Down
26 changes: 8 additions & 18 deletions _includes/contact.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,18 @@
<div class="container">
<div class="row">
<div class="col-lg-8 col-lg-offset-2 text-center">
<h2 class="section-heading">Let's Get In Touch!</h2>
<h2 class="section-heading">{{ site.data.ui-text[site.locale].contact_heading | default: "Let's Get In Touch!" }}</h2>
<hr class="primary">
<p>Ready to start your next project with us? That's great! Give us a call or send us an email and we will get back to you as soon as possible!</p>
<p>{{ site.data.ui-text[site.locale].contact_text | default: "Ready to start your next project with us? That's great! Give us a call or send us an email and we will get back to you as soon as possible!" }}</p>
</div>
<div class="col-lg-2 col-lg-offset-2 text-center">
<a href="https://twitter.com/{{ site.twitter_username }}">
<i class="fa fa-twitter fa-3x wow bounceIn" data-wow-delay=".1s"></i>
<p>{{ site.twitter_username }}</p>
</a>
</div>
<div class="col-lg-2 col-lg-offset-1 text-center">
<a href="mailto:{{ site.email }}">
<i class="fa fa-envelope-o fa-3x wow bounceIn" data-wow-delay=".1s"></i>
<p>{{ site.email }}</p>
</a>
</div>
<div class="col-lg-2 col-lg-offset-1 text-center">
<a href="https://github.com/{{ site.github_username }}">
<i class="fa fa-github fa-3x wow bounceIn" data-wow-delay=".1s"></i>
<p>{{ site.github_username }}</p>
{% for contact in site.data.contact %}
<div class="col-lg-2 col-lg-offset-{{ contact.offset }} text-center">
<a href="{{ contact.url }}">
<i class="{{ contact.icon }} wow bounceIn" data-wow-delay=".1s"></i>
<p>{{ contact.text }}</p>
</a>
</div>

{% endfor %}
</div>
</section>
20 changes: 10 additions & 10 deletions _includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,30 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="">
<meta name="description" content="{{ page.description | default: site.description }}">
<meta name="author" content="">

<title>Creative - Start Bootstrap Theme</title>
<title>{{ page.title | default: site.title }}</title>

<!-- Bootstrap Core CSS -->
<link rel="stylesheet" href="css/bootstrap.min.css" type="text/css">
<link rel="stylesheet" href="{{ "/css/bootstrap.min.css" | relative_url }}" type="text/css">

<!-- Custom Fonts -->
<link href='http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800' rel='stylesheet' type='text/css'>
<link href='http://fonts.googleapis.com/css?family=Merriweather:400,300,300italic,400italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="font-awesome/css/font-awesome.min.css" type="text/css">
<link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800' rel='stylesheet' type='text/css'>
<link href='//fonts.googleapis.com/css?family=Merriweather:400,300,300italic,400italic,700,700italic,900,900italic' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="{{ "/font-awesome/css/font-awesome.min.css" | relative_url }}" type="text/css">

<!-- Plugin CSS -->
<link rel="stylesheet" href="css/animate.min.css" type="text/css">
<link rel="stylesheet" href="{{ "/css/animate.min.css" | relative_url }}" type="text/css">

<!-- Custom CSS -->
<link rel="stylesheet" href="css/main.css" type="text/css">
<link rel="stylesheet" href="{{ "/css/main.css" | relative_url }}" type="text/css">

<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
<script src="//oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
<script src="//oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
<![endif]-->

</head>
14 changes: 9 additions & 5 deletions _includes/header.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
<header>
<header style="background-image: url('{{ page.header.image | relative_url }}');">
<div class="header-content">
<div class="header-content-inner">
<h1>Your Favorite Source of Free Bootstrap Themes</h1>
<hr>
<p>Start Bootstrap can help you build better websites using the Bootstrap CSS framework! Just download your template and start going, no strings attached!</p>
<a href="#about" class="btn btn-primary btn-xl page-scroll">Find Out More</a>
{% if page.header.logo %}
<img src="{{ page.header.logo | relative_url }}" alt="{{ site.title }}" title="{{ page.title | default: site.title }}" />
{% else %}
<h1>{{ page.header.heading | default: page.title | default: site.title }}</h1>
<hr>
{% endif %}
<p>{{ page.header.text }}</p>
<a href="{{ page.header.cta_url }}" class="btn btn-primary btn-xl page-scroll">{{ page.header.cta_button }}</a>
</div>
</div>
</header>
Loading