From 0e50cb4f06f5dfdb167e714ad3a3a213e3dac1f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Astori?= <jeremie@astori.fr>
Date: Sun, 1 Apr 2018 19:28:44 -0400
Subject: [PATCH] Add normal version of logo for themes with light sidebars

---
 client/css/style.css                          | 11 +++-
 client/img/logo-horizontal-transparent-bg.svg | 61 +++++++++++++++++++
 client/index.html.tpl                         |  3 +-
 client/themes/morning.css                     |  4 +-
 4 files changed, 75 insertions(+), 4 deletions(-)
 create mode 100644 client/img/logo-horizontal-transparent-bg.svg

diff --git a/client/css/style.css b/client/css/style.css
index 28d3442d..618c218e 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -501,6 +501,15 @@ kbd {
 	width: 220px;
 }
 
+#sidebar .logo,
+#sidebar .logo-inverted {
+	height: 45px;
+}
+
+#sidebar .logo {
+	display: none;
+}
+
 #viewport.menu-open #sidebar {
 	display: none;
 	will-change: transform;
@@ -1583,7 +1592,7 @@ part/quit messages where we don't load previews (adds a blank line otherwise) */
 	flex-grow: 0;
 }
 
-.logo-inverted {
+#windows .logo-inverted {
 	display: none; /* In dark themes, inverted logo must be used instead */
 }
 
