Skip to content

Commit

Permalink
Merge branch 'iteration9'
Browse files Browse the repository at this point in the history
  • Loading branch information
Reinmar committed Apr 10, 2017
2 parents a55c35d + 167727c commit c557a2d
Show file tree
Hide file tree
Showing 12 changed files with 1,197 additions and 286 deletions.
11 changes: 11 additions & 0 deletions build/app.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions build/app.js.map

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions build/styles.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions build/styles.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 24 additions & 10 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<!DOCTYPE html>
<!--
Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.md or http://ckeditor.com/license
-->
<html lang="en">
<head>
<meta charset="utf-8">
<title>CKEditor&nbsp;5 Developer Preview (v0.8.0)</title>
<title>CKEditor&nbsp;5 Developer Preview (v0.9.0)</title>
<!-- Hotjar Tracking Code for https://ckeditor5.github.io -->
<script>
(function(h,o,t,j,a,r){
Expand All @@ -18,7 +18,8 @@
a.appendChild(r);
})(window,document,'//static.hotjar.com/c/hotjar-','.js?sv=');
</script>
<link rel="stylesheet" href="css/styles.css?0.8.0">
<link rel="stylesheet" href="css/styles.css?0.9.0">
<link rel="stylesheet" href="build/styles.css?0.9.0">
</head>
<body>
<!-- Google Tag Manager -->
Expand All @@ -35,7 +36,7 @@
<div class="header__nav__wrapper">
<div class="header__nav__inner">
<nav class="header__nav__inner_left">
<a href="/" title="CKEditor 5 Developer Preview (v0.8.0)"><img src="img/logo.svg" alt="CKEditor 5" /></a>
<a href="/" title="CKEditor 5 Developer Preview (v0.9.0)"><img src="img/logo.svg" alt="CKEditor 5" /></a>
</nav>
<nav class="header__nav__inner_right">
<a href="https://github.com/ckeditor/ckeditor5" title="See Project GitHub Page"><img src="img/gh.svg" alt="GitHub" />GitHub</a>
Expand All @@ -45,21 +46,25 @@
</div>
</div>

<h1>CKEditor&nbsp;5 Developer Preview (v0.8.0)</h1>
<h1>CKEditor&nbsp;5 Developer Preview (v0.9.0)</h1>
</header>

<main>
<div id="editor">
<h2>About CKEditor&nbsp;5, v0.8.0</h2>
<h2>About CKEditor&nbsp;5, v0.9.0</h2>

<p>This is the <a href="https://github.com/ckeditor/ckeditor5-design/issues/175">8th developer preview</a> of <a href="https://ckeditor5.github.io">CKEditor&nbsp;5</a>.</p>
<p>This is the <a href="TODO">9th developer preview</a> of <a href="https://ckeditor5.github.io">CKEditor&nbsp;5</a>.</p>

<figure class="image">
<img src="img/sample.jpg" alt="Autumn fields" />
<figcaption><b>BREAKING NEWS</b>: We'll be ready before summer.</figcaption>
<figcaption><strong>BREAKING NEWS</strong>: We'll be ready before summer.</figcaption>
</figure>

<p>After more than 2 years of building the next generation editor from scratch and closing over 1050 tickets, we created a highly <strong>extensible and flexible architecture</strong> which consists of an <strong>amazing editing framework</strong> and <strong>editing solutions</strong> that will be built on top of it.</p>
<p>After nearly 3 years of building the next generation editor from scratch and closing over 1170 tickets, we created a highly <strong>extensible and flexible architecture</strong> which consists of an <strong>amazing editing framework</strong> and <strong>editing solutions</strong> that will be built on top of it.</p>

<p>We explained this design choice in <a href="https://medium.com/content-uneditable/ckeditor-5-the-future-of-rich-text-editing-2b9300f9df2c">&ldquo;CKEditor 5: The future of rich text editing&ldquo;</a>:</p>

<blockquote><p>(…) we are changing our approach with CKEditor 5. We will no longer have only two solutions available, instead CKEditor will be seen as a framework for editing solutions. At the same time, we will be developing several out-of-the-box solutions based on it, which will be available to use in many different contexts. It will be a real “one size fits all” approach, from little requirements, to super advanced full featured applications.</p></blockquote>

<h3>Notes</h3>

Expand All @@ -76,6 +81,15 @@ <h3>Notes</h3>

<section id="changelog">
<div id="changelog__timeline">
<section>
<h2>v0.9.0</h2>
<time datetime="2017-04-05T17:58:27Z">Apr 5, 2017</time>
<p>
Nested lists, block quotes, caption placeholders, heading feature and stability improvements.</br />
Find out more in the <a href="TODO">&ldquo;9th developer preview of CKEditor&nbsp;5 available&rdquo;</a> blog post.
</p>
</section>

<section>
<h2>v0.8.0</h2>
<time datetime="2017-03-06T17:52:24Z">Mar 6, 2017</time>
Expand Down Expand Up @@ -170,6 +184,6 @@ <h2>v0.1.0</h2>
<p class="copy">Copyright &copy; 2003-2017, <a href="http://cksource.com">CKSource</a> &ndash; Frederico Knabben.
All rights reserved.</p>
</footer>
<script src="js/app.bundle.js?0.8.0"></script>
<script src="build/app.js?0.9.0"></script>
</body>
</html>
Loading

0 comments on commit c557a2d

Please sign in to comment.