Skip to content

Commit

Permalink
First production version
Browse files Browse the repository at this point in the history
  • Loading branch information
Priit Haamer committed Jan 31, 2013
1 parent 4550245 commit 98b58aa
Show file tree
Hide file tree
Showing 8 changed files with 142 additions and 69 deletions.
2 changes: 2 additions & 0 deletions components/siteheader.tpl
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">

<meta name="keywords" content="{{ page.keywords }}" />
<meta name="description" content="{{ page.description }}" />
<meta name="copyright" content="{{ site.copyright }}" />
Expand Down
Binary file added images/reykjavik_photo01.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions javascripts/scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,12 @@
});

$('a.news-older-show').click(function() { $(this).addClass('no-bg'); $('.news-older-hidden').show(); return false; });

if ($('.form_error, .form_notice, .comment-errors').length > 0) {
var top = $('.form_error, .form_notice, .comment-errors').eq(0).offset().top - 50;
if (top < 0) { top = 0; }
$('html, body').scrollTop(top);
}


});
2 changes: 1 addition & 1 deletion layouts/blog_article.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
</div>

<div class="comments-holder">
<div class="comments">
<div class="comments" id="comments">
{% if article.comments_count > 0 %}
<h2>{{"comments"|lc }}</h2>
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion layouts/common_page.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@

<div id="content"{% unless editmode%}{% for item in site.menuitems_with_hidden %}{% if item.selected? and item.visible_children.size == 0 %} class="content-centered"{%endif%}{% endfor%}{% endunless%}>
<div class="cfx">
<h1>{% contentblock name="slogan" %}{{ "title_goes_here" | lc }}{% endcontentblock %}</h1>
{% content %}

</div>
</div>
</div>
Expand Down
11 changes: 5 additions & 6 deletions layouts/front_page.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@
<div id="container" class="cfx">
<div id="content" class="cfx">
<div class="content-left slogan">
<div class="cfx">
{% content name="slogan" %}
</div>
<div class="cfx">{% content name="slogan" %}</div>
</div>

<div class="content-right">
Expand All @@ -33,9 +31,10 @@

