diff --git a/.gitignore b/.gitignore index badbc02..852a919 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ _site .sass-cache +.idea +*~ diff --git a/_config.yml b/_config.yml index 98fad95..4228c74 100644 --- a/_config.yml +++ b/_config.yml @@ -2,7 +2,7 @@ title: Hack Im Pott email: hip@chaospott.de description: > # this means to ignore newlines until "baseurl:" - hack im pott, an event based in the ruhrgebiet, germany, focusing on workshops + hack im pott, an workshop focused event, located in the ruhr area, germany. baseurl: "" url: "http://hackimpott.de" twitter_username: hackimpott diff --git a/_includes/footer.html b/_includes/footer.html index be3976f..6222f8d 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,55 +1,53 @@ - +
+ +
+ \ No newline at end of file diff --git a/_includes/head.html b/_includes/head.html index 211a19b..c0f5b6e 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -5,12 +5,13 @@ {% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %} - - - - + - + + + + + diff --git a/_includes/header.html b/_includes/header.html index cfe381f..fbd2c11 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -1,27 +1,40 @@ -
- -
- - {{ site.title }} - - - -
- -
+ diff --git a/_layouts/default.html b/_layouts/default.html index e4ab96f..e6166f2 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -1,20 +1,11 @@ - {% include head.html %} - - - {% include header.html %} - -
-
- {{ content }} -
-
- - {% include footer.html %} - + {% include header.html %} +
+ {{ content }} + {% include footer.html %} +
- diff --git a/_posts/2015-09-02-welcome-to-jekyll.markdown b/_posts/2015-09-02-welcome-to-jekyll.markdown deleted file mode 100644 index aa31997..0000000 --- a/_posts/2015-09-02-welcome-to-jekyll.markdown +++ /dev/null @@ -1,25 +0,0 @@ ---- -layout: post -title: "Welcome to Jekyll!" -date: 2015-09-02 20:11:44 -categories: jekyll update ---- -You’ll find this post in your `_posts` directory. Go ahead and edit it and re-build the site to see your changes. You can rebuild the site in many different ways, but the most common way is to run `jekyll serve --watch`, which launches a web server and auto-regenerates your site when a file is updated. - -To add new posts, simply add a file in the `_posts` directory that follows the convention `YYYY-MM-DD-name-of-post.ext` and includes the necessary front matter. Take a look at the source for this post to get an idea about how it works. - -Jekyll also offers powerful support for code snippets: - -{% highlight ruby %} -def print_hi(name) - puts "Hi, #{name}" -end -print_hi('Tom') -#=> prints 'Hi, Tom' to STDOUT. -{% endhighlight %} - -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]. If you have questions, you can ask them on [Jekyll’s dedicated Help repository][jekyll-help]. - -[jekyll]: http://jekyllrb.com -[jekyll-gh]: https://github.com/jekyll/jekyll -[jekyll-help]: https://github.com/jekyll/jekyll-help diff --git a/_posts/2015-09-05-call-for-participation.markdown b/_posts/2015-09-05-call-for-participation.markdown new file mode 100644 index 0000000..61aa911 --- /dev/null +++ b/_posts/2015-09-05-call-for-participation.markdown @@ -0,0 +1,11 @@ +--- +layout: post +title: "call for participation" +date: 2015-09-05 15:20:44 +post_author: timm +--- + +Falls ihr irgendwem irgendwas beibringen wollt, meldet euch! +Trag euch (demnächst) ins Wiki ein, was auch immer. + +Wir brauchen eure Hilfe! \ No newline at end of file diff --git a/_posts/2015-09-05-init.markdown b/_posts/2015-09-05-init.markdown new file mode 100644 index 0000000..76a1731 --- /dev/null +++ b/_posts/2015-09-05-init.markdown @@ -0,0 +1,17 @@ +--- +layout: post +title: "Wir sind da wat am planen dran" +date: 2015-09-05 15:16:44 +post_author: timm +--- + +Ist euch auch immer Zwischen Congress und Easterhegg so furchtbar langweilig? Uns auch! + +Deswegen laden wir euch zu uns ein. Am 26.-28. Februar veranstalten wir das erste Hack Im Pott um euch ganz viel Zeug beizubringen und noch viel mehr von euch zu lernen. Weniger Vorträge, mehr Workshops, von wie man git jetzt nun wirklich vernünftig benutzt, über arbeiten mit Holz, bis hin zum Met brauen haben wir bereits jetzt schon ne menge geilen Scheiss zusammengesucht. + +Allerdings kann da noch viel viel mehr! + +Eintrittsspende 13,37€. Dafür gibts ewiges Frühstück (u.a. ein Pott voll Mett, auch vegan) und Kaffee. +Der Platz für die erste Iteration ist stark begrenzt, so das wir nur 42 Plätze für das gesamte Event haben. First come, first serve, Voranmeldung demnächst! + +Auf ein exzellentes HIP-0! \ No newline at end of file diff --git a/_sass/_layout.scss b/_sass/_layout.scss index def56f8..6fee1df 100644 --- a/_sass/_layout.scss +++ b/_sass/_layout.scss @@ -1,236 +1,82 @@ -/** - * Site header - */ -.site-header { - border-top: 5px solid $grey-color-dark; - border-bottom: 1px solid $grey-color-light; - min-height: 56px; +$primary-bg: #333; +$link-primary: red; +$link-hover: #660000; - // Positioning context for the mobile navigation icon - position: relative; +body { + background:#222 url('/img/logowall.svg') center top; + background-size: 300px; } -.site-title { - font-size: 26px; - line-height: 56px; - letter-spacing: -1px; - margin-bottom: 0; - float: left; +a { + color: red; +} - &, - &:visited { - color: $grey-color-dark; +.navbar-default .navbar-nav li a, .navbar-nav > li > a { + color: red; + text-shadow: none; + + &:hover { + color: $link-hover; + } +} + +.content { + padding-top:90px; + background:$primary-bg url('/img/logowall.svg') center top; + background-size: 300px; +} + +.header { + background-color: $primary-bg; + } +.logo { + position:relative; + z-index:10; + width:150px; + margin-bottom: -40px; + } + +.navigation { + height:50px; + background-color: $primary-bg; + border-bottom: 1px #aaa solid; +} + +.navbar-default { + background:none; + //background-color:transparent; + box-shadow:none; + border:0; +} + +.post, .box { + background-color: #666; + padding: 40px 20px; + margin-bottom: 30px; + border-radius: 5px; + + .date { + font-style: italic; + } + + a { + color: $link-hover; + } + + h2 { + a { + color: black; + + &:hover { + text-decoration: none; + } } + } } -.site-nav { - float: right; - line-height: 56px; - - .menu-icon { - display: none; - } - - .page-link { - color: $text-color; - line-height: $base-line-height; - - // Gaps between nav items, but not on the first one - &:not(:first-child) { - margin-left: 20px; - } - } - - @include media-query($on-palm) { - position: absolute; - top: 9px; - right: 30px; - background-color: $background-color; - border: 1px solid $grey-color-light; - border-radius: 5px; - text-align: right; - - .menu-icon { - display: block; - float: right; - width: 36px; - height: 26px; - line-height: 0; - padding-top: 10px; - text-align: center; - - > svg { - width: 18px; - height: 15px; - - path { - fill: $grey-color-dark; - } - } - } - - .trigger { - clear: both; - display: none; - } - - &:hover .trigger { - display: block; - padding-bottom: 5px; - } - - .page-link { - display: block; - padding: 5px 10px; - } - } -} - - - -/** - * Site footer - */ -.site-footer { - border-top: 1px solid $grey-color-light; - padding: $spacing-unit 0; -} - -.footer-heading { - font-size: 18px; - margin-bottom: $spacing-unit / 2; -} - -.contact-list, -.social-media-list { - list-style: none; - margin-left: 0; -} - -.footer-col-wrapper { - font-size: 15px; - color: $grey-color; - margin-left: -$spacing-unit / 2; - @extend %clearfix; -} - -.footer-col { - float: left; - margin-bottom: $spacing-unit / 2; - padding-left: $spacing-unit / 2; -} - -.footer-col-1 { - width: -webkit-calc(35% - (#{$spacing-unit} / 2)); - width: calc(35% - (#{$spacing-unit} / 2)); -} - -.footer-col-2 { - width: -webkit-calc(20% - (#{$spacing-unit} / 2)); - width: calc(20% - (#{$spacing-unit} / 2)); -} - -.footer-col-3 { - width: -webkit-calc(45% - (#{$spacing-unit} / 2)); - width: calc(45% - (#{$spacing-unit} / 2)); -} - -@include media-query($on-laptop) { - .footer-col-1, - .footer-col-2 { - width: -webkit-calc(50% - (#{$spacing-unit} / 2)); - width: calc(50% - (#{$spacing-unit} / 2)); - } - - .footer-col-3 { - width: -webkit-calc(100% - (#{$spacing-unit} / 2)); - width: calc(100% - (#{$spacing-unit} / 2)); - } -} - -@include media-query($on-palm) { - .footer-col { - float: none; - width: -webkit-calc(100% - (#{$spacing-unit} / 2)); - width: calc(100% - (#{$spacing-unit} / 2)); - } -} - - - -/** - * Page content - */ -.page-content { - padding: $spacing-unit 0; -} - -.page-heading { - font-size: 20px; -} - -.post-list { - margin-left: 0; - list-style: none; - - > li { - margin-bottom: $spacing-unit; - } -} - -.post-meta { - font-size: $small-font-size; - color: $grey-color; -} - -.post-link { - display: block; - font-size: 24px; -} - - - -/** - * Posts - */ -.post-header { - margin-bottom: $spacing-unit; -} - -.post-title { - font-size: 42px; - letter-spacing: -1px; - line-height: 1; - - @include media-query($on-laptop) { - font-size: 36px; - } -} - -.post-content { - margin-bottom: $spacing-unit; - - h2 { - font-size: 32px; - - @include media-query($on-laptop) { - font-size: 28px; - } - } - - h3 { - font-size: 26px; - - @include media-query($on-laptop) { - font-size: 22px; - } - } - - h4 { - font-size: 20px; - - @include media-query($on-laptop) { - font-size: 18px; - } - } -} +.footer { + padding: 20px; + ul { + list-style-type: none; + } +} \ No newline at end of file diff --git a/about.md b/about.md deleted file mode 100644 index 3ed64bb..0000000 --- a/about.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -layout: page -title: About -permalink: /about/ ---- - -This is the base Jekyll theme. You can find out more info about customizing your Jekyll theme, as well as basic Jekyll usage documentation at [jekyllrb.com](http://jekyllrb.com/) - -You can find the source code for the Jekyll new theme at: [github.com/jglovier/jekyll-new](https://github.com/jglovier/jekyll-new) - -You can find the source code for Jekyll at [github.com/jekyll/jekyll](https://github.com/jekyll/jekyll) diff --git a/anfahrt.html b/anfahrt.html new file mode 100644 index 0000000..81e171d --- /dev/null +++ b/anfahrt.html @@ -0,0 +1,30 @@ +--- +layout: default +--- + +
+

