Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: dbtek/dbyll
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.0.0
Choose a base ref
...
head repository: dbtek/dbyll
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
23 contributors

Commits on Feb 25, 2014

  1. it should not be in the repository, adding to .gitignore

    @mchwalisz
    mchwalisz committed Feb 25, 2014
    Copy the full SHA
    fef2984 View commit details

  2. fix relative path error 

    - with no BASE_PATH it was referencing without base link
- with BASE_PATH there were double / added
    @mchwalisz
    mchwalisz committed Feb 25, 2014
    Copy the full SHA
    1b4c852 View commit details

Commits on Feb 26, 2014

  1. tags and categories with spaces get linked correctly

    @golov
    golov committed Feb 26, 2014
    Copy the full SHA
    c3d772d View commit details

Commits on Feb 27, 2014

  1. Merge pull request #12 from golov/master 

    tags and categories with spaces get linked correctly
    @dbtek
    dbtek committed Feb 27, 2014
    Copy the full SHA
    28f398c View commit details

Commits on Feb 28, 2014

  1. Add Thumbs.db to gitignore

    @AndreaGiardini
    AndreaGiardini committed Feb 28, 2014
    Copy the full SHA
    7a73c9d View commit details

Commits on Mar 2, 2014

  1. Merge pull request #13 from AndreaGiardini/master 

    Add Thumbs.db to gitignore
    @dbtek
    dbtek committed Mar 2, 2014
    Copy the full SHA
    fa4b44d View commit details

Commits on Mar 4, 2014

  1. Merge branch 'master' of https://github.com/mchwalisz/dbyll_theme int… 

    …o mchwalisz-master

Conflicts:
	.gitignore
    @dbtek
    dbtek committed Mar 4, 2014
    Copy the full SHA
    facb8c0 View commit details

Commits on May 6, 2014

  1. comments removed

    @dbtek
    dbtek committed May 6, 2014
    Copy the full SHA
    4fd6529 View commit details

Commits on May 25, 2014

  1. tag page with tags in alphabetic order

    @edap
    edap committed May 25, 2014
    Copy the full SHA
    5f4f4e3 View commit details

Commits on May 26, 2014

  1. Merge pull request #14 from edap/tag-page-alphabetic-order 

    tag page with tags in alphabetic order
    @dbtek
    dbtek committed May 26, 2014
    Copy the full SHA
    0a01ba1 View commit details

  2. migration to kramdown, base path cleared

    @dbtek
    dbtek committed May 26, 2014
    Copy the full SHA
    7166282 View commit details

  3. code highlight fix

    @dbtek
    dbtek committed May 26, 2014
    Copy the full SHA
    b75762d View commit details

  4. ghost version promote

    @dbtek
    dbtek committed May 26, 2014
    Copy the full SHA
    214e60a View commit details

  5. indentation fix

    @dbtek
    dbtek committed May 26, 2014
    Copy the full SHA
    0198abd View commit details

  6. files merged

    @dbtek
    dbtek committed May 26, 2014
    Copy the full SHA
    28b6284 View commit details

  7. animation type changed

    @dbtek
    dbtek committed May 26, 2014
    Copy the full SHA
    97b0ed6 View commit details

  8. post share buttons added

    @dbtek
    dbtek committed May 26, 2014
    Copy the full SHA
    83e07cd View commit details

  9. new style updates

    @dbtek
    dbtek committed May 26, 2014
    Copy the full SHA
    e53e811 View commit details

  10. updates

    @dbtek
    dbtek committed May 26, 2014
    Copy the full SHA
    da954f5 View commit details

  11. plusone js removed

    @dbtek
    dbtek committed May 26, 2014
    Copy the full SHA
    65df2e4 View commit details

  12. screenshot updated.

    @dbtek
    dbtek committed May 26, 2014
    Copy the full SHA
    b78c8cf View commit details

  13. screenshot update

    @dbtek
    dbtek committed May 26, 2014
    Copy the full SHA
    a4c97da View commit details

Commits on May 28, 2014

  1. new feature

    @dbtek
    dbtek committed May 28, 2014
    Copy the full SHA
    ad074dd View commit details

