Imported new images

assets/static/app.js.map

@@ -1 +1 @@
-{"version":3,"file":"app.js","sources":["webpack:///app.js","webpack:///"],"mappings":"AAAA;;;;;;;;;;;;;ACuNA;;;;;;;;;;AAqiBA;AAqpHA;AAkgIA;AAg3EA","sourceRoot":""}
+{"version":3,"file":"app.js","sources":["webpack:///app.js","webpack:///"],"mappings":"AAAA;;;;;;;;;;;;;ACyMA;;;;;;;;;;AAqiBA;AAqpHA;AAkgIA;AAg3EA","sourceRoot":""}

content/contact/contents.lr

@@ -12,7 +12,8 @@ class: default
 text:
 
 Lektor is an Open Source project licensed under the [three clause BSD
-license](../license/).
+license](../license/).  For detailed copyright and license information
+see [License & Copyright](../license/).
 
 ## Imprint
 

content/contents.lr

@@ -16,28 +16,15 @@ contents:
     <div class="col-md-8">
       <img src="logo.png" alt="Lektor" class="logo">
       <p>
-	a flexible and powerful static content management system for building
+	A flexible and powerful static content management system for building
 	complex and beautiful websites out of flat files — for people who do
         not want to make a compromise between a CMS and a static blog engine.
+      <p>
+        Getting your ideas implemented is as easy as making breakfast eggs.
     </div>
     <div class="col-md-4 visible-md-block visible-lg-block">
       <div class="download-btn"><a href="download/"
         ><i class="glyphicon glyphicon-download-alt"></i> Download</a></div>
-
-      <ul class="badges">
-        <li><a href="https://twitter.com/getlektor"
-          class="twitter-follow-button" data-show-count="false"
-          data-size="large" data-dnt="true">Follow @getlektor</a>
-        <li><a class="github-button" href="https://github.com/lektor/lektor"
-          data-style="mega" data-count-href="/lektor/lektor/stargazers"
-          data-count-api="/repos/lektor/lektor#stargazers_count"
-          data-count-aria-label="# stargazers on GitHub"
-          aria-label="Star lektor/lektor on GitHub">Star</a>
-        <li><a href="https://gitter.im/lektor/lektor"
-          class="js-gitter-toggle-chat-button"><img
-          src="https://badges.gitter.im/lektor/lektor.svg"
-          alt="Join the chat at https://gitter.im/lektor/lektor"></a>
-      </ul>
     </div>
   </div>
   <div class="install-row hide-for-windows">
@@ -46,7 +33,24 @@ contents:
 </div>
 #### text-block ####
 text:
-
+<div class="badges">
+  <ul>
+    <li><a href="https://twitter.com/getlektor"
+      class="twitter-follow-button" data-show-count="false"
+      data-size="large" data-dnt="true">Follow @getlektor</a>
+    <li><a class="github-button" href="https://github.com/lektor/lektor"
+      data-style="mega" data-count-href="/lektor/lektor/stargazers"
+      data-count-api="/repos/lektor/lektor#stargazers_count"
+      data-count-aria-label="# stargazers on GitHub"
+      aria-label="Star lektor/lektor on GitHub">Star</a>
+    <li><a href="https://gitter.im/lektor/lektor"
+      class="js-gitter-toggle-chat-button"><img
+      src="https://badges.gitter.im/lektor/lektor.svg"
+      alt="Join the chat at https://gitter.im/lektor/lektor"></a>
+  </ul>
+</div>
+#### text-block ####
+text:
 ## Full of Features
 
 * <i class="feature-circle fa fa-ship"></i> **Deploy Anywhere** Because Lektor

content/license/contents.lr

@@ -1,6 +1,6 @@
 _model: page
 ---
-title: License
+title: License & Copyright
 ---
 body:
 
@@ -11,8 +11,9 @@ class: default
 ----
 text:
 
-Lektor is a BSD Licensed Open Source project.  Independently of that the
+Lektor is a BSD-licensed Open Source project.  Independently of that the
-text content of the website (including documentation here) is CC0.
+text content of the website (including documentation here) is CC0 and
+different rules apply for the assets.  For more information see below.
 
 ## Lektor License
 
