From f4fd85abf554b730a57020dbd75ae89f5bb2a53c Mon Sep 17 00:00:00 2001 From: benweet Date: Sun, 15 Sep 2013 22:03:18 +0100 Subject: [PATCH] Switch to ACE editor --- cache.manifest | 2 +- res-min/themes/blue-gray.css | 6 +++--- res-min/themes/default.css | 6 +++--- res-min/themes/night.css | 6 +++--- res/styles/main.less | 13 ++++++++----- 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/cache.manifest b/cache.manifest index 40dbb6f5..22d923b7 100644 --- a/cache.manifest +++ b/cache.manifest @@ -1,5 +1,5 @@ CACHE MANIFEST -#Date Sun Sep 15 2013 20:41:07 +#Date Sun Sep 15 2013 22:03:04 CACHE: index.html diff --git a/res-min/themes/blue-gray.css b/res-min/themes/blue-gray.css index bee345b1..c066cc28 100644 --- a/res-min/themes/blue-gray.css +++ b/res-min/themes/blue-gray.css @@ -1581,7 +1581,6 @@ h1{margin:40px 0} h2{margin:30px 0} h3{margin:20px 0} h4,h5,h6{margin:15px 0} -.toc ul{list-style-type:none} p,pre,blockquote{margin:0 0 15px} hr{border-top:1px solid #ddd;margin:30px 0} code,pre{font-family:Menlo,Consolas,"Courier New",monospace;font-size:12px !important} @@ -1600,6 +1599,7 @@ blockquote p{margin-bottom:15px;font-size:14px;line-height:20px} blockquote ul:last-child,blockquote ol:last-child{margin-bottom:0} ul,ol{margin-bottom:15px} ul ul,ol ul,ul ol,ol ol{margin-bottom:15px} +.toc ul{list-style-type:none;margin-bottom:5px} .ace_editor{color:#545454} .ace-tm{background-color:#ffffff} .ace-tm .ace_marker-layer .ace_active-line{background-color:#f0f3f4} @@ -1609,8 +1609,8 @@ ul ul,ol ul,ul ol,ol ol{margin-bottom:15px} .ace-tm .ace_strong{font-weight:bold} .ace-tm .ace_emphasis{color:#333333;font-style:italic} .ace-tm .ace_blockquote{color:#8c8c8c;font-style:italic} -.ace-tm .ace_code{color:#666666;background-color:rgba(136,136,136,0.1)} -.ace-tm .ace_code_block{color:#333333} +.ace-tm .ace_code{font-family:Menlo,Consolas,"Courier New",monospace;color:#666666;background-color:rgba(136,136,136,0.1)} +.ace-tm .ace_code_block{font-family:Menlo,Consolas,"Courier New",monospace;color:#333333} .ace-tm .ace_description{color:#666666} .ace_search{background-color:#d9dfe3;border:0} #wmd-input{color:#545454;-webkit-box-shadow:none;box-shadow:none;resize:none;border:none !important} diff --git a/res-min/themes/default.css b/res-min/themes/default.css index ab0cb36c..b014d2d5 100644 --- a/res-min/themes/default.css +++ b/res-min/themes/default.css @@ -1581,7 +1581,6 @@ h1{margin:40px 0} h2{margin:30px 0} h3{margin:20px 0} h4,h5,h6{margin:15px 0} -.toc ul{list-style-type:none} p,pre,blockquote{margin:0 0 15px} hr{border-top:1px solid #ddd;margin:30px 0} code,pre{font-family:Menlo,Consolas,"Courier New",monospace;font-size:12px !important} @@ -1600,6 +1599,7 @@ blockquote p{margin-bottom:15px;font-size:14px;line-height:20px} blockquote ul:last-child,blockquote ol:last-child{margin-bottom:0} ul,ol{margin-bottom:15px} ul ul,ol ul,ul ol,ol ol{margin-bottom:15px} +.toc ul{list-style-type:none;margin-bottom:5px} .ace_editor{color:#545454} .ace-tm{background-color:#ffffff} .ace-tm .ace_marker-layer .ace_active-line{background-color:#f1f1f1} @@ -1609,8 +1609,8 @@ ul ul,ol ul,ul ol,ol ol{margin-bottom:15px} .ace-tm .ace_strong{font-weight:bold} .ace-tm .ace_emphasis{color:#333333;font-style:italic} .ace-tm .ace_blockquote{color:#8c8c8c;font-style:italic} -.ace-tm .ace_code{color:#666666;background-color:rgba(136,136,136,0.1)} -.ace-tm .ace_code_block{color:#333333} +.ace-tm .ace_code{font-family:Menlo,Consolas,"Courier New",monospace;color:#666666;background-color:rgba(136,136,136,0.1)} +.ace-tm .ace_code_block{font-family:Menlo,Consolas,"Courier New",monospace;color:#333333} .ace-tm .ace_description{color:#666666} .ace_search{background-color:#dddddd;border:0} #wmd-input{color:#545454;-webkit-box-shadow:none;box-shadow:none;resize:none;border:none !important} diff --git a/res-min/themes/night.css b/res-min/themes/night.css index 876c851c..ecfcb7ef 100644 --- a/res-min/themes/night.css +++ b/res-min/themes/night.css @@ -1581,7 +1581,6 @@ h1{margin:40px 0} h2{margin:30px 0} h3{margin:20px 0} h4,h5,h6{margin:15px 0} -.toc ul{list-style-type:none} p,pre,blockquote{margin:0 0 15px} hr{border-top:1px solid #ddd;margin:30px 0} code,pre{font-family:Menlo,Consolas,"Courier New",monospace;font-size:12px !important} @@ -1600,6 +1599,7 @@ blockquote p{margin-bottom:15px;font-size:14px;line-height:20px} blockquote ul:last-child,blockquote ol:last-child{margin-bottom:0} ul,ol{margin-bottom:15px} ul ul,ol ul,ul ol,ol ol{margin-bottom:15px} +.toc ul{list-style-type:none;margin-bottom:5px} .ace_editor{color:#dedede} .ace-tm{background-color:#111111} .ace-tm .ace_marker-layer .ace_active-line{background-color:#232323} @@ -1609,8 +1609,8 @@ ul ul,ol ul,ul ol,ol ol{margin-bottom:15px} .ace-tm .ace_strong{font-weight:bold} .ace-tm .ace_emphasis{color:#ffffff;font-style:italic} .ace-tm .ace_blockquote{color:#a6a6a6;font-style:italic} -.ace-tm .ace_code{color:#cccccc;background-color:rgba(68,68,68,0.1)} -.ace-tm .ace_code_block{color:#ffffff} +.ace-tm .ace_code{font-family:Menlo,Consolas,"Courier New",monospace;color:#cccccc;background-color:rgba(68,68,68,0.1)} +.ace-tm .ace_code_block{font-family:Menlo,Consolas,"Courier New",monospace;color:#ffffff} .ace-tm .ace_description{color:#cccccc} .ace_search{background-color:#444444;border:0} #wmd-input{color:#dedede;-webkit-box-shadow:none;box-shadow:none;resize:none;border:none !important} diff --git a/res/styles/main.less b/res/styles/main.less index e37352e7..3531da77 100644 --- a/res/styles/main.less +++ b/res/styles/main.less @@ -838,10 +838,6 @@ h4, h5, h6 { margin: 15px 0; } -.toc ul { - list-style-type: none; -} - p, pre, blockquote { @@ -928,6 +924,11 @@ ul,ol { } } +.toc ul { + list-style-type: none; + margin-bottom: 5px; +} + /***************************** * Editor *****************************/ @@ -971,11 +972,13 @@ ul,ol { } .ace_code { + font-family: Menlo, Consolas, "Courier New", monospace; color: @primary-color-lighter; - background-color: fade(@secondary-bg, 10%);; + background-color: fade(@secondary-bg, 10%); } .ace_code_block { + font-family: Menlo, Consolas, "Courier New", monospace; color: @primary-color; }