Commits on Jun 4, 2014

  1. Pagination multiconfig support 

    Dynamic support for paginate path configurations.
    @dbtek
    dbtek committed Jun 4, 2014
    Copy the full SHA
    d41558b View commit details

Commits on Jun 23, 2014

  1. Set page.title instead of site.title

    @Atry
    Atry committed Jun 23, 2014
    Copy the full SHA
    be23a72 View commit details

  2. Avoid hard-coded title

    @Atry
    Atry committed Jun 23, 2014
    Copy the full SHA
    65887c9 View commit details

  3. Should not set lang by default

    @Atry
    Atry committed Jun 23, 2014
    Copy the full SHA
    af83d4c View commit details

  4. Fix error when tags contain non-ANSI character

    @Atry
    Atry committed Jun 23, 2014
    Copy the full SHA
    0cb01f5 View commit details

  5. Merge pull request #16 from Atry/patch-2 

    Should not set `lang` by default
    @dbtek
    dbtek committed Jun 23, 2014
    Copy the full SHA
    9ebc817 View commit details

  6. Merge pull request #15 from Atry/patch-1 

    Set `page.title` instead of `site.title`
    @dbtek
    dbtek committed Jun 23, 2014
    Copy the full SHA
    3be17b6 View commit details

  7. Merge pull request #17 from Atry/non-ansi-tags 

    Fix errors when tags contain non-ANSI character
    @dbtek
    dbtek committed Jun 23, 2014
    Copy the full SHA
    8525bf2 View commit details

Commits on Jun 24, 2014

  1. Set mode to 644

    @Atry
    Atry committed Jun 24, 2014
    Copy the full SHA
    6860a71 View commit details

  2. Set the same width for all drop-down icons

    @Atry
    Atry committed Jun 24, 2014
    Copy the full SHA
    5919722 View commit details

Commits on Jul 7, 2014

  1. Merge pull request #19 from Atry/drop-down-width 

    Set the same width for all drop-down icons
    @dbtek
    dbtek committed Jul 7, 2014
    Copy the full SHA
    a67650a View commit details

Commits on Sep 5, 2014

  1. Change 'pygments' to 'highlighter'

    @fernandodev
    fernandodev committed Sep 5, 2014
    Copy the full SHA
    0c1f4f8 View commit details

  2. Change layout none to null

    @fernandodev
    fernandodev committed Sep 5, 2014
    Copy the full SHA
    398c771 View commit details

  3. Change link for linkedin : public profile

    @fernandodev
    fernandodev committed Sep 5, 2014
    Copy the full SHA
    8b88110 View commit details

Commits on Sep 6, 2014

  1. Merge pull request #21 from fernandodev/master 

    Fix Jekyll warnings
    @dbtek
    dbtek committed Sep 6, 2014
    Copy the full SHA
    5a9e5a4 View commit details

Commits on Nov 1, 2014

  1. Change highlighter attribute to pygments

    @tpgmartin
    tpgmartin committed Nov 1, 2014
    Copy the full SHA
    8b5aae0 View commit details

Commits on Nov 3, 2014

  1. Merge pull request #24 from tpgmartin/fix_syntax_highlight 

    Change highlighter attribute to pygments in config file
    @dbtek
    dbtek committed Nov 3, 2014
    Copy the full SHA
    8543107 View commit details

Commits on Jan 6, 2015

  1. Add 404 permalink

    Tom Martin committed Jan 6, 2015
    Copy the full SHA
    23184c2 View commit details

  2. Merge pull request #28 from tpgmartin/fix404PageRedirect 

    Add 404 permalink
    @dbtek
    dbtek committed Jan 6, 2015
    Copy the full SHA
    a207d42 View commit details

Commits on Apr 6, 2015

  1. Minor fix to commenting, as a space made it invalid.

    @technion
    technion committed Apr 6, 2015
    Copy the full SHA
    69486c6 View commit details

  2. Merge pull request #29 from technion/sidebar-comment 

    Minor fix to commenting, as a space made it invalid.
    @dbtek
    dbtek committed Apr 6, 2015
    Copy the full SHA
    1a93e2b View commit details