<div class="cfx">
{% contentblock name="default-content" %}
<p style="margin-bottom: 0;">
<img src="{{ images_path }}/photo01.jpg" alt="" >
</p>
<div>
<br/>
<img src="{{ images_path }}/reykjavik_photo01.jpg" alt="Reykjavik" >
</div>
{% endcontentblock %}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion manifest.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"name":"Reykjavik","layouts":[{"component":false,"layout_name":"blog","title":"Blog & News","content_type":"blog","file":"layouts/blog___news.tpl"},{"component":false,"layout_name":"blog_article","title":"Blog article","content_type":"blog_article","file":"layouts/blog_article.tpl"},{"component":false,"layout_name":"page_default","title":"Common page","content_type":"page","file":"layouts/common_page.tpl"},{"component":false,"layout_name":"page_front","title":"Front page","content_type":"page","file":"layouts/front_page.tpl"},{"component":true,"layout_name":"js","title":"JS","content_type":"component","file":"components/js.tpl"},{"component":true,"layout_name":"langmenu","title":"Langmenu","content_type":"component","file":"components/langmenu.tpl"},{"component":true,"layout_name":"latestnews","title":"LatestNews","content_type":"component","file":"components/latestnews.tpl"},{"component":true,"layout_name":"mainmenu","title":"Mainmenu","content_type":"component","file":"components/mainmenu.tpl"},{"component":true,"layout_name":"search","title":"Search","content_type":"component","file":"components/search.tpl"},{"component":true,"layout_name":"siteheader","title":"SiteHeader","content_type":"component","file":"components/siteheader.tpl"},{"component":true,"layout_name":"submenu","title":"Submenu","content_type":"component","file":"components/submenu.tpl"},{"component":true,"layout_name":"langmenuselect","title":"LangmenuSelect","content_type":"component","file":"components/langmenuselect.tpl"},{"component":true,"layout_name":"mobilemenus","title":"MobileMenus","content_type":"component","file":"components/mobilemenus.tpl"}],"author":"Paavel Liik","assets":[{"kind":"images","content_type":"image/gif","filename":"arr_down.gif","file":"images/arr_down.gif"},{"kind":"assets","content_type":"font/eot","filename":"avenir-medium-webfont.eot","file":"assets/avenir-medium-webfont.eot"},{"kind":"assets","content_type":"font/eot","filename":"avenir-light-webfont.eot","file":"assets/avenir-light-webfont.eot"},{"kind":"assets","content_type":"font/woff","filename":"avenir-light-webfont.woff","file":"assets/avenir-light-webfont.woff"},{"kind":"assets","content_type":"font/ttf","filename":"avenir-light-webfont.ttf","file":"assets/avenir-light-webfont.ttf"},{"kind":"assets","content_type":"font/ttf","filename":"avenir-medium-webfont.ttf","file":"assets/avenir-medium-webfont.ttf"},{"kind":"assets","content_type":"font/woff","filename":"avenir-medium-webfont.woff","file":"assets/avenir-medium-webfont.woff"},{"kind":"assets","content_type":"font/eot","filename":"avenir-roman-webfont.eot","file":"assets/avenir-roman-webfont.eot"},{"kind":"assets","content_type":"font/ttf","filename":"avenir-roman-webfont.ttf","file":"assets/avenir-roman-webfont.ttf"},{"kind":"assets","content_type":"font/woff","filename":"avenir-roman-webfont.woff","file":"assets/avenir-roman-webfont.woff"},{"kind":"images","content_type":"image/gif","filename":"list_dot.gif","file":"images/list_dot.gif"},{"kind":"images","content_type":"image/gif","filename":"list_dot_2x.gif","file":"images/list_dot_2x.gif"},{"kind":"images","content_type":"image/gif","filename":"search_2x.gif","file":"images/search_2x.gif"},{"kind":"images","content_type":"image/gif","filename":"search.gif","file":"images/search.gif"},{"kind":"stylesheets","content_type":"text/css","filename":"style.css","file":"stylesheets/style.css"},{"kind":"javascripts","content_type":"text/javascript","filename":"scripts.js","file":"javascripts/scripts.js"},{"kind":"images","content_type":"image/jpeg","filename":"photo01.jpg","file":"images/photo01.jpg"}],"preview_medium":"http://static.edicy.com/designs/previews/reykjavik_medium.jpg","preview_small":"http://static.edicy.com/designs/previews/reykjavik_small.jpg","description":"Reykjavik"}
{"name":"Reykjavik","layouts":[{"component":false,"title":"Blog & News","layout_name":"blog","content_type":"blog","file":"layouts/blog___news.tpl"},{"component":false,"title":"Blog article","layout_name":"blog_article","content_type":"blog_article","file":"layouts/blog_article.tpl"},{"component":false,"title":"Common page","layout_name":"page_default","content_type":"page","file":"layouts/common_page.tpl"},{"component":false,"title":"Front page","layout_name":"page_front","content_type":"page","file":"layouts/front_page.tpl"},{"component":true,"title":"JS","layout_name":"js","content_type":"component","file":"components/js.tpl"},{"component":true,"title":"Langmenu","layout_name":"langmenu","content_type":"component","file":"components/langmenu.tpl"},{"component":true,"title":"LatestNews","layout_name":"latestnews","content_type":"component","file":"components/latestnews.tpl"},{"component":true,"title":"Mainmenu","layout_name":"mainmenu","content_type":"component","file":"components/mainmenu.tpl"},{"component":true,"title":"Search","layout_name":"search","content_type":"component","file":"components/search.tpl"},{"component":true,"title":"SiteHeader","layout_name":"siteheader","content_type":"component","file":"components/siteheader.tpl"},{"component":true,"title":"Submenu","layout_name":"submenu","content_type":"component","file":"components/submenu.tpl"},{"component":true,"title":"LangmenuSelect","layout_name":"langmenuselect","content_type":"component","file":"components/langmenuselect.tpl"},{"component":true,"title":"MobileMenus","layout_name":"mobilemenus","content_type":"component","file":"components/mobilemenus.tpl"}],"author":"Paavel Liik","preview_medium":"http://static.edicy.com/designs/previews/reykjavik_medium.jpg","assets":[{"kind":"images","content_type":"image/gif","filename":"arr_down.gif","file":"images/arr_down.gif"},{"kind":"assets","content_type":"font/eot","filename":"avenir-medium-webfont.eot","file":"assets/avenir-medium-webfont.eot"},{"kind":"assets","content_type":"font/eot","filename":"avenir-light-webfont.eot","file":"assets/avenir-light-webfont.eot"},{"kind":"assets","content_type":"font/woff","filename":"avenir-light-webfont.woff","file":"assets/avenir-light-webfont.woff"},{"kind":"assets","content_type":"font/ttf","filename":"avenir-light-webfont.ttf","file":"assets/avenir-light-webfont.ttf"},{"kind":"assets","content_type":"font/ttf","filename":"avenir-medium-webfont.ttf","file":"assets/avenir-medium-webfont.ttf"},{"kind":"assets","content_type":"font/woff","filename":"avenir-medium-webfont.woff","file":"assets/avenir-medium-webfont.woff"},{"kind":"assets","content_type":"font/eot","filename":"avenir-roman-webfont.eot","file":"assets/avenir-roman-webfont.eot"},{"kind":"assets","content_type":"font/ttf","filename":"avenir-roman-webfont.ttf","file":"assets/avenir-roman-webfont.ttf"},{"kind":"assets","content_type":"font/woff","filename":"avenir-roman-webfont.woff","file":"assets/avenir-roman-webfont.woff"},{"kind":"images","content_type":"image/gif","filename":"list_dot.gif","file":"images/list_dot.gif"},{"kind":"images","content_type":"image/gif","filename":"list_dot_2x.gif","file":"images/list_dot_2x.gif"},{"kind":"images","content_type":"image/gif","filename":"search_2x.gif","file":"images/search_2x.gif"},{"kind":"images","content_type":"image/gif","filename":"search.gif","file":"images/search.gif"},{"kind":"stylesheets","content_type":"text/css","filename":"style.css","file":"stylesheets/style.css"},{"kind":"javascripts","content_type":"text/javascript","filename":"scripts.js","file":"javascripts/scripts.js"},{"kind":"images","content_type":"image/jpeg","filename":"reykjavik_photo01.jpg","file":"images/reykjavik_photo01.jpg"}],"preview_small":"http://static.edicy.com/designs/previews/reykjavik_small.jpg","description":"Reykjavik"}
184 changes: 124 additions & 60 deletions stylesheets/style.css

Large diffs are not rendered by default.

0 comments on commit 98b58aa

Please sign in to comment.