Merge branch 'develop' into 2.0

ShakMR · Jun 3, 2018 · b9b1b1a · b9b1b1a
2 parents c572f38 + 5eac092
commit b9b1b1a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,3 +1,4 @@
+Copyright (c) 2017, Slab
 Copyright (c) 2014, Jason Chen
 Copyright (c) 2013, salesforce.com
 All rights reserved.

diff --git a/README.md b/README.md
@@ -32,9 +32,9 @@
   </a>
 </p>
 
-[QuillJS](https://quilljs.com/) is a modern rich text editor built for compatibility and extensibility. It was created by [Jason Chen](https://twitter.com/jhchen) and [Byron Milligan](https://twitter.com/byronmilligan) and open sourced by Salesforce.
+[Quill](https://quilljs.com/) is a modern rich text editor built for compatibility and extensibility. It was created by [Jason Chen](https://twitter.com/jhchen) and [Byron Milligan](https://twitter.com/byronmilligan) and actively maintained by [Slab](https://slab.com).
 
-To get started, check out the [Quill](https://quilljs.com/) website for documentation, guides, and live demos!
+To get started, check out [https://quilljs.com/](https://quilljs.com/) for documentation, guides, and live demos!
 
 
 ## Quickstart

diff --git a/docs/_includes/open-source.html b/docs/_includes/open-source.html
@@ -1,7 +1,7 @@
 <div class="feature row">
   <div class="six columns details">
     <h2>An Open Source Project</h2>
-    <span>Quill is permissively licensed under BSD. Use it freely in personal or commercial projects. Join the growing community on Github!</span>
+    <span class="about">Quill is developed and maintained by <a href="https://slab.com" target="_blank">Slab</a>. It is permissively licensed under BSD. Use it freely in personal or commercial projects!</span>
     <div>
     {% include github.html %}
     </div>

diff --git a/docs/assets/css/styles.css b/docs/assets/css/styles.css
@@ -313,6 +313,11 @@ svg .feat-3 {
   width: 90%;
 }
 
+.about a {
+  color: #25408f;
+  text-decoration: underline;
+}
+
 /*** Header ***/
 
 header {