diff options
update typography and label code
3 files changed, 24 insertions, 22 deletions
| -rw-r--r-- | src/base.less | 1 | ||||
| -rw-r--r-- | src/labels.less | 5 | ||||
| -rw-r--r-- | src/typography.less | 40 |
diff --git a/src/base.less b/src/base.less index 284e9b5..d618e43 100644 --- a/src/base.less +++ b/src/base.less @@ -7,6 +7,7 @@ html { box-sizing: border-box; font-size: 10px; + line-height: 1.428571429; -webkit-tap-highlight-color: transparent; } body { diff --git a/src/labels.less b/src/labels.less index 60f55cd..3d1c457 100644 --- a/src/labels.less +++ b/src/labels.less @@ -5,8 +5,9 @@ color: lighten(@body-font-color, 20%); display: inline-block; font-size: 1em; - padding: .15em .25em; - margin-top: -.15em; + line-height: 1; + margin: -.2rem 0; + padding: .2rem .3rem; text-align: center; vertical-align: baseline; white-space: nowrap; diff --git a/src/typography.less b/src/typography.less index f3c0fc3..188ae1c 100644 --- a/src/typography.less +++ b/src/typography.less @@ -30,13 +30,12 @@ h6 { font-size: 1.6rem; } p { - line-height: 1.428571429; margin: 0 0 1rem; } blockquote { border-left: .2rem solid #ddd; - padding: 1rem 2rem; margin-left: 0; + padding: 1rem 2rem; p:last-child { margin-bottom: 0; @@ -48,8 +47,8 @@ blockquote { } ul, ol { - padding: 0; margin: 2rem 0 2rem 2rem; + padding: 0; ul, ol { @@ -77,38 +76,39 @@ ol { .lead { font-size: 120%; } +mark, .highlight { - padding: .2rem; - line-height: 1.6rem; - border-radius: .2rem; background-color: lighten(@control-color-warning, 32%); + border-radius: .2rem; + line-height: 1.6rem; + padding: .2rem; } // Code pre { - margin-top: 1em; - margin-bottom: 1em; - padding: 1.5rem; + background-color: lighten(@core-border-color, 4%); border-left: .2rem solid @core-color; line-height: 1.8rem; - background-color: lighten(@core-border-color, 4%); + margin-bottom: 1em; + margin-top: 1em; overflow: auto; + padding: 1.5rem; } code { - padding: .2rem .4rem; - margin: -.2rem .1em 0 .1em; - border-radius: .2rem; background-color: @core-border-color; - font-size: .9em; - line-height: 1em; - vertical-align: baseline; + border-radius: .2rem; + font-size: 1em; + line-height: 1.4; + margin: -.2em 0; + padding: .2em .3em; + vertical-align: middle; white-space: nowrap; pre & { - margin-top: 0; - margin-bottom: 0; - border-left: 0; background-color: transparent; + border-left: 0; line-height: 1.8rem; + margin-bottom: 0; + margin-top: 0; } -}
\ No newline at end of file +} |