update: optimize base.scss

Change-Id: I53b633a4610f4817c8cbb1ad34e5271150333cc5

Author: elonz

src/themes/core/base.scss

@@ -31,19 +31,15 @@ body {
   margin-top: 0 !important;
 }
 
-/* block */
+/* spacing */
 
-// TODO: 这几个还没有拆分 top、bottom
-// blockquote, pre, table,
-p,
-details,
-dl,
-ol,
-ul {
+p, details, dl, ol, ul, pre, xmp, plaintext, listing, blockquote, table, figure, hr {
   margin-top: $block-mg-t;
   margin-bottom: $block-mg-b;
 }
 
+/* block */
+
 h1 {
   font-size: $h1-font-size;
   font-weight: $h1-font-weight;
@@ -99,33 +95,15 @@ h6 {
 }
 
 p {
-  margin-top: $p-mg-t;
-  margin-bottom: $p-mg-b;
   margin-left: 0;
   margin-right: 0;
 }
 
-li {
-  word-wrap: break-all;
-}
-
-li+li {
-  margin-top: $li-mg-t;
-}
-
-ul ul, ol ul, ul ol, ol ol {
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
 pre, xmp, plaintext, listing {
   font-family: $code-font-family;
-  margin: $pre-mg-v $pre-mg-h;
 }
 
 blockquote {
-  margin: $blockquote-mg-v $blockquote-mg-h;
-  
   >:first-child {
     margin-top: 0;
   }
@@ -135,23 +113,37 @@ blockquote {
   }
 }
 
-figure {
-  margin: $figure-mg-v $figure-mg-h;
-}
-
 hr {
-  margin: $hr-mg-v $hr-mg-h;
   border-style: $hr-bd-style;
   border-width: $hr-bd-width;
 }
 
-/* inline */
-
 img {
   max-width: 100%;
   height: auto
 }
 
+/* list */
+
+li {
+  word-wrap: break-all;
+}
+
+li+li {
+  margin-top: $li-mg-t;
+}
+
+ul ul, ol ul, ul ol, ol ol {
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+.task-list-item {
+  list-style-type: none;
+}
+
+/* inline */
+
 a {
   color: $link-color;
   text-decoration: $link-decoration;
@@ -182,9 +174,9 @@ del, s {
 }
 
 /* table */
+
 table {
   color: $table-font-color;
-  margin: $table-mg-v $table-mg-h;
   border-collapse: collapse;
   background-color: $table-bg-color;
   border-spacing: $table-border-spacing;
@@ -209,10 +201,4 @@ td {
   font-weight: $td-font-weight;
 }
 
-/* task list */
-
-.task-list-item {
-  list-style-type: none;
-}
-
 }

src/themes/variables/bear_override.scss

@@ -1,8 +1,4 @@
 
-// spacing
-$pre-mg-v: $block-mg-v;
-$blockquote-mg-v: $block-mg-v;
-
 // color
 $table-font-color: $code-font-color;
 $table-bg-color: $code-bg-color;

src/themes/variables/default.scss

@@ -52,8 +52,6 @@ $md-body-mg-v: 0px;
 $md-body-pd-h: 3.2rem;
 $md-body-pd-v: 1.6rem;
 
-$p-mg-t: 1em;
-$p-mg-b: 1em;
 $h1-mg-v: 0.67em;
 $h1-mg-t: $h1-mg-v;
 $h1-mg-b: $h1-mg-v;
@@ -74,16 +72,6 @@ $h6-mg-t: $h6-mg-v;
 $h6-mg-b: $h6-mg-v;
 $block-mg-t: 1em;
 $block-mg-b: 1em;
-$blockquote-mg-v: 1em;
-$blockquote-mg-h: 40px;
-$figure-mg-v: 1em;
-$figure-mg-h: 40px;
-$hr-mg-v: 0.5em;
-$hr-mg-h: auto;
-$pre-mg-v: 1em;
-$pre-mg-h: 0;
-$table-mg-v: 1em;
-$table-mg-h: 0;
 $th-pd-v: 1px;
 $th-pd-h: 1px;
 $td-pd-v: 1px;