+ Adresse +

+

+ + Sibyllastr. 9 (Hinterhof)
+ 45136 Essen + + Der Eingang befindet sich im Hinterhof und ist über die Durchfahrt erreichbar. Unsere Clubräume befinden sich sowohl in der 1. Etage als auch im Keller des Gebäudes. + ÖPNV der EVAG (Tram 105 und NE6) und die Linie S6 der Deutschen Bahn bis Bf Essen-Süd. +

+
+ +
+

+ Gäste +

+

+ Interessierte Gäste sind eingeladen Mittwochs ab 19 Uhr zum Chaostreff zu kommen. + Der Chaostreff ist eine lockere Runde, in der an Projekten gearbeitet, Vorträge gehört und diskutiert wird. + + Interessierte Menschen können gerne dazu kommen. + Neue Personen bekommen eine Führung durch den Hackspace und bekommen alle wichtigen Dinge gezeigt. +

+
\ No newline at end of file diff --git a/img/hip_logo.png b/img/hip_logo.png new file mode 100644 index 0000000..885c2d7 Binary files /dev/null and b/img/hip_logo.png differ diff --git a/img/hip_logo.svg b/img/hip_logo.svg new file mode 100644 index 0000000..67e33a4 --- /dev/null +++ b/img/hip_logo.svg @@ -0,0 +1,83 @@ + + + + + + + + + + image/svg+xml + + + + + + + + HIP! + + diff --git a/img/logowall.svg b/img/logowall.svg new file mode 100644 index 0000000..65cb49e --- /dev/null +++ b/img/logowall.svg @@ -0,0 +1,923 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/index.html b/index.html index 83d9398..6e87969 100644 --- a/index.html +++ b/index.html @@ -2,22 +2,18 @@ layout: default --- -
- -

Posts

- - - -

subscribe via RSS

- -
+

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

+ {{ post.content }} + +{% endfor %}