Commits on Jul 25, 2015

  1. adding google analytics and disqus comments

    @agounaris
    agounaris committed Jul 25, 2015
    Copy the full SHA
    a4f268e View commit details

Commits on Jul 27, 2015

  1. Merge pull request #33 from agounaris/ag-ga-disqus 

    adding google analytics and disqus comments
    @dbtek
    dbtek committed Jul 27, 2015
    Copy the full SHA
    725ab49 View commit details

Commits on Aug 19, 2015

  1. edited how LinkedIn links work 

    linkedin/pub/username doesn't go to the public profile on LinkedIn. The way this works is linkedin/in/vanityname. I just adjusted it to work correctly.
    Britni Alexander committed Aug 19, 2015
    Copy the full SHA
    c5c1808 View commit details

  2. Merge pull request #1 from britnia/britnia-patch-1 

    edited how LinkedIn links work
    Britni Alexander committed Aug 19, 2015
    Copy the full SHA
    c3f5633 View commit details

Commits on Aug 20, 2015

  1. Merge pull request #36 from britnia/master 

    changed LinkedIn path to correct pattern
    @dbtek
    dbtek committed Aug 20, 2015
    Copy the full SHA
    bb5a356 View commit details

Commits on Feb 11, 2016

  1. gems config added. fixes jekyll-paginate gem missing issue #39

    @dbtek
    dbtek committed Feb 11, 2016
    Copy the full SHA
    2e83dad View commit details
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
_config.yml
_site/*
*Thumbs.db
Gemfile.lock
1 change: 1 addition & 0 deletions 404.html
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
layout: page
permalink: 404.html
---
<!----------------------------------------------------------------
_ _ _ _
8 changes: 8 additions & 0 deletions Gemfile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
source 'https://rubygems.org'
gem 'jekyll'

group :jekyll_plugins do
gem "jekyll-paginate"
gem "pygments.rb"
end

23 changes: 15 additions & 8 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -4,27 +4,34 @@ dbyll
Open source stylish, minimalistic theme for jekyll.
Demo: http://dbtek.github.io/dbyll/

## New
- Dbyll for Ghost is now available. Get it [here](https://github.com/dbtek/dbyll-ghost) now.
- :new: Check out [Paper](https://github.com/dbtek/paper), new Material Design Jekyll theme.

### Features
- Pagination. (New)
- Syntax highlighting with pygments. (New)
- Responsive layout.
- Supports tags and categories.
- Social profile and bio of author.
- Bootstrap based.
- Glyphicon and Font-Awesome Icons.
- Pagination.
- Syntax highlighting with pygments.
- Disqus comments.
- :new: Custom sidebar background image.


### Download
* [Download dbyll](https://github.com/dbtek/dbyll/archive/master.zip)

### Snapshots
### Install
- You need to have [ruby](https://www.ruby-lang.org/en/documentation/installation/) installed in your system.
- Install bundler which helps in specifying and installing dependencies of any Ruby project. ```gem install bundler```
- Go to the root of the repo and run this - ```bundle install```
- Then - ```bundle exec jekyll serve```

![dbyll-screenshot](http://dbtek.github.io/dbyll/assets/media/dbyll-ss.png)
### Screenshots
![dbyll-screenshot](assets/media/dbyll-ss.png)

### License
- [MIT](http://opensource.org/licenses/MIT)



[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/dbtek/dbyll/trend.png)](https://bitdeli.com/free "Bitdeli Badge")

38 changes: 19 additions & 19 deletions _config.yml
View file
Original file line number Diff line number Diff line change
@@ -3,15 +3,25 @@
paginate: 10 # pagination based on number of posts
paginate_path: "page:num"
exclude: ["README.md"] # files to exclude
pygments: true

highlighter: rouge
markdown: kramdown
disqus: dbyll
google_analytics: dbyll
title: dbyll

defaults:
-
scope:
path: "" # empty string for all files
values:
title: dbyll

description: Stylish Jekyll Theme
author:
name: dbyll
email: dbyll@ismaildemirbilek.com
github: dbtek
twitter: asd123
twitter: dbtek
pinterest: asd123
linkedin: asd123
bio: Your stylish, minimalist theme!
@@ -21,20 +31,10 @@ rss_path: feed.xml
categories_path: categories.html
tags_path: tags.html

BASE_PATH: http://dbtek.github.io/dbyll
# set it as url of an image
# sidebar_background_image: https://www.dropbox.com/s/g9h23zrycedxtk5/sky.png?raw=1

BASE_PATH:

# All links will be namespaced by BASE_PATH if defined.
# Links in your website should always be prefixed with {{ site.BASE_PATH }}
# Do not put a "/" at the end of the url.
#
# CNAME (http://yourcustomdomain.com)
# DO NOT SET BASE_PATH JUST LEAVE IT BLANK
# (urls will be prefixed with "/" and work relatively)
#
# GitHub Pages (http://username.github.io)
# DO NOT SET BASE_PATH JUST LEAVE IT BLANK
# (urls will be prefixed with "/" and work relatively)
#
# GitHub Project Pages (http://username.github.io/project-name)
# A GitHub Project site exists in the `gh-pages` branch of one of your repositories.
# REQUIRED! Set BASE_PATH to "http://username.github.io/project-name"
plugins:
- jekyll-paginate
147 changes: 89 additions & 58 deletions _includes/default.html
View file
Original file line number Diff line number Diff line change
@@ -1,79 +1,110 @@
<!DOCTYPE html>
<html lang="tr">
<html>
<head>
<meta charset="utf-8">
<title>{{ page.title }}</title>
{% if page.description %}
<meta name="description" content="{{ page.description }}">
{% endif %}
<meta name="author" content="{{ site.author.name }}">

{% include header.html %}
<!-- Enable responsive viewport -->
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<body>
<nav class="navbar navbar-default visible-xs" role="navigation">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->

<!-- Le styles -->
<link href="{{ site.BASE_PATH }}/assets/resources/bootstrap/css/bootstrap.min.css" rel="stylesheet">
<link href="{{ site.BASE_PATH }}/assets/resources/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="{{ site.BASE_PATH }}/assets/resources/syntax/syntax.css" rel="stylesheet">
<link href="{{ site.BASE_PATH }}/assets/css/style.css" rel="stylesheet">

<!-- Le fav and touch icons -->
<!-- Update these with your own images
<link rel="shortcut icon" href="images/favicon.ico">
<link rel="apple-touch-icon" href="images/apple-touch-icon.png">
<link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png">
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
-->

<link rel="alternate" type="application/rss+xml" title="{{ site.name }}" href="{{ site.BASE_PATH }}/feed.xml">
</head>

<body>
<nav class="navbar navbar-default visible-xs" role="navigation">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
{% if site.author.github %}
<a type="button" class="navbar-toggle nav-link" href="http://github.com/{{ site.author.github }}">
<i class="fa fa-github"></i>
</a>
{% endif %}
{% if site.author.twitter %}
<a type="button" class="navbar-toggle nav-link" href="http://twitter.com/{{ site.author.twitter }}">
<i class="fa fa-twitter"></i>
</a>
{% endif %}
{% if site.author.email %}
<a type="button" class="navbar-toggle nav-link" href="mailto:{{ site.author.email }}">
<i class="fa fa-envelope"></i>
</a>
{% endif %}
<i class="fa fa-github"></i>
</a>
{% endif %}
{% if site.author.twitter %}
<a type="button" class="navbar-toggle nav-link" href="http://twitter.com/{{ site.author.twitter }}">
<i class="fa fa-twitter"></i>
</a>
{% endif %}
{% if site.author.email %}
<a type="button" class="navbar-toggle nav-link" href="mailto:{{ site.author.email }}">
<i class="fa fa-envelope"></i>
</a>
{% endif %}
<a class="navbar-brand" href="{{ site.BASE_PATH }}/">
<img src="http://www.gravatar.com/avatar/{{site.author.email_md5}}?s=35" class="img-circle" />
<img src="//www.gravatar.com/avatar/{{site.author.email_md5}}?s=35" class="img-circle" />
{{ site.title }}
</a>
</div>
</div>

<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<li class="active"><a href="{{ site.BASE_PATH }}/">Home</a></li>
<li><a href="{{ site.BASE_PATH}}/{{ site.categories_path }}">Categories</a></li>
<li><a href="{{ site.BASE_PATH}}/{{ site.tags_path }}">Tags</a></li>
<li class="active"><a href="{{ site.BASE_PATH }}/">Home</a></li>
<li><a href="{{ site.BASE_PATH}}/{{ site.categories_path }}">Categories</a></li>
<li><a href="{{ site.BASE_PATH}}/{{ site.tags_path }}">Tags</a></li>
</ul>
</div><!-- /.navbar-collapse -->
</nav>

<!-- nav-menu-dropdown -->
<div class="btn-group hidden-xs" id="nav-menu">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-bars"></i>
</button>
<ul class="dropdown-menu" role="menu">
<li><a href="{{ site.BASE_PATH}}/"><i class="fa fa-home"></i> Home</a></li>
<li><a href="{{ site.BASE_PATH}}/{{ site.categories_path }}"><i class="fa fa-folder"></i> Categories</a></li>
<li><a href="{{ site.BASE_PATH}}/{{ site.tags_path }}"><i class="fa fa-tags"></i> Tags</a></li>
<li class="divider"></li>
<li><a href="#"><i class="fa fa-arrow-up"></i> Top of Page</a></li>
</ul>
</div>
</div><!-- /.navbar-collapse -->
</nav>

<div class="col-sm-3 sidebar hidden-xs">
{% include sidebar.html %}
</div>
<!-- nav-menu-dropdown -->
<div class="btn-group hidden-xs" id="nav-menu">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-bars"></i>
</button>
<ul class="dropdown-menu" role="menu">
<li><a href="{{ site.BASE_PATH}}/"><i class="fa fa-home"></i>Home</a></li>
<li><a href="{{ site.BASE_PATH}}/{{ site.categories_path }}"><i class="fa fa-folder"></i>Categories</a></li>
<li><a href="{{ site.BASE_PATH}}/{{ site.tags_path }}"><i class="fa fa-tags"></i>Tags</a></li>
<li class="divider"></li>
<li><a href="#"><i class="fa fa-arrow-up"></i>Top of Page</a></li>
</ul>
</div>

<div class="col-sm-9 col-sm-offset-3">
{{ content }}
<div class="col-sm-3 sidebar hidden-xs" style="{% if site.sidebar_background_image %}background: url({{site.sidebar_background_image}}) no-repeat !important;{% endif %}">
{% include sidebar.html %}
</div>

{% include footer.html %}
<div class="col-sm-9 col-sm-offset-3">
{{ content }}

</div>
<footer>
<hr/>
<p>
&copy; {{ site.time | date: '%Y' }} {{ site.author.name }} with <a href="http://jekyllrb.com/">Jekyll</a>. Theme: <a href="https://github.com/dbtek/dbyll">dbyll</a> by dbtek.
</p>
</footer>
</div>


<script type="text/javascript" src="{{ site.BASE_PATH }}/assets/resources/jquery/jquery.min.js"></script>
<script type="text/javascript" src="{{ site.BASE_PATH }}/assets/resources/bootstrap/js/bootstrap.min.js"></script>
<script type="text/javascript" src="{{ site.BASE_PATH }}/assets/js/app.js"></script>
</body>

</body>
</html>

15 changes: 15 additions & 0 deletions _includes/disqus.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{% if site.disqus %}
<div id="disqus_thread"></div>
<script type="text/javascript">
/* * * CONFIGURATION VARIABLES * * */
var disqus_shortname = '{{ site.disqus }}';

/* * * DON'T EDIT BELOW THIS LINE * * */
(function() {
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
})();
</script>
<noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript" rel="nofollow">comments powered by Disqus.</a></noscript>
{% endif %}
9 changes: 0 additions & 9 deletions _includes/footer.html
View file

This file was deleted.

31 changes: 0 additions & 31 deletions _includes/header.html
View file

This file was deleted.

Empty file modified _includes/page.html
100755 → 100644
View file
Empty file.
Loading