Merged master

This commit is contained in:
Kasper Friis Christensen 2018-01-24 14:21:34 +01:00
commit 57b669c73d
6 changed files with 68 additions and 30 deletions

View file

@ -18,6 +18,7 @@ gem "github-pages", group: :jekyll_plugins
# If you have any plugins, put them here! # If you have any plugins, put them here!
group :jekyll_plugins do group :jekyll_plugins do
gem "jekyll-feed", "~> 0.6" gem "jekyll-feed", "~> 0.6"
gem "jekyll-livereload"
end end
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem # Windows does not include zoneinfo files, so bundle the tzinfo-data gem

View file

@ -16,8 +16,12 @@ GEM
commonmarker (0.17.7.1) commonmarker (0.17.7.1)
ruby-enum (~> 0.5) ruby-enum (~> 0.5)
concurrent-ruby (1.0.5) concurrent-ruby (1.0.5)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
ethon (0.11.0) ethon (0.11.0)
ffi (>= 1.3.0) ffi (>= 1.3.0)
eventmachine (1.2.5)
execjs (2.7.0) execjs (2.7.0)
faraday (0.14.0) faraday (0.14.0)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
@ -77,6 +81,7 @@ GEM
html-pipeline (2.7.1) html-pipeline (2.7.1)
activesupport (>= 2) activesupport (>= 2)
nokogiri (>= 1.4) nokogiri (>= 1.4)
http_parser.rb (0.6.0)
i18n (0.9.1) i18n (0.9.1)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
jekyll (3.6.2) jekyll (3.6.2)
@ -111,6 +116,9 @@ GEM
jekyll-github-metadata (2.9.3) jekyll-github-metadata (2.9.3)
jekyll (~> 3.1) jekyll (~> 3.1)
octokit (~> 4.0, != 4.4.0) octokit (~> 4.0, != 4.4.0)
jekyll-livereload (0.2.2)
em-websocket (~> 0.5)
jekyll (~> 3.0)
jekyll-mentions (1.2.0) jekyll-mentions (1.2.0)
activesupport (~> 4.0) activesupport (~> 4.0)
html-pipeline (~> 2.3) html-pipeline (~> 2.3)
@ -235,7 +243,8 @@ DEPENDENCIES
github-pages github-pages
jekyll (~> 3.6.2) jekyll (~> 3.6.2)
jekyll-feed (~> 0.6) jekyll-feed (~> 0.6)
jekyll-livereload
tzinfo-data tzinfo-data
BUNDLED WITH BUNDLED WITH
1.16.0 1.16.1

View file

@ -1,17 +1,27 @@
# Jekyll site for ulovliglogning.dk # Jekyll site for ulovliglogning.dk
## Install ## To work on the code, either
### Install Jekyll and Bundler gems through RubyGems ### Use docker
You need docker-compose. Simply run
`docker-compose up` to launch the site in a docker container with livereload support.
### Or install Jekyll locally
#### Install Jekyll and Bundler gems through RubyGems
`gem install jekyll bundler` `gem install jekyll bundler`
### Install dependencies #### Install dependencies
`bundle install` `bundle install`
### Build the site local #### Build the site local
`bundle exec jekyll serve` `bundle exec jekyll serve`
You can now see the site at [localhost:4000](http://localhost:4000) You can now see the site at [localhost:4000](http://localhost:4000)
## Deploy
It's **important** that you build the site with `JEKYLL_ENV=production bundle exec jekyll build` before deploying the contents of the `_site` directory. We're doing some debugging stuff when then project is build in the development env.
## Structure ## Structure
The contents of the index page is defined in the frontmatter of the file `index.md` The contents of the index page is defined in the frontmatter of the file `index.md`

View file

@ -2,6 +2,12 @@
$body-bg: #2A2A2A; $body-bg: #2A2A2A;
$alternate-bg: #ff5800; $alternate-bg: #ff5800;
$color-mine-shaft: #2A2A2A;
$color-international-orange: #ff5800;
$background-primary: $color-mine-shaft;
$background-alternative: $color-international-orange;
/* Size */ /* Size */
$screen-xs: 600px !default; $screen-xs: 600px !default;
$screen-xs-min: $screen-xs !default; $screen-xs-min: $screen-xs !default;

View file

@ -1,40 +1,43 @@
section { section {
min-height: 100vh; min-height: 100vh;
width: 100%; position: relative;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
position: relative;
background: $body-bg; background-color: $background-primary;
/*&:not(:first-child):before*/ &:before { background-image: linear-gradient(
content: ""; to left bottom,
width: 100%; $background-primary 49%,
height: 30px; $background-alternative 50%
position: absolute; );
top: -30px; background-size: 100% 30px;
right: 0; background-repeat: no-repeat;
background: linear-gradient(to left bottom, $alternate-bg 0%,$alternate-bg 49%,$body-bg 50%,$body-bg 100%); background-position: bottom;
background: linear-gradient(to left bottom, transparent 0%,transparent 49%,$body-bg 50%,$body-bg 100%);
} &:nth-of-type(even) {
&.even { background-color: $background-alternative;
background: $alternate-bg; background-image: linear-gradient(
&:before { to left bottom,
background: linear-gradient(to left bottom, $body-bg 0%,$body-bg 49%,$alternate-bg 50%,$alternate-bg 100%); $background-alternative 49%,
background: linear-gradient(to left bottom, transparent 0%,transparent 49%,$alternate-bg 50%,$alternate-bg 100%); $background-primary 50%
);
} }
&:last-of-type {
background-image: none;
} }
.paragraphs { .paragraphs {
column-count: 2; column-count: 2;
text-justify: distribute;
text-justify: inter-character;
column-gap: 2rem; column-gap: 2rem;
//text-justify: none;
word-break: break-word;
} }
} }
section {
.paragraphs { .paragraphs {
margin-bottom: 3rem; margin-bottom: 3rem;
h3, p { h3, p {
max-width: 300px; max-width: 300px;

9
docker-compose.yml Normal file
View file

@ -0,0 +1,9 @@
jekyll:
image: jekyll/jekyll
command: jekyll serve --livereload --reload_port 35729
ports:
- 4000:4000
- 35729:35729
volumes:
- .:/srv/jekyll