From 4c54362f36e75f67f2f915b8eca89a1c2f0ff04e Mon Sep 17 00:00:00 2001 From: rod Date: Sun, 10 Feb 2013 12:22:29 +0000 Subject: [PATCH 1/4] adding new tab for blog posts --- _config.yml | 12 +++++++++ _includes/footer.html | 16 ++++++++++++ _includes/header.html | 41 ++++++++++++++++++++++++++++++ _includes/tabs.html | 5 ++-- _layouts/default.html | 58 +++---------------------------------------- _layouts/post.html | 10 ++++++++ blog.html | 28 +++++++++++++++++++++ css/main.css | 34 +++++++++++++++++++++++++ index.html | 1 + videos.html | 1 + 10 files changed, 149 insertions(+), 57 deletions(-) create mode 100644 _includes/footer.html create mode 100644 _includes/header.html create mode 100644 _layouts/post.html create mode 100644 blog.html diff --git a/_config.yml b/_config.yml index 8968d13..f8e2f56 100644 --- a/_config.yml +++ b/_config.yml @@ -2,3 +2,15 @@ # enable dynamic recomimpiling of templates auto: true +# the site name +name: Unified Diff + +# a description of the site +description: Cardiff Tech Meetup + +# url to the site +url: http://unifieddiff.co.uk + +# enable code highlighting +pygments: true + diff --git a/_includes/footer.html b/_includes/footer.html new file mode 100644 index 0000000..55ce57b --- /dev/null +++ b/_includes/footer.html @@ -0,0 +1,16 @@ + +
+
+
+

get involved

+

If you'd like to give a tech talk, or have something you'd + like to share at a future event, we'd love to hear from you. + Contact us via Twitter - @unifieddiff

+
+
+
+ + + + + diff --git a/_includes/header.html b/_includes/header.html new file mode 100644 index 0000000..ff8fd8a --- /dev/null +++ b/_includes/header.html @@ -0,0 +1,41 @@ + + + + + unified.diff - {{ page.title }} + + + + + + + + + + +
+
+
+ +

unified.diff

+
+
+
+
+
+

For too long, Cardiff's software development community has been + fragmented by language, discipline, and platform.

+ +

unified.diff is a + monthly meet-up for anybody involved or interested in the field of software + development.

+ +

We hold tech talks, and trade war stories.

+
+
+
+ diff --git a/_includes/tabs.html b/_includes/tabs.html index c0f48ab..8ef8fc0 100644 --- a/_includes/tabs.html +++ b/_includes/tabs.html @@ -2,8 +2,9 @@ diff --git a/_layouts/default.html b/_layouts/default.html index ece340f..d409bf1 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -1,58 +1,6 @@ - - - - - unified.diff - +{% include header.html %} - - - +{{ content }} - - +{% include footer.html %} - -
-
-
- -

unified.diff

-
-
-
-
-
-

For too long, Cardiff's software development community has been - fragmented by language, discipline, and platform.

- -

unified.diff is a - monthly meet-up for anybody involved or interested in the field of software - development.

- -

We hold tech talks, and trade war stories.

-
-
-
- - {{ content }} - -
-
-
-

get involved

-

If you'd like to give a tech talk, or have something you'd - like to share at a future event, we'd love to hear from you. - Contact us via Twitter - @unifieddiff

-
-
-
-
- - - - diff --git a/_layouts/post.html b/_layouts/post.html new file mode 100644 index 0000000..6e11648 --- /dev/null +++ b/_layouts/post.html @@ -0,0 +1,10 @@ +{% include header.html %} + +{% assign tab-blog = 'active' %} +{% include tabs.html %} + +
+ {{ content }} +
+ +{% include footer.html %} diff --git a/blog.html b/blog.html new file mode 100644 index 0000000..b8954d3 --- /dev/null +++ b/blog.html @@ -0,0 +1,28 @@ +--- +layout: default +title: Blog +--- + +{% assign tab-blog = 'active' %} +{% include tabs.html %} + +
+
+
    + {% for post in site.posts %} +
  • +

    + {{ post.title }} +

    +

    + {{ post.description }} +

    +

    + {{ post.date | date: "%a, %d %b %Y" }} +

    +
  • + {% endfor %} +