diff --git a/client/img/logo-horizontal-transparent-bg.svg b/client/img/logo-horizontal-transparent-bg.svg
new file mode 100644
index 00000000..58ed1982
--- /dev/null
+++ b/client/img/logo-horizontal-transparent-bg.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Livello_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 838 276" style="enable-background:new 0 0 838 276;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FF9E18;}
+	.st1{fill:#415364;}
+</style>
+<g>
+	<g>
+		<g>
+			<g>
+				<path class="st0" d="M319.5,100l0,76.1c0,0.7-0.4,1.3-0.9,1.6l-65.8,37.7c-0.6,0.3-1.3,0.3-1.8,0l-66.1-38
+					c-0.6-0.3-0.9-0.9-0.9-1.6l0-66.8c0-0.7-0.4-1.3-0.9-1.6L164.9,97c-1.2-0.7-2.8,0.2-2.8,1.6v84.5c0,3.9,2.1,7.6,5.5,9.5
+					l78.7,45.1c3.4,2,7.6,2,11.1,0l78.4-44.9c3.4-2,5.5-5.6,5.5-9.5V92.7c0-3.9-2.1-7.6-5.5-9.5l-78.4-44.9c-3.4-2-7.6-2-11.1,0
+					l-36.3,20.8c-1.2,0.7-1.2,2.5,0,3.2l18.2,10.4c0.6,0.3,1.3,0.3,1.8,0l20.9-12c0.6-0.3,1.3-0.3,1.8,0l65.8,37.7
+					C319.2,98.7,319.5,99.3,319.5,100z"/>
+				<ellipse class="st1" cx="288.9" cy="138.4" rx="12.4" ry="12.4"/>
+				<ellipse class="st1" cx="249.3" cy="138.4" rx="12.4" ry="12.4"/>
+			</g>
+			<g>
+				<path class="st1" d="M64,176l0-76.1c0-0.7,0.4-1.3,0.9-1.6l65.8-37.7c0.6-0.3,1.3-0.3,1.8,0l66.1,38c0.6,0.3,0.9,0.9,0.9,1.6
+					l0,66.8c0,0.7,0.4,1.3,0.9,1.6l18.1,10.4c1.2,0.7,2.8-0.2,2.8-1.6V92.9c0-3.9-2.1-7.6-5.5-9.5l-78.7-45.1c-3.4-2-7.6-2-11.1,0
+					L47.7,83.1c-3.4,2-5.5,5.6-5.5,9.5v90.6c0,3.9,2.1,7.6,5.5,9.5l78.4,44.9c3.4,2,7.6,2,11.1,0l36.3-20.8c1.2-0.7,1.2-2.5,0-3.2
+					l-18.2-10.4c-0.6-0.3-1.3-0.3-1.8,0l-20.9,12c-0.6,0.3-1.3,0.3-1.8,0l-65.8-37.7C64.3,177.3,64,176.7,64,176z"/>
+				<ellipse class="st0" cx="94.6" cy="137.6" rx="12.4" ry="12.4"/>
+				<ellipse class="st0" cx="134.2" cy="137.6" rx="12.4" ry="12.4"/>
+			</g>
+		</g>
+	</g>
+	<g>
+		<g>
+			<polygon class="st0" points="362.9,121.4 378.1,121.4 378.1,162.2 389.6,162.2 389.6,121.4 404.9,121.4 404.9,111.9 362.9,111.9 
+							"/>
+			<polygon class="st0" points="446.5,132 424.4,132 424.4,111.9 413.2,111.9 413.2,162.3 424.4,162.3 424.4,141.4 446.5,141.4 
+				446.5,162.3 457.7,162.3 457.7,111.9 446.5,111.9 			"/>
+			<polygon class="st0" points="500.7,121 500.7,111.9 466.2,111.9 466.2,162.3 500.7,162.3 500.7,153.2 477.4,153.2 477.4,141.3 
+				499.2,141.3 499.2,132.1 477.4,132.1 477.4,121 			"/>
+		</g>
+		<g>
+			<polygon class="st1" points="520.6,111.9 509.2,111.9 509.2,162.3 542.5,162.3 542.5,152.8 520.6,152.8 			"/>
+			<path class="st1" d="M585.8,115c-3.8-2.1-8.4-3.1-13.6-3.1c-5.2,0-9.8,1-13.6,3.1c-3.9,2.1-6.9,5-9,8.8
+				c-2.1,3.8-3.1,8.3-3.1,13.4c0,5.1,1.1,9.6,3.1,13.4c2.1,3.8,5.1,6.8,9,8.9c3.9,2.1,8.4,3.1,13.6,3.1c5.2,0,9.8-1,13.6-3.1
+				c3.8-2.1,6.8-5,8.9-8.9c2.1-3.8,3.1-8.3,3.1-13.4c0-5.1-1-9.6-3.1-13.4C592.6,120,589.6,117.1,585.8,115z M585.8,137.2
+				c0,5.3-1.2,9.4-3.6,12.2c-2.4,2.8-5.7,4.2-10,4.2c-4.3,0-7.6-1.4-10-4.2c-2.4-2.8-3.6-6.9-3.6-12.2c0-5.3,1.2-9.4,3.6-12.1
+				c2.4-2.7,5.7-4.1,10-4.1c4.2,0,7.6,1.4,10,4.1C584.6,127.8,585.8,131.9,585.8,137.2z"/>
+			<path class="st1" d="M637.7,141.6c0,3.8-0.9,6.7-2.6,8.7c-1.7,2-4.3,2.9-7.6,2.9c-3.3,0-5.9-1-7.6-2.9c-1.8-2-2.6-4.9-2.6-8.7
+				V112H606v29.1c0,6.9,1.8,12.2,5.5,15.8c3.6,3.6,9,5.4,16,5.4c6.9,0,12.3-1.8,16-5.4c3.7-3.6,5.5-8.9,5.5-15.8V112h-11.3V141.6z"
+				/>
+			<polygon class="st1" points="690.1,142.9 665.8,111.9 657.2,111.9 657.2,162.3 668.1,162.3 668.1,131.3 692.3,162.2 692.4,162.3 
+				701,162.3 701,111.9 690.1,111.9 			"/>
+			<path class="st1" d="M733.4,142.4h9.6v10.1c-2.6,0.6-5.2,0.9-7.8,0.9c-9.7,0-14.5-5.3-14.5-16.3c0-10.8,4.5-16,13.8-16
+				c2.5,0,4.8,0.4,6.9,1.1c2.1,0.7,4.3,1.9,6.6,3.5l0.3,0.2l3.7-8.2l-0.2-0.2c-2-1.7-4.6-3.1-7.7-4.1c-3.1-1-6.4-1.4-10-1.4
+				c-5,0-9.5,1-13.3,3.1c-3.8,2-6.7,5-8.8,8.7c-2.1,3.8-3.1,8.2-3.1,13.3c0,5.2,1,9.7,3.1,13.5c2.1,3.8,5.1,6.7,8.9,8.7
+				c3.8,2,8.4,3,13.6,3c3.4,0,6.7-0.3,9.9-1c3.2-0.6,6-1.5,8.4-2.7l0.2-0.1v-24.3h-19.9V142.4z"/>
+			<polygon class="st1" points="795.8,121 795.8,111.9 761.9,111.9 761.9,162.4 795.8,162.4 795.8,153.2 772.9,153.2 772.9,141.3 
+				794.4,141.3 794.4,132.1 772.9,132.1 772.9,121 			"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/client/index.html.tpl b/client/index.html.tpl
index 1d942654..97fd904a 100644
--- a/client/index.html.tpl
+++ b/client/index.html.tpl
@@ -50,7 +50,8 @@
 	<body class="signed-out<%- public ? " public" : "" %>" data-transports="<%- JSON.stringify(transports) %>">
 		<div id="viewport" role="tablist">
 			<aside id="sidebar">
-				<img src="img/logo-horizontal-transparent-bg-inverted.svg" class="logo" alt="The Lounge" height="45">
+				<img src="img/logo-horizontal-transparent-bg.svg" class="logo" alt="The Lounge">
+				<img src="img/logo-horizontal-transparent-bg-inverted.svg" class="logo-inverted" alt="The Lounge">
 				<div class="networks"></div>
 				<div class="empty">
 					You're not connected to any networks yet.
diff --git a/client/themes/morning.css b/client/themes/morning.css
index d9e6570e..a58ba403 100644
--- a/client/themes/morning.css
+++ b/client/themes/morning.css
@@ -6,11 +6,11 @@ body {
 	color: #ccc;
 }
 
-.logo {
+#windows .logo {
 	display: none;
 }
 
-.logo-inverted {
+#windows .logo-inverted {
 	display: inline-block;
 }