From ac581fe31d5f6d72d45bdfa2e21df451015f22f5 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Tue, 25 Aug 2015 14:41:04 +0200 Subject: Install jekyll-assets for better asset pipeline support. --- Gemfile | 1 + Gemfile.lock | 27 +++++ blog/_assets/images/.gitkeep | 0 .../images/2014/NORSKURSKOG_front_cover.jpg | Bin 0 -> 18877 bytes blog/_assets/images/2014/cds-arrived.jpg | Bin 0 -> 45883 bytes blog/_assets/images/2014/endolith-live.jpg | Bin 0 -> 34100 bytes blog/_assets/images/2014/endolith-promo.jpg | Bin 0 -> 86808 bytes blog/_assets/images/2014/unspoken-live.jpg | Bin 0 -> 46873 bytes blog/_assets/images/2014/unspoken-promo.jpg | Bin 0 -> 84181 bytes blog/_assets/images/2014/wyruz-live.jpg | Bin 0 -> 58556 bytes blog/_assets/images/2014/wyruz-promo.jpg | Bin 0 -> 73039 bytes blog/_assets/images/background.jpg | Bin 0 -> 134714 bytes blog/_assets/images/header.png | Bin 0 -> 14844 bytes blog/_assets/images/logos/ET-logo.jpg | Bin 0 -> 4530 bytes blog/_assets/images/logos/Symphonium.jpg | Bin 0 -> 16370 bytes blog/_assets/javascripts/.gitkeep | 0 blog/_assets/stylesheets/.gitkeep | 0 blog/_assets/stylesheets/_common.scss | 5 + blog/_assets/stylesheets/_config.scss | 13 +++ blog/_assets/stylesheets/_header.scss | 20 ++++ blog/_assets/stylesheets/_navbar.scss | 31 ++++++ blog/_assets/stylesheets/main.scss | 118 +++++++++++++++++++++ blog/_plugins/jekyll_assets.rb | 1 + blog/_sass/_common.scss | 5 - blog/_sass/_config.scss | 13 --- blog/_sass/_header.scss | 20 ---- blog/_sass/_navbar.scss | 31 ------ .../assets/images/2014/NORSKURSKOG_front_cover.jpg | Bin 18877 -> 0 bytes blog/assets/images/2014/cds-arrived.jpg | Bin 45883 -> 0 bytes blog/assets/images/2014/endolith-live.jpg | Bin 34100 -> 0 bytes blog/assets/images/2014/endolith-promo.jpg | Bin 86808 -> 0 bytes blog/assets/images/2014/unspoken-live.jpg | Bin 46873 -> 0 bytes blog/assets/images/2014/unspoken-promo.jpg | Bin 84181 -> 0 bytes blog/assets/images/2014/wyruz-live.jpg | Bin 58556 -> 0 bytes blog/assets/images/2014/wyruz-promo.jpg | Bin 73039 -> 0 bytes blog/assets/images/background.jpg | Bin 134714 -> 0 bytes blog/assets/images/header.png | Bin 14844 -> 0 bytes blog/assets/images/logos/ET-logo.jpg | Bin 4530 -> 0 bytes blog/assets/images/logos/Symphonium.jpg | Bin 16370 -> 0 bytes blog/css/main.scss | 118 --------------------- 40 files changed, 216 insertions(+), 187 deletions(-) create mode 100644 blog/_assets/images/.gitkeep create mode 100644 blog/_assets/images/2014/NORSKURSKOG_front_cover.jpg create mode 100644 blog/_assets/images/2014/cds-arrived.jpg create mode 100644 blog/_assets/images/2014/endolith-live.jpg create mode 100644 blog/_assets/images/2014/endolith-promo.jpg create mode 100644 blog/_assets/images/2014/unspoken-live.jpg create mode 100644 blog/_assets/images/2014/unspoken-promo.jpg create mode 100644 blog/_assets/images/2014/wyruz-live.jpg create mode 100644 blog/_assets/images/2014/wyruz-promo.jpg create mode 100644 blog/_assets/images/background.jpg create mode 100644 blog/_assets/images/header.png create mode 100644 blog/_assets/images/logos/ET-logo.jpg create mode 100644 blog/_assets/images/logos/Symphonium.jpg create mode 100644 blog/_assets/javascripts/.gitkeep create mode 100644 blog/_assets/stylesheets/.gitkeep create mode 100644 blog/_assets/stylesheets/_common.scss create mode 100644 blog/_assets/stylesheets/_config.scss create mode 100644 blog/_assets/stylesheets/_header.scss create mode 100644 blog/_assets/stylesheets/_navbar.scss create mode 100644 blog/_assets/stylesheets/main.scss create mode 100644 blog/_plugins/jekyll_assets.rb delete mode 100644 blog/_sass/_common.scss delete mode 100644 blog/_sass/_config.scss delete mode 100644 blog/_sass/_header.scss delete mode 100644 blog/_sass/_navbar.scss delete mode 100644 blog/assets/images/2014/NORSKURSKOG_front_cover.jpg delete mode 100644 blog/assets/images/2014/cds-arrived.jpg delete mode 100644 blog/assets/images/2014/endolith-live.jpg delete mode 100644 blog/assets/images/2014/endolith-promo.jpg delete mode 100644 blog/assets/images/2014/unspoken-live.jpg delete mode 100644 blog/assets/images/2014/unspoken-promo.jpg delete mode 100644 blog/assets/images/2014/wyruz-live.jpg delete mode 100644 blog/assets/images/2014/wyruz-promo.jpg delete mode 100644 blog/assets/images/background.jpg delete mode 100644 blog/assets/images/header.png delete mode 100644 blog/assets/images/logos/ET-logo.jpg delete mode 100644 blog/assets/images/logos/Symphonium.jpg delete mode 100644 blog/css/main.scss diff --git a/Gemfile b/Gemfile index c34d99a..311bbba 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,6 @@ source "https://rubygems.org" gem "jekyll" +gem 'jekyll-assets' gem 'jekyll-multiple-languages-plugin' gem 'facets', :require => false diff --git a/Gemfile.lock b/Gemfile.lock index 614d95e..870d1e2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,7 @@ GEM remote: https://rubygems.org/ specs: + addressable (2.3.8) blankslate (2.1.2.4) celluloid (0.16.0) timers (~> 4.0.0) @@ -14,7 +15,10 @@ GEM execjs (2.5.2) facets (3.0.0) fast-stemmer (1.0.2) + fastimage (1.7.0) + addressable (~> 2.3, >= 2.3.5) ffi (1.9.10) + hike (1.2.3) hitimes (1.2.2) jekyll (2.5.3) classifier-reborn (~> 2.0) @@ -31,6 +35,14 @@ GEM redcarpet (~> 3.1) safe_yaml (~> 1.0) toml (~> 0.1.0) + jekyll-assets (1.0.0) + fastimage (~> 1.6) + jekyll (>= 2) + mini_magick (~> 4.1) + sass (~> 3.2) + sprockets (~> 2.10) + sprockets-helpers + sprockets-sass jekyll-coffeescript (1.0.1) coffee-script (~> 2.2) jekyll-gist (1.2.1) @@ -47,18 +59,32 @@ GEM rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) mercenary (0.3.5) + mini_magick (4.2.10) + multi_json (1.11.2) parslet (1.5.0) blankslate (~> 2.0) posix-spawn (0.3.11) pygments.rb (0.6.3) posix-spawn (~> 0.3.6) yajl-ruby (~> 1.2.0) + rack (1.6.4) rb-fsevent (0.9.5) rb-inotify (0.9.5) ffi (>= 0.5.0) redcarpet (3.3.2) safe_yaml (1.0.4) sass (3.4.16) + sprockets (2.12.4) + hike (~> 1.2) + multi_json (~> 1.0) + rack (~> 1.0) + tilt (~> 1.1, != 1.3.0) + sprockets-helpers (1.2.1) + sprockets (>= 2.2) + sprockets-sass (1.3.1) + sprockets (~> 2.0) + tilt (~> 1.1) + tilt (1.4.1) timers (4.0.1) hitimes toml (0.1.2) @@ -71,6 +97,7 @@ PLATFORMS DEPENDENCIES facets jekyll + jekyll-assets jekyll-multiple-languages-plugin BUNDLED WITH diff --git a/blog/_assets/images/.gitkeep b/blog/_assets/images/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/blog/_assets/images/2014/NORSKURSKOG_front_cover.jpg b/blog/_assets/images/2014/NORSKURSKOG_front_cover.jpg new file mode 100644 index 0000000..b9fdd95 Binary files /dev/null and b/blog/_assets/images/2014/NORSKURSKOG_front_cover.jpg differ diff --git a/blog/_assets/images/2014/cds-arrived.jpg b/blog/_assets/images/2014/cds-arrived.jpg new file mode 100644 index 0000000..9162607 Binary files /dev/null and b/blog/_assets/images/2014/cds-arrived.jpg differ diff --git a/blog/_assets/images/2014/endolith-live.jpg b/blog/_assets/images/2014/endolith-live.jpg new file mode 100644 index 0000000..6ba0265 Binary files /dev/null and b/blog/_assets/images/2014/endolith-live.jpg differ diff --git a/blog/_assets/images/2014/endolith-promo.jpg b/blog/_assets/images/2014/endolith-promo.jpg new file mode 100644 index 0000000..98c739c Binary files /dev/null and b/blog/_assets/images/2014/endolith-promo.jpg differ diff --git a/blog/_assets/images/2014/unspoken-live.jpg b/blog/_assets/images/2014/unspoken-live.jpg new file mode 100644 index 0000000..9a7729a Binary files /dev/null and b/blog/_assets/images/2014/unspoken-live.jpg differ diff --git a/blog/_assets/images/2014/unspoken-promo.jpg b/blog/_assets/images/2014/unspoken-promo.jpg new file mode 100644 index 0000000..55ff848 Binary files /dev/null and b/blog/_assets/images/2014/unspoken-promo.jpg differ diff --git a/blog/_assets/images/2014/wyruz-live.jpg b/blog/_assets/images/2014/wyruz-live.jpg new file mode 100644 index 0000000..675865d Binary files /dev/null and b/blog/_assets/images/2014/wyruz-live.jpg differ diff --git a/blog/_assets/images/2014/wyruz-promo.jpg b/blog/_assets/images/2014/wyruz-promo.jpg new file mode 100644 index 0000000..e326a76 Binary files /dev/null and b/blog/_assets/images/2014/wyruz-promo.jpg differ diff --git a/blog/_assets/images/background.jpg b/blog/_assets/images/background.jpg new file mode 100644 index 0000000..c650208 Binary files /dev/null and b/blog/_assets/images/background.jpg differ diff --git a/blog/_assets/images/header.png b/blog/_assets/images/header.png new file mode 100644 index 0000000..649999a Binary files /dev/null and b/blog/_assets/images/header.png differ diff --git a/blog/_assets/images/logos/ET-logo.jpg b/blog/_assets/images/logos/ET-logo.jpg new file mode 100644 index 0000000..753573f Binary files /dev/null and b/blog/_assets/images/logos/ET-logo.jpg differ diff --git a/blog/_assets/images/logos/Symphonium.jpg b/blog/_assets/images/logos/Symphonium.jpg new file mode 100644 index 0000000..8eccf4f Binary files /dev/null and b/blog/_assets/images/logos/Symphonium.jpg differ diff --git a/blog/_assets/javascripts/.gitkeep b/blog/_assets/javascripts/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/blog/_assets/stylesheets/.gitkeep b/blog/_assets/stylesheets/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/blog/_assets/stylesheets/_common.scss b/blog/_assets/stylesheets/_common.scss new file mode 100644 index 0000000..a392022 --- /dev/null +++ b/blog/_assets/stylesheets/_common.scss @@ -0,0 +1,5 @@ +@mixin round-corners { + border: { + radius: 5px; + } +} diff --git a/blog/_assets/stylesheets/_config.scss b/blog/_assets/stylesheets/_config.scss new file mode 100644 index 0000000..68fb2b6 --- /dev/null +++ b/blog/_assets/stylesheets/_config.scss @@ -0,0 +1,13 @@ +$body-bg: black; +$text-color: #aaa; +$link-color: #686; +$link-hover-color: lighten(#686, 5%); +$side-bar-background: rgba(20, 20, 20, 0.7); +$menu-bar-background: rgba(128, 256, 128, 0.15); + + +$nav-link-padding: 5px 10px; +$nav-link-hover-bg: rgba(128, 256, 128, 0.2); +$nav-link-hover-color: #ccf; +$nav-pills-active-link-hover-bg: $nav-link-hover-bg; +$nav-pills-active-link-hover-color: $nav-link-hover-color; diff --git a/blog/_assets/stylesheets/_header.scss b/blog/_assets/stylesheets/_header.scss new file mode 100644 index 0000000..7998bb5 --- /dev/null +++ b/blog/_assets/stylesheets/_header.scss @@ -0,0 +1,20 @@ +#header { + width: 100%; + font-size: 110%; + font-weight: 600; + + #logo { + position: relative; + width: 479px; + text-align: center; + p { + margin-top: 0; + } + } + + #banner-pos-1 { + position: absolute; + top: 1.5em; + right: 0; + } +} diff --git a/blog/_assets/stylesheets/_navbar.scss b/blog/_assets/stylesheets/_navbar.scss new file mode 100644 index 0000000..f5c46f5 --- /dev/null +++ b/blog/_assets/stylesheets/_navbar.scss @@ -0,0 +1,31 @@ +#header { + .site-nav { + background: { + color: $menu-bar-background; + } + @include round-corners; + width: 100%; + border: { + bottom: 1px solid darkgray; + top: 1px solid darkgray; + } + + a { + text-decoration: none; + color: $link-color; + padding: { + top: 1.5mm; + bottom: 1.5mm; + left: 2mm; + right: 2mm; + } + &:hover { + background-color: $nav-link-hover-bg; + color: $nav-link-hover-color; + } + } + &.menu-flags { + float: right; + } + } +} diff --git a/blog/_assets/stylesheets/main.scss b/blog/_assets/stylesheets/main.scss new file mode 100644 index 0000000..a6abce1 --- /dev/null +++ b/blog/_assets/stylesheets/main.scss @@ -0,0 +1,118 @@ +--- +# Only the main Sass file needs front matter (the dashes are enough) +--- +@import "config"; +@import "common"; +@import "header"; +@import "navbar"; + +body { + background-color: black; + color: $text-color; + line-height: 135%; + + background: { + image: url({{ "/assets/images/background.jpg" | prepend: site.baseurl_root }}); + repeat: no-repeat; + position: center top; + color: black; + } +} + +a { + color: $link-color; + &:hover { + color: $link-hover-color; + } +} + +#page-container { + position: relative; + width: 28cm; + margin: { + top: 10mm; + left: auto; + right: auto; + } + footer { + clear: both; + } +} + +#body-content { + position: relative; + min-height: 700px; + + padding: 1em; + @include round-corners; + + #body { + padding-right: 20em; + } + + #side_body { + position: absolute; + width: 244px; + bottom: 1em; + right: 1em; + top: 1em; + overflow: auto; + .inner { + padding: 10px; + } + background: { + color: $side-bar-background + } + @include round-corners; + + h1 { + font: { + size: 20px; + weight: bold; + } + } + + h2 { + font: { + size: 16px; + weight: bold; + } + } + + h3 { + font: { + size: 12px; + weight: bold; + } + } + } + + #news, #links { + width: 8.55cm; + float: left; + margin-right: 5mm; + + header { + date { + font-size: 10pt; + } + h1 { + font: { + size: 13pt; + weight: bold; + } + margin: { + bottom: 5mm; + top: 0; + } + a { + text-decoration: none; + } + } + } + + &.wide { + width: 100%; + } + } +} diff --git a/blog/_plugins/jekyll_assets.rb b/blog/_plugins/jekyll_assets.rb new file mode 100644 index 0000000..320122a --- /dev/null +++ b/blog/_plugins/jekyll_assets.rb @@ -0,0 +1 @@ +require "jekyll/assets" diff --git a/blog/_sass/_common.scss b/blog/_sass/_common.scss deleted file mode 100644 index a392022..0000000 --- a/blog/_sass/_common.scss +++ /dev/null @@ -1,5 +0,0 @@ -@mixin round-corners { - border: { - radius: 5px; - } -} diff --git a/blog/_sass/_config.scss b/blog/_sass/_config.scss deleted file mode 100644 index 68fb2b6..0000000 --- a/blog/_sass/_config.scss +++ /dev/null @@ -1,13 +0,0 @@ -$body-bg: black; -$text-color: #aaa; -$link-color: #686; -$link-hover-color: lighten(#686, 5%); -$side-bar-background: rgba(20, 20, 20, 0.7); -$menu-bar-background: rgba(128, 256, 128, 0.15); - - -$nav-link-padding: 5px 10px; -$nav-link-hover-bg: rgba(128, 256, 128, 0.2); -$nav-link-hover-color: #ccf; -$nav-pills-active-link-hover-bg: $nav-link-hover-bg; -$nav-pills-active-link-hover-color: $nav-link-hover-color; diff --git a/blog/_sass/_header.scss b/blog/_sass/_header.scss deleted file mode 100644 index 7998bb5..0000000 --- a/blog/_sass/_header.scss +++ /dev/null @@ -1,20 +0,0 @@ -#header { - width: 100%; - font-size: 110%; - font-weight: 600; - - #logo { - position: relative; - width: 479px; - text-align: center; - p { - margin-top: 0; - } - } - - #banner-pos-1 { - position: absolute; - top: 1.5em; - right: 0; - } -} diff --git a/blog/_sass/_navbar.scss b/blog/_sass/_navbar.scss deleted file mode 100644 index f5c46f5..0000000 --- a/blog/_sass/_navbar.scss +++ /dev/null @@ -1,31 +0,0 @@ -#header { - .site-nav { - background: { - color: $menu-bar-background; - } - @include round-corners; - width: 100%; - border: { - bottom: 1px solid darkgray; - top: 1px solid darkgray; - } - - a { - text-decoration: none; - color: $link-color; - padding: { - top: 1.5mm; - bottom: 1.5mm; - left: 2mm; - right: 2mm; - } - &:hover { - background-color: $nav-link-hover-bg; - color: $nav-link-hover-color; - } - } - &.menu-flags { - float: right; - } - } -} diff --git a/blog/assets/images/2014/NORSKURSKOG_front_cover.jpg b/blog/assets/images/2014/NORSKURSKOG_front_cover.jpg deleted file mode 100644 index b9fdd95..0000000 Binary files a/blog/assets/images/2014/NORSKURSKOG_front_cover.jpg and /dev/null differ diff --git a/blog/assets/images/2014/cds-arrived.jpg b/blog/assets/images/2014/cds-arrived.jpg deleted file mode 100644 index 9162607..0000000 Binary files a/blog/assets/images/2014/cds-arrived.jpg and /dev/null differ diff --git a/blog/assets/images/2014/endolith-live.jpg b/blog/assets/images/2014/endolith-live.jpg deleted file mode 100644 index 6ba0265..0000000 Binary files a/blog/assets/images/2014/endolith-live.jpg and /dev/null differ diff --git a/blog/assets/images/2014/endolith-promo.jpg b/blog/assets/images/2014/endolith-promo.jpg deleted file mode 100644 index 98c739c..0000000 Binary files a/blog/assets/images/2014/endolith-promo.jpg and /dev/null differ diff --git a/blog/assets/images/2014/unspoken-live.jpg b/blog/assets/images/2014/unspoken-live.jpg deleted file mode 100644 index 9a7729a..0000000 Binary files a/blog/assets/images/2014/unspoken-live.jpg and /dev/null differ diff --git a/blog/assets/images/2014/unspoken-promo.jpg b/blog/assets/images/2014/unspoken-promo.jpg deleted file mode 100644 index 55ff848..0000000 Binary files a/blog/assets/images/2014/unspoken-promo.jpg and /dev/null differ diff --git a/blog/assets/images/2014/wyruz-live.jpg b/blog/assets/images/2014/wyruz-live.jpg deleted file mode 100644 index 675865d..0000000 Binary files a/blog/assets/images/2014/wyruz-live.jpg and /dev/null differ diff --git a/blog/assets/images/2014/wyruz-promo.jpg b/blog/assets/images/2014/wyruz-promo.jpg deleted file mode 100644 index e326a76..0000000 Binary files a/blog/assets/images/2014/wyruz-promo.jpg and /dev/null differ diff --git a/blog/assets/images/background.jpg b/blog/assets/images/background.jpg deleted file mode 100644 index c650208..0000000 Binary files a/blog/assets/images/background.jpg and /dev/null differ diff --git a/blog/assets/images/header.png b/blog/assets/images/header.png deleted file mode 100644 index 649999a..0000000 Binary files a/blog/assets/images/header.png and /dev/null differ diff --git a/blog/assets/images/logos/ET-logo.jpg b/blog/assets/images/logos/ET-logo.jpg deleted file mode 100644 index 753573f..0000000 Binary files a/blog/assets/images/logos/ET-logo.jpg and /dev/null differ diff --git a/blog/assets/images/logos/Symphonium.jpg b/blog/assets/images/logos/Symphonium.jpg deleted file mode 100644 index 8eccf4f..0000000 Binary files a/blog/assets/images/logos/Symphonium.jpg and /dev/null differ diff --git a/blog/css/main.scss b/blog/css/main.scss deleted file mode 100644 index a6abce1..0000000 --- a/blog/css/main.scss +++ /dev/null @@ -1,118 +0,0 @@ ---- -# Only the main Sass file needs front matter (the dashes are enough) ---- -@import "config"; -@import "common"; -@import "header"; -@import "navbar"; - -body { - background-color: black; - color: $text-color; - line-height: 135%; - - background: { - image: url({{ "/assets/images/background.jpg" | prepend: site.baseurl_root }}); - repeat: no-repeat; - position: center top; - color: black; - } -} - -a { - color: $link-color; - &:hover { - color: $link-hover-color; - } -} - -#page-container { - position: relative; - width: 28cm; - margin: { - top: 10mm; - left: auto; - right: auto; - } - footer { - clear: both; - } -} - -#body-content { - position: relative; - min-height: 700px; - - padding: 1em; - @include round-corners; - - #body { - padding-right: 20em; - } - - #side_body { - position: absolute; - width: 244px; - bottom: 1em; - right: 1em; - top: 1em; - overflow: auto; - .inner { - padding: 10px; - } - background: { - color: $side-bar-background - } - @include round-corners; - - h1 { - font: { - size: 20px; - weight: bold; - } - } - - h2 { - font: { - size: 16px; - weight: bold; - } - } - - h3 { - font: { - size: 12px; - weight: bold; - } - } - } - - #news, #links { - width: 8.55cm; - float: left; - margin-right: 5mm; - - header { - date { - font-size: 10pt; - } - h1 { - font: { - size: 13pt; - weight: bold; - } - margin: { - bottom: 5mm; - top: 0; - } - a { - text-decoration: none; - } - } - } - - &.wide { - width: 100%; - } - } -} -- cgit v1.2.3