Skip to content

Commit d62858a

Browse files
tworidetworide
committed
Merge branch 'v2'
Conflicts: index.html
2 parents eede84b + cf5195d commit d62858a

File tree

541 files changed

+92316
-210
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

541 files changed

+92316
-210
lines changed

‎.gitignore‎

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,6 @@
1-
.build/
2-
*.class
3-
*.o
4-
*.pyc
5-
*.pyo
61
*.tmp
72
.*.swp
83
*~
94
.DS_Store
10-
target/
11-
nbactions.xml
12-
*.vpp~*
13-
*.ipr
14-
*.iml
15-
*.iws
16-
*.log
17-
.classpath
18-
.project
19-
.settings/
20-
*.sqlite3
21-
filestore/
22-
tags
23-
.ropeproject/
24-
doc/build/
25-
doc/devilry.github.com/
26-
.coverage
27-
coverage_html_report/
28-
cookies.txt
29-
.devilry/
305
*.bak
31-
devilry_xmlrpc_client.egg-info/
32-
dist/
33-
cscope.out
34-
Session.vim
35-
deliverystore/
36-
exampledata-backup.tar.bz2
6+
_site

‎README.md‎

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,43 @@
1-
devilry.github.com
2-
==================
1+
# devilry.github.com
2+
33

44
Devilry website
55
This is the main website.
66