@@ -55,3 +56,35 @@ is licensed under the CC0 license.  For information about the license text
 see [CC0 Legal Text](https://creativecommons.org/publicdomain/zero/1.0/legalcode).
 
 Note that this does not apply to images and design.
+
+## Photographs on Website
+
+For the pictures for this website (not including the pictures used in the
+documentation or blog posts):
+
+Copyright (c) 2016 Christian Cueni
+([christiancueni.com](http://www.christiancueni.com/)).  All rights reserved.
+
+## Lektor Logo License
+
+The Lektor “egg with feet” Logo is available under the “Lektor Logo License”.
+You can use the logo to promote Lektor like you want.
+
+License details:
+
+Copyright (c) 2016 Armin Ronacher
+
+Some rights reserved.
+
+This logo or a modified version may be used by anyone to refer to the Lektor
+project, but does not indicate endorsement by the project.
+
+Redistribution and use in source (the SVG files) and binary forms (rendered PNG
+files etc.) of the image, with or without modification, are permitted provided
+that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice and
+  this list of conditions.
+* The names of the contributors to the Lektor software (see license) may not be
+  used to endorse or promote products derived from this software without
+  specific prior written permission.

templates/blog-layout.html

@@ -3,7 +3,7 @@
 {% block outerbody %}
   {% set image = site.get('/blog').attachments.images.first() %}
   {% if image %}
-    <div class="page-banner page-banner-200" style="background-image: url({{ image|url }})"></div>
+    <div class="page-banner page-banner-300" style="background-image: url({{ image|url }})"></div>
   {% endif %}
   {{ super() }}
 {% endblock %}

templates/layout.html

@@ -49,7 +49,7 @@
   <footer>
     <div class="container">
       <div class="row">
-        <div class="col-sm-6 icon-bar">
+        <div class="col-sm-4 icon-bar">
           <a href="https://github.com/lektor/lektor/" title="Lektor on Github"
             ><i class="fa fa-github"></i></a>
           <a href="https://github.com/lektor/lektor/issues/" title="Report Issues for Lektor"
@@ -63,8 +63,8 @@
             }}/contents.lr" title="View source for this page"><i class="fa fa-code"></i></a>
           {%- endif %}
         </div>
-        <div class="col-sm-6">
+        <div class="col-sm-8">
-          <a href="{{ '/license'|url }}">License</a> •
+          <a href="{{ '/license'|url }}">License & Copyright</a> •
           <a href="{{ '/contact'|url }}">Contact</a> •
           Made with <i class="fa fa-fw fa-heart" title="Heart"><span hidden>Heart</span></i> in Carinthia
         </div>

templates/showcase.html

@@ -32,5 +32,5 @@
     <small>You want your own website on here?  <a
       href="https://github.com/lektor/lektor-website/tree/master/content/showcase">Fork
     the Lektor Website Repository on GitHub</a> to add your own project.  Make sure to
-    add screenshots and a description about the project.
+    add screenshots and a description about the project.</small>
 {% endblock %}

webpack/js/app.js

@@ -17,25 +17,11 @@ function selectText(text) {
 
 function initBadges() {
   let badges = $('.badges li').hide();
-
+  if (badges.length > 0) {
-  if (badges.length <= 0) {
+    window.setTimeout(function() {
-    return;
+      badges.fadeIn(500);
+    }, 1500);
   }
-
-  let nextBadge = 0;
-
-  function fadeInNext() {
-    let el = badges[nextBadge++];
-    if (!el) {
-      return;
-    }
-    window.setTimeout(fadeInNext, 200);
-    $(el).fadeIn();
-  }
-
-  window.setTimeout(function() {
-    fadeInNext();
-  }, 1000);
 }
 
 function initDownloadButton() {

webpack/scss/main.scss

@@ -421,16 +421,36 @@ i.feature-circle {
   line-height: 52px;
 }
 
-ul.badges {
+div.badges {
-  text-align: right;
+  height: 30px;
-  margin-top: 45px;
-  font-size: 0;
-  list-style: none;
-  padding: 0;
 
-  li {
+  @media (max-width: $screen-xs-max) {
-    margin: 10px 0;
+    display: none;
+  }
+
+  ul {
+    display: table;
+    height: 28px!important;
+    line-height: 28px!important;
+    margin: 0 auto;
     padding: 0;
+    list-style: none;
+    text-align: center;
+    vertical-align: top;
+    font-size: 0;
+  
+    li {
+      vertical-align: top;
+      display: table-cell;
+      margin: 0;
+      padding: 0 10px;
+  
+      img {
+        height: 28px;
+        margin: 0;
+        padding: 0;
+      }
+    }
   }
 }
 
@@ -486,9 +506,8 @@ div.lektor-intro {
   //background: #3D2824;
 
   img.logo {
-    margin-left: -80px;
+    max-width: 550px;
-    max-height: 300px;
+    margin: 30px 0 50px -15px;
-    max-width: 700px;
 
     @media (max-width: $screen-md-max) {
       width: 100%;