Merge branch 'develop' into docs/spring-improvements

kronosapiens · web-flow · commit 0a4a15d18c7c · 2019-04-02T00:22:11.000+03:00
diff --git a/docs/doc.config.json b/docs/doc.config.json
@@ -1,6 +1,6 @@
 {
     "logo": "img/colonyNetwork_color.svg",
-    "logoSmall": "img/colonyNetwork_color.svg",
+    "logoSmall": "img/logomark_colonyNetwork_blue.svg",
     "sectionOrder": ["Intro", "Docs", "Bug Bounty Program", "Whitepaper TL;DR", "API"],
-    "description": "The contracts that comprise the Colony Network provide a standard framework for the creation of decentralized organizations as described in the Colony Whitepaper."
+    "description": "Robust and secure smart contracts for managing work, permissions, and reputation."
 }
diff --git a/docs/img/logomark_colonyNetwork_blue.svg b/docs/img/logomark_colonyNetwork_blue.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 94.2 94.2" style="enable-background:new 0 0 94.2 94.2;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#289BDC;}
+</style>
+<title>logo_</title>
+<g id="logos">
+	
+		<rect x="6.5" y="56.2" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -44.325 36.8368)" class="st0" width="31.5" height="31.5"/>
+	<rect x="6.5" y="6.5" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -9.2369 22.3001)" class="st0" width="31.5" height="31.5"/>
+	<rect x="56.1" y="6.5" transform="matrix(0.7071 -0.7071 0.7071 0.7071 5.2969 57.381)" class="st0" width="31.5" height="31.5"/>
+	
+		<rect x="56.2" y="56.2" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -29.7912 71.9178)" class="st0" width="31.5" height="31.5"/>
+</g>
+</svg>
diff --git a/docs/img/logomark_colonyNetwork_dark.svg b/docs/img/logomark_colonyNetwork_dark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 94.21 94.22"><title>logo_</title><g id="logos"><rect x="6.53" y="56.15" width="31.53" height="31.53" transform="translate(88.92 107.01) rotate(135)" style="fill:#2e4153"/><rect x="6.53" y="6.53" width="31.53" height="31.53" transform="translate(53.83 22.3) rotate(135)" style="fill:#2e4153"/><rect x="56.15" y="6.53" width="31.53" height="31.53" transform="translate(138.53 -12.79) rotate(135)" style="fill:#2e4153"/><rect x="56.15" y="56.15" width="31.53" height="31.53" transform="translate(173.62 71.92) rotate(135)" style="fill:#2e4153"/></g></svg>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"logo": "img/colonyNetwork_color.svg",`
`3`		`- "logoSmall": "img/colonyNetwork_color.svg",`
	`3`	`+ "logoSmall": "img/logomark_colonyNetwork_blue.svg",`
`4`	`4`	`"sectionOrder": ["Intro", "Docs", "Bug Bounty Program", "Whitepaper TL;DR", "API"],`
`5`		`- "description": "The contracts that comprise the Colony Network provide a standard framework for the creation of decentralized organizations as described in the Colony Whitepaper."`
	`5`	`+ "description": "Robust and secure smart contracts for managing work, permissions, and reputation."`
`6`	`6`	`}`