77
Contains links to different part of the documentation. etc.
8+
9+
## Testing it locally
10+
11+
Install jekyll locally (http://jekyllrb.com/), run:
12+
13+
$ jekyll serve --watch
14+
15+
Then open http://localhost:4000/.
16+
17+
18+
## Components
19+
We use these components to build the website.
20+
21+
### Jekyll
22+
Jekyll is the blog aware static site builder supported by github pages. See:
23+
https://help.github.com/categories/20/articles and http://jekyllrb.com/.
24+
25+
### Twitter Bower
26+
A package manager for the web. We use it to update our CSS and JavaScript
27+
dependencies, like Bootstrap and jQuery. https://github.com/bower/bower.
28+
Configured in ``component.json``, and installs packages to ``components/``.
29+
This means that you should **never edit anything in components/**.
30+
31+
### Twitter Bootstrap
32+
CSS and javascript library. See: http://twitter.github.io/bootstrap/index.html.
33+
34+
### Less
35+
CSS builder with lots of useful additions, like variables, reusable mixins,
36+
etc. Used by Twitter Bootstrap, and we use it to extend and customize
37+
Bootstrap. See: http://lesscss.org/.
38+
39+
### jQuery
40+
Required by Twitter Bootstrap javascript components.
41+
42+
### Font Awesome
43+
The iconic font designed for Bootstrap

‎_config.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
name: Your New Jekyll Site
2+
pygments: true

‎_includes/.keep‎

Whitespace-only changes.

‎_layouts/base.html‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8">
5+
<title>{{ page.title }}</title>
6+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7+
<meta name="description" content="">
8+
<meta name="author" content="">
9+
10+
11+
<!-- Le styles -->
12+
<link rel="stylesheet/less" href="less/styles.less">
13+
<!--<link href="../assets/css/bootstrap-responsive.css" rel="stylesheet">-->
14+
<script src="less-1.3.3.min.js" type="text/javascript"></script>
15+
16+
<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
17+
<!--[if lt IE 9]>
18+
<script src="components/html5shiv/src/html5shiv.js"></script>
19+
<![endif]-->
20+
21+
<!-- Fav and touch icons -->
22+
<!--<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">-->
23+
<!--<link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">-->
24+
<!--<link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">-->
25+
<!--<link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">-->
26+
<!--<link rel="shortcut icon" href="../assets/ico/favicon.png">-->
27+
<link rel="apple-touch-icon" href="favicons/apple-touch-icon.png" />
28+
<link rel="shortcut icon" href="favicons/favicon.ico" />
29+
</head>
30+
31+
<body>
32+
{{ content }}
33+
</body>
34+
</html>

‎_layouts/default.html‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8">
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
6+
<title>{{ page.title }}</title>
7+
<meta name="viewport" content="width=device-width">
8+
9+
<!-- syntax highlighting CSS -->
10+
<link rel="stylesheet" href="/css/syntax.css">
11+
12+
<!-- Custom CSS -->
13+
<link rel="stylesheet" href="/css/main.css">
14+
15+
</head>
16+
<body>
17+
18+
<div class="container">
19+
<div class="site">
20+
<div class="header">
21+
<h1 class="title"><a href="/">{{ site.name }}</a></h1>
22+
<a class="extra" href="/">home</a>
23+
</div>
24+
25+
{{ content }}
26+
27+
<div class="footer">
28+
<div class="contact">
29+
<p>
30+
Your Name<br />
31+
What You Are<br />
32+
[email protected]
33+
</p>
34+
</div>
35+
<div class="contact">
36+
<p>
37+
<a href="http://github.com/yourusername/">github.com/yourusername</a><br />
38+
<a href="http://twitter.com/yourusername/">twitter.com/yourusername</a><br />
39+
</p>
40+
</div>
41+
</div>
42+
</div>
43+
</div> <!-- /container -->
44+
45+
</body>
46+
</html>

‎_layouts/post.html‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
layout: default
3+
---
4+
<h2>{{ page.title }}</h2>
5+
<p class="meta">{{ page.date | date_to_string }}</p>
6+
7+
<div class="post">
8+
{{ content }}
9+
</div>

‎_posts/2013-06-19-welcome-to-jekyll.markdown‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
layout: post
3+
title: "Welcome to Jekyll!"
4+
date: 2013-06-19 18:00:42
5+
categories: jekyll update
6+
---
7+
8+
You'll find this post in your `_posts` directory - edit this post and re-build (or run with the `-w` switch) to see your changes!
9+
To add new posts, simply add a file in the `_posts` directory that follows the convention: YYYY-MM-DD-name-of-post.ext.
10+
11+
Jekyll also offers powerful support for code snippets:
12+
13+
{% highlight ruby %}
14+
def print_hi(name)
15+
puts "Hi, #{name}"
16+
end
17+
print_hi('Tom')
18+
#=> prints 'Hi, Tom' to STDOUT.
19+
{% endhighlight %}
20+
21+
Check out the [Jekyll docs][jekyll] for more info on how to get the most out of Jekyll. File all bugs/feature requests at [Jekyll's GitHub repo][jekyll-gh].
22+
23+
[jekyll-gh]: https://github.com/mojombo/jekyll
24+
[jekyll]: http://jekyllrb.com

‎component.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"name": "devilry.github.com",
3+
"version": "0.0.0",
4+
"dependencies": {
5+
"jquery": "~1.8.3",
6+
"bootstrap": "~2.3.2",
7+
"html5shiv": "~3.6.2",
8+
"font-awesome": "~3.2.1"
9+
}
10+
}

‎components/bootstrap/.gitignore‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Numerous always-ignore extensions
2+
*.diff
3+
*.err
4+
*.orig
5+
*.log
6+
*.rej
7+
*.swo
8+
*.swp
9+
*.zip
10+
*.vi
11+
*~
12+
*.sass-cache
13+
14+
# OS or Editor folders
15+
.DS_Store
16+
._*
17+
Thumbs.db
18+
.cache
19+
.project
20+
.settings
21+
.tmproj
22+
*.esproj
23+
nbproject
24+
*.sublime-project
25+
*.sublime-workspace
26+
27+
# Komodo
28+
*.komodoproject
29+
.komodotools
30+
31+
# Folders to ignore
32+
.hg
33+
.svn
34+
.CVS
35+
.idea
36+
node_modules
37+
dist

0 commit comments

Comments
 (0)