From 88a32af10f57e0db3927bdf75db76ab3e9228f4d Mon Sep 17 00:00:00 2001 From: Gabriel Bull Date: Wed, 17 Aug 2016 09:25:32 -0400 Subject: [PATCH] Fixed some styling issues with the windows --- CHANGELOG.md | 5 +++++ package.json | 6 +++--- src/window/macOs/styles/10.11.js | 3 ++- src/window/windows/styles/windows10.js | 3 ++- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f41fb7a..c9d2e1c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # CHANGELOG +## 0.2.12 (August 17th, 2016) + +- Fixed some styling issues with the list view +- Fixed some styling issues with the windows + ## 0.2.11 (August 12th, 2016) - Added macOS list view component diff --git a/package.json b/package.json index 975f5c05..b6712ec0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "react-desktop", "author": "Gabriel Bull", - "version": "0.2.11", + "version": "0.2.12", "description": "React UI Components for macOS Sierra and Windows 10", "main": "./index.js", "keywords": [ @@ -43,8 +43,8 @@ "babel-preset-react": "^6.11.1", "babel-preset-stage-0": "^6.5.0", "chai": "^3.5.0", - "eslint": "^3.2.2", - "eslint-plugin-react": "^6.0.0", + "eslint": "^3.3.1", + "eslint-plugin-react": "^6.1.1", "html-webpack-plugin": "^2.22.0", "jsdom": "^9.4.2", "mocha": "^3.0.2", diff --git a/src/window/macOs/styles/10.11.js b/src/window/macOs/styles/10.11.js index eac86b8d..040d708c 100644 --- a/src/window/macOs/styles/10.11.js +++ b/src/window/macOs/styles/10.11.js @@ -5,7 +5,8 @@ export default { cursor: 'default', backgroundColor: '#ececec', display: 'flex', - flexDirection: 'column' + flexDirection: 'column', + boxSizing: 'border-box' }, chrome: { diff --git a/src/window/windows/styles/windows10.js b/src/window/windows/styles/windows10.js index 2ada1f64..6b5cb63d 100644 --- a/src/window/windows/styles/windows10.js +++ b/src/window/windows/styles/windows10.js @@ -6,7 +6,8 @@ export default { backgroundColor: '#ffffff', display: 'flex', flexDirection: 'column', - padding: 'none' + padding: 'none', + boxSizing: 'border-box' }, windowDark: {