Generate the site in danish and english #3

Manually merged
ulovliglogning merged 6 commits from multilang into master 2018-01-24 20:39:58 +00:00
5 changed files with 15 additions and 17 deletions
Showing only changes of commit 305eaf4a8b - Show all commits

View file

@ -13,7 +13,7 @@ gem "jekyll", "~> 3.6.2"
# If you want to use GitHub Pages, remove the "gem "jekyll"" above and # If you want to use GitHub Pages, remove the "gem "jekyll"" above and
# uncomment the line below. To upgrade, run `bundle update github-pages`. # uncomment the line below. To upgrade, run `bundle update github-pages`.
# gem "github-pages", group: :jekyll_plugins # gem "github-pages", group: :jekyll_plugins
gem "github-pages", group: :jekyll_plugins #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

View file

@ -19,13 +19,13 @@ description: >- # this means to ignore newlines until "baseurl:"
Den danske totalovervågning er kendt ulovlig, men teleselskaber og politikere er ligeglade. Den danske totalovervågning er kendt ulovlig, men teleselskaber og politikere er ligeglade.
Nu gør vi noget ved det! #ulovligLogning Nu gør vi noget ved det! #ulovligLogning
baseurl: "" # the subpath of your site, e.g. /blog baseurl: "" # the subpath of your site, e.g. /blog
url: "" # the base hostname & protocol for your site, e.g. http://example.com url: "https://ulovliglogning.dk" # the base hostname & protocol for your site, e.g. http://example.com
# multilanguage support # multilanguage support
languages: ["da", "en"] languages: ["da", "en"]
default_lang: "da" default_lang: "da"
exclude_from_localizations: ["assets"] exclude_from_localizations: ["assets", "_scss", "style", "fonts", "img", "js", "vendor"]
parallel_localization: true parallel_localization: false
# Build settings # Build settings
markdown: kramdown markdown: kramdown
@ -38,6 +38,4 @@ sass:
sass_dir: _scss sass_dir: _scss
plugins: plugins:
- jekyll-seo-tag
- jemoji
- jekyll-polyglot - jekyll-polyglot

8
_includes/head.html Normal file
View file

@ -0,0 +1,8 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>{{ global.title }}</title>
<link rel="stylesheet" href="{{ site.baseurl }}/assets/style/main.css?{{ site.time | date: '%s' }}">
<link rel="alternate" type="application/rss+xml" title="RSS Feed for {{ site.name }}" href="{{ site.baseurl }}/feed.xml" />
{% I18n_Headers %}
</head>

View file

@ -2,15 +2,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="{{ site.active_lang }}"> <html lang="{{ site.active_lang }}">
<head> {% include head.html %}
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>{{ global.title }}</title>
<link rel="stylesheet" href="{{ "/assets/style/main.css" | prepend: site.baseurl_root }}?{{ site.time | date: '%s' }}">
<link rel="alternate" type="application/rss+xml" title="RSS Feed for {{ site.name }}" href="{{ site.baseurl }}/feed.xml" />
{% I18n_Headers %}
{% seo %}
</head>
<body> <body>
<div class="langSwitcher"> <div class="langSwitcher">
{% for tongue in site.languages %} {% for tongue in site.languages %}

View file

@ -24,14 +24,14 @@ footer {
font-size: 1rem; font-size: 1rem;
color: #FFF; color: #FFF;
display: inline-block; display: inline-block;
background: darken($color-international-orange, 15); background: $color-international-orange;
padding: 5px; padding: 5px;
box-shadow: none; box-shadow: none;
text-transform: capitalize; text-transform: capitalize;
border-right: 1px solid rgba(0,0,0,.4); border-right: 1px solid rgba(0,0,0,.4);
} }
.langSwitcher a.activeLang { .langSwitcher a.activeLang {
background: $color-international-orange; background: darken($color-international-orange, 15);
} }
.langSwitcher a:first-child{ .langSwitcher a:first-child{
border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px;