diff --git a/Rules b/Rules index d101654..b92b657 100644 --- a/Rules +++ b/Rules @@ -134,10 +134,6 @@ end # # HOMEPAGE # -route '/index.*' do - '/index.html' -end - route '/tipuesearch_content.js.erb' do '/tipuesearch_content.js' end diff --git a/content/assets/stylesheets/includes/general.scss b/content/assets/stylesheets/includes/general.scss index 0cd7e50..466e323 100644 --- a/content/assets/stylesheets/includes/general.scss +++ b/content/assets/stylesheets/includes/general.scss @@ -1,7 +1,3 @@ -img { - max-width: 200px; -} - .fa-ul { list-style: none !important; diff --git a/content/cammie.erb b/content/cammie.erb index aa7b719..e813b05 100644 --- a/content/cammie.erb +++ b/content/cammie.erb @@ -2,24 +2,23 @@ navigable: true title: Cammie --- -
- -
- -
- -
- -
-
- -
+ + + +
+
- + + +
+ +
+ +
+ +
+ +<%= asset :js, :cammie %> diff --git a/layouts/default.erb b/layouts/default.erb index 9dc6059..20a9c24 100644 --- a/layouts/default.erb +++ b/layouts/default.erb @@ -8,7 +8,8 @@ Zeus WPI | <%= item[:title] || 'Werkgroep Informatica van de Universiteit Gent' %> - + + <%= asset :css, :main %> diff --git a/lib/helpers/assets.rb b/lib/helpers/assets.rb new file mode 100644 index 0000000..25931cb --- /dev/null +++ b/lib/helpers/assets.rb @@ -0,0 +1,8 @@ +module AssetHelper + def asset(type, identifier) + { + js: "", + css: "" + }[type] + end +end diff --git a/lib/helpers/data.rb b/lib/helpers/data.rb index ac675c4..ad51b3a 100644 --- a/lib/helpers/data.rb +++ b/lib/helpers/data.rb @@ -1,9 +1,5 @@ module DataHelper def data_from(identifier) - data = YAML.load_file("data/#{identifier}.yaml") - data.each do |d| - p d - end - data + YAML.load_file("data/#{identifier}.yaml") end end diff --git a/lib/helpers_.rb b/lib/helpers_.rb index 254700f..394ec84 100644 --- a/lib/helpers_.rb +++ b/lib/helpers_.rb @@ -5,6 +5,7 @@ include Nanoc::Helpers::Rendering include Nanoc::Helpers::Text include ArchiveHelper +include AssetHelper include IcalHelper include NavigationHelper include DataHelper