From 67cf0e745c8638c0a163d869c0d7e4e7d71baf78 Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Mon, 1 Jan 2018 13:38:07 +0100 Subject: [PATCH 1/3] 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); From 1314ae15558bbde0f2c03643bdfebd698e7833bb Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Mon, 1 Jan 2018 13:40:39 +0100 Subject: [PATCH 2/3] Add info about v2.2.1 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f2495e21..1fa98436 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). + +## [2.2.1] - 2018-01-01 + +### Fixed + +- Fixed linting errors. + ## [2.2.0] - 2018-01-01 **Note:** This update uses new dependencies. Please update using the following command: `git pull && npm install` From a0a02701b083903905ad9eb1f0c93ba75ee485fe Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Mon, 1 Jan 2018 13:42:39 +0100 Subject: [PATCH 3/3] Update version number. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 977bb544..421ba149 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "magicmirror", - "version": "2.2.0", + "version": "2.2.1", "description": "The open source modular smart mirror platform.", "main": "js/electron.js", "scripts": {