Merge branch 'master' of https://github.com/jaywcjlove/MDEditor

jaywcjlove · Aug 17, 2015 · dbc7ea2 · dbc7ea2
2 parents e9f2e3c + d8b6b12
commit dbc7ea2
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/themes/default/css/MDEditor.min.css b/themes/default/css/MDEditor.min.css
@@ -91,6 +91,12 @@
 .markdown_body>*:first-child {
   margin-top: 0 !important;
 }
+.markdown_body strong {
+  font-weight: bold;
+}
+.markdown_body em {
+  font-style: italic;
+}
 .markdown_body h1,
 .markdown_body h2,
 .markdown_body h3,
@@ -145,6 +151,19 @@
   padding-left: 1.4em;
   list-style: initial;
 }
+.markdown_body ol {
+  list-style-type: decimal;
+}
+.markdown_body ol ol,
+.markdown_body ul ol {
+  list-style-type: lower-roman;
+}
+.markdown_body ul ul ol,
+.markdown_body ul ol ol,
+.markdown_body ol ul ol,
+.markdown_body ol ol ol {
+  list-style-type: lower-alpha;
+}
 .markdown_body pre {
   padding: 16px;
   overflow: auto;

diff --git a/themes/default/stylus/MDEditor.styl b/themes/default/stylus/MDEditor.styl
@@ -78,7 +78,10 @@ min-height=200px
     line-height: 1.4em
     &>*:first-child
         margin-top: 0 !important
-
+    strong
+        font-weight: bold
+    em 
+        font-style:italic
     h1,h2,h3,h4,h5,h6
         position: relative
         margin-top: 1em
@@ -111,6 +114,12 @@ min-height=200px
     ul,ol
         padding-left: 1.4em
         list-style:initial
+    ol
+        list-style-type: decimal
+    ol ol, ul ol
+        list-style-type: lower-roman;
+    ul ul ol, ul ol ol, ol ul ol, ol ol ol
+        list-style-type: lower-alpha;
     pre
         padding: 16px
         overflow: auto