Merge branch 'master' into zhongwei

This commit is contained in:
Zhongwei Sun 2015-01-15 10:59:39 +08:00
commit 07d3f7e399
4 changed files with 8 additions and 8 deletions

View file

@ -76,12 +76,12 @@ em, i {font-style: italic;}
/* Lists */ /* Lists */
ul { ul {
list-style: outside disc; list-style: outside disc;
margin: 0em 0 0 1.5em; margin: 0em 0 1em 1.5em;
} }
ol { ol {
list-style: outside decimal; list-style: outside decimal;
margin: 0em 0 0 1.5em; margin: 0em 0 1em 1.5em;
} }
li { margin-top: 0.5em;} li { margin-top: 0.5em;}

View file

@ -76,12 +76,12 @@ em, i {font-style: italic;}
/* Lists */ /* Lists */
ul { ul {
list-style: outside disc; list-style: outside disc;
margin: 0em 0 0 1.5em; margin: 0em 0 1em 1.5em;
} }
ol { ol {
list-style: outside decimal; list-style: outside decimal;
margin: 0em 0 0 1.5em; margin: 0em 0 1em 1.5em;
} }
li { margin-top: 0.5em;} li { margin-top: 0.5em;}

View file

@ -76,12 +76,12 @@ em, i {font-style: italic;}
/* Lists */ /* Lists */
ul { ul {
list-style: outside disc; list-style: outside disc;
margin: 0em 0 0 1.5em; margin: 0em 0 1em 1.5em;
} }
ol { ol {
list-style: outside decimal; list-style: outside decimal;
margin: 0em 0 0 1.5em; margin: 0em 0 1em 1.5em;
} }
li { margin-top: 0.5em;} li { margin-top: 0.5em;}

View file

@ -75,12 +75,12 @@ em, i {font-style: italic;}
/* Lists */ /* Lists */
ul { ul {
list-style: outside disc; list-style: outside disc;
margin: 0em 0 0 1.5em; margin: 0em 0 1em 1.5em;
} }
ol { ol {
list-style: outside decimal; list-style: outside decimal;
margin: 0em 0 0 1.5em; margin: 0em 0 1em 1.5em;
} }
li { margin-top: 0.5em;} li { margin-top: 0.5em;}