diff --git a/README.md b/README.md new file mode 100644 index 0000000000000000000000000000000000000000..bb202fa41aef8ef191bb571995de590cfd84782e --- /dev/null +++ b/README.md @@ -0,0 +1,18 @@ +# Chaotikum Website + +Wiki: https://wiki.chaotikum.org/projekte:chaotikumwebsite + +## Build + +Install depencies: + + gem install bundler + bundle install + +Build: + + bundle exec jekyll build + +Or launch a webserver with consecutive builds: + + bundle exec jekyll serve diff --git a/_sass/sassline-base/_reset.scss b/_sass/sassline-base/_reset.scss index cedba1d552585b7b2663f5742f6e7927e5fa79f8..89ee5861b8ebc7a798c61d6f361d3dd05e07dd96 100755 --- a/_sass/sassline-base/_reset.scss +++ b/_sass/sassline-base/_reset.scss @@ -5,7 +5,6 @@ * { box-sizing: border-box; } html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video { margin: 0; padding: 0; border: 0; font-size: 100%; font: inherit; vertical-align: baseline; } article, aside, details, figcaption, footer, header, hgroup, menu, nav, section { display: block; } -html, body { height: 100%; } a img { border: none; } blockquote { quotes: none; } blockquote:before, blockquote:after { content: ''; content: none; } diff --git a/assets/styles.scss b/assets/styles.scss index fdf59caf87a5f69112dc2ee219a000d93b3895a7..1239c1f6a7ec735c47fc26e7925620097604f416 100644 --- a/assets/styles.scss +++ b/assets/styles.scss @@ -15,7 +15,6 @@ title: false body { background: $backgroundColour; color: $bodyColour; - height: 100%; display: flex; @include flex-direction(column); overflow-x: hidden;