From 8d0e453666b7416ef34cfaac7ba761439e8bf1e1 Mon Sep 17 00:00:00 2001
From: Michael Teeuw <michael@xonaymedia.nl>
Date: Mon, 1 Jan 2018 12:59:28 +0100
Subject: [PATCH 1/2] Preparation for v2.3.0 release.

---
 CHANGELOG.md | 11 +++++++++++
 package.json |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2495e21..e32ada02 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,17 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.3.0] - Unreleased
+
+*This release is scheduled to be released on 2018-04-01.*
+
+### Changed
+- Changed Electron dependency to v1.7.10.
+
+### Added
+
+### Fixed
+
 ## [2.2.0] - 2018-01-01
 
 **Note:** This update uses new dependencies. Please update using the following command: `git pull && npm install`
diff --git a/package.json b/package.json
index 977bb544..4c42c44c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "magicmirror",
-  "version": "2.2.0",
+  "version": "2.3.0-dev",
   "description": "The open source modular smart mirror platform.",
   "main": "js/electron.js",
   "scripts": {
@@ -54,7 +54,7 @@
   "dependencies": {
     "body-parser": "^1.18.2",
     "colors": "^1.1.2",
-    "electron": "1.4.15",
+    "electron": "^1.7.10",
     "express": "^4.16.2",
     "express-ipfilter": "0.3.1",
     "feedme": "latest",

From 538a2acbf515be9cc476805c7efc352728a4e4a4 Mon Sep 17 00:00:00 2001
From: Michael Teeuw <michael@xonaymedia.nl>
Date: Mon, 1 Jan 2018 13:38:07 +0100
Subject: [PATCH 2/2] Fix linting errors.

---
 css/main.css                                      | 15 ++++++---------
 .../default/weatherforecast/weatherforecast.js    |  4 ++--
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/css/main.css b/css/main.css
index 49bfe611..db1fb428 100644
--- a/css/main.css
+++ b/css/main.css
@@ -95,7 +95,7 @@ body {
 header {
   text-transform: uppercase;
   font-size: 15px;
-  font-family: "Roboto Condensed";
+  font-family: "Roboto Condensed", Arial, Helvetica, sans-serif;
   font-weight: 400;
   border-bottom: 1px solid #666;
   line-height: 15px;
@@ -151,6 +151,7 @@ sup {
 
 .region.right {
   right: 0;
+  text-align: right;
 }
 
 .region.top {
@@ -161,6 +162,10 @@ sup {
   margin-bottom: 25px;
 }
 
+.region.bottom .container {
+  margin-top: 25px;
+}
+
 .region.top .container:empty {
   margin-bottom: 0;
 }
@@ -185,10 +190,6 @@ sup {
   bottom: 0;
 }
 
-.region.bottom .container {
-  margin-top: 25px;
-}
-
 .region.bottom .container:empty {
   margin-top: 0;
 }
@@ -231,10 +232,6 @@ sup {
   text-align: left;
 }
 
-.region.right {
-  text-align: right;
-}
-
 .region table {
   width: 100%;
   border-spacing: 0;
diff --git a/modules/default/weatherforecast/weatherforecast.js b/modules/default/weatherforecast/weatherforecast.js
index 8c3a4595..22322bf3 100644
--- a/modules/default/weatherforecast/weatherforecast.js
+++ b/modules/default/weatherforecast/weatherforecast.js
@@ -161,12 +161,12 @@ Module.register("weatherforecast",{
 			}
 
 			var maxTempCell = document.createElement("td");
-				maxTempCell.innerHTML = forecast.maxTemp.replace(".", this.config.decimalSymbol) + degreeLabel;
+			maxTempCell.innerHTML = forecast.maxTemp.replace(".", this.config.decimalSymbol) + degreeLabel;
 			maxTempCell.className = "align-right bright max-temp";
 			row.appendChild(maxTempCell);
 
 			var minTempCell = document.createElement("td");
-				minTempCell.innerHTML = forecast.minTemp.replace(".", this.config.decimalSymbol) + degreeLabel;
+			minTempCell.innerHTML = forecast.minTemp.replace(".", this.config.decimalSymbol) + degreeLabel;
 			minTempCell.className = "align-right min-temp";
 			row.appendChild(minTempCell);