From c36689934d49dd9e23e0fd69268ac261512f587e Mon Sep 17 00:00:00 2001
From: Johann Breytenbach <johannbre@gmail.com>
Date: Fri, 1 Jun 2018 00:08:08 -0700
Subject: [PATCH] Fix rendering of admonitions in Windows

---
 browser/components/MarkdownPreview.js |  4 +++-
 browser/components/markdown.styl      | 22 ++++++++++++----------
 package.json                          |  1 +
 yarn.lock                             |  4 ++++
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/browser/components/MarkdownPreview.js b/browser/components/MarkdownPreview.js
index 4a7450554..124bd8c30 100755
--- a/browser/components/MarkdownPreview.js
+++ b/browser/components/MarkdownPreview.js
@@ -21,10 +21,12 @@ const attachmentManagement = require('../main/lib/dataApi/attachmentManagement')
 
 const { app } = remote
 const path = require('path')
+const fileUrl = require('file-url')
+
 const dialog = remote.dialog
 
 const markdownStyle = require('!!css!stylus?sourceMap!./markdown.styl')[0][1]
-const appPath = 'file://' + (process.env.NODE_ENV === 'production'
+const appPath = fileUrl(process.env.NODE_ENV === 'production'
   ? app.getAppPath()
   : path.resolve())
 const CSS_FILES = [
diff --git a/browser/components/markdown.styl b/browser/components/markdown.styl
index 6f8a97f18..cf94bb8e5 100644
--- a/browser/components/markdown.styl
+++ b/browser/components/markdown.styl
@@ -315,6 +315,8 @@ $admonition-icon
     position absolute
     left 1.2rem
     font-family: "Material Icons"
+    font-weight: normal;
+    font-style: normal;
     font-size: 24px
     display: inline-block;
     line-height: 1;
@@ -346,27 +348,27 @@ $admonition-title
     margin-bottom 0
 
 admonition_types = {
-    note: {border-color: #448aff, title-color: rgba(68,138,255,.1), icon: "note"},
-    hint: {border-color: #00bfa5, title-color: rgba(0,191,165,.1), icon: "info"},
-    danger: {border-color: #ff1744, title-color: rgba(255,23,68,.1), icon: "block"},
-    caution: {border-color: #ff9100, title-color: rgba(255,145,0,.1), icon: "warning"},
-    error: {border-color: #ff1744, title-color: rgba(255,23,68,.1), icon: "error"},
-    attention: {border-color: #64dd17, title-color: rgba(100,221,23,.1), icon: "priority_high"}
+    note: {color: #0288D1, icon: "note"},
+    hint: {color: #009688, icon: "info_outline"},
+    danger: {color: #c2185b, icon: "block"},
+    caution: {color: #ffa726, icon: "warning"},
+    error: {color: #d32f2f, icon: "error_outline"},
+    attention: {color: #455a64, icon: "priority_high"}
 }
 
 for name, val in admonition_types
     .admonition.{name}
         @extend $admonition
-        border-left-color: val[border-color]
+        border-left-color: val[color]
     
     .admonition.{name}>.admonition-title
         @extend $admonition-title
-        border-bottom-color: .1rem solid val[title-color]
-        background-color: val[title-color]
+        border-bottom-color: .1rem solid rgba(val[color], 0.2)
+        background-color: rgba(val[color], 0.2)
 
     .admonition.{name}>.admonition-title:before
         @extend $admonition-icon
-        color: val[border-color]
+        color: val[color]
         content: val[icon]
 
 themeDarkBackground = darken(#21252B, 10%)
diff --git a/package.json b/package.json
index 54c02a8b7..22dae2d2b 100644
--- a/package.json
+++ b/package.json
@@ -58,6 +58,7 @@
     "electron-config": "^0.2.1",
     "electron-gh-releases": "^2.0.2",
     "escape-string-regexp": "^1.0.5",
+    "file-url": "^2.0.2",
     "filenamify": "^2.0.0",
     "flowchart.js": "^1.6.5",
     "font-awesome": "^4.3.0",
diff --git a/yarn.lock b/yarn.lock
index d5bce1d13..2936c98a3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3206,6 +3206,10 @@ file-entry-cache@^2.0.0:
     flat-cache "^1.2.1"
     object-assign "^4.0.1"
 
+file-url@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/file-url/-/file-url-2.0.2.tgz#e951784d79095127d3713029ab063f40818ca2ae"
+
 filename-regex@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"