+
+
+ diff --git a/css/main.css b/css/main.css index 2e1ca05..f23cabf 100755 --- a/css/main.css +++ b/css/main.css @@ -57,6 +57,7 @@ section:nth-of-type(odd) h2:before { h3 { font-size: 16px; + margin: 25px 0 15px 0; } .unified { @@ -128,3 +129,36 @@ dd { outline:none; overflow:hidden; } + +/*======== blog ==========*/ + +.posts { + margin: 0 0 0 20px; + list-style-type: none; +} + +.posts .post { + padding: 0 0 20px 0; + border-bottom: 1px #ddd solid; +} + +.posts h2 { + margin-bottom: 5px; +} + +.posts h2:before { + content: none; +} + +.posts .summary { + font-style: italic; +} + +.posts .date { + color: #aaa; +} + +.post pre { + margin: 15px; +} + diff --git a/index.html b/index.html index 0b2705c..e99ea9a 100755 --- a/index.html +++ b/index.html @@ -1,5 +1,6 @@ --- layout: default +title: Home --- {% assign tab-index = 'active' %} diff --git a/videos.html b/videos.html index 4775ca8..d28b332 100644 --- a/videos.html +++ b/videos.html @@ -1,5 +1,6 @@ --- layout: default +title: Videos --- {% assign tab-videos = 'active' %} From 10e2a5438ff58579c8383a2cdec558bb8de430a1 Mon Sep 17 00:00:00 2001 From: rod Date: Sun, 10 Feb 2013 16:07:35 +0000 Subject: [PATCH 2/4] added initial blog post --- _posts/2013-02-10-welcome-to-the-blog.html | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 _posts/2013-02-10-welcome-to-the-blog.html diff --git a/_posts/2013-02-10-welcome-to-the-blog.html b/_posts/2013-02-10-welcome-to-the-blog.html new file mode 100644 index 0000000..ec821f4 --- /dev/null +++ b/_posts/2013-02-10-welcome-to-the-blog.html @@ -0,0 +1,37 @@ +--- +layout: post +title: Welcome to the blog +description: Welcome to the new Unified Diff blog! +--- + +

Welcome to the Blog

+ +

We're always looking for more ways to get as many people as possible +involved and contributing to Unified Diff, it's main purpose is to get +everyone active and involved in the scene. People should feel like this +is their meetup, not just something they attend.

+ +

So as a new outlet we've decided to start a blog!

+ +

Contributing

+ +If you'd like to write something on the blog then you'll need to first fork the repository, +add your post, and then open a pull request. + +

Blog posts need to be stored in the _posts directory, and are +simply HTML files. Take a look at the source of this post to see an example. +You should be able to easily include source code snippets like this...

+ +{% highlight php %} +class Hello { + public function bar() { + // etc... + } +} +{% endhighlight %} + +

And any other styling you need, add it to the CSS. If you have any problems +then you can tweet us, jump on IRC, or post to the mailing list.

+ +

We look forward to reading your work!

+ From 59c662f02c5a67d02591efc2580885b3fe459ba9 Mon Sep 17 00:00:00 2001 From: rod Date: Sun, 10 Feb 2013 16:07:47 +0000 Subject: [PATCH 3/4] added RSS feed for blog --- _includes/tabs.html | 1 + css/main.css | 10 ++++++++++ feed.xml | 22 ++++++++++++++++++++++ img/icons-22.png | Bin 5439 -> 6715 bytes 4 files changed, 33 insertions(+) create mode 100644 feed.xml diff --git a/_includes/tabs.html b/_includes/tabs.html index 8ef8fc0..ae19407 100644 --- a/_includes/tabs.html +++ b/_includes/tabs.html @@ -1,6 +1,7 @@
+ Blog RSS