Unified Diff: scss/_content.scss
Issue 29538612:
Issue 5607 - Namespace content styles in website-defaults (Closed)
Base URL: https://hg.adblockplus.org/website-defaults
Patch Set: Move global content styles to _reset.scss
Created Sept. 11, 2017, 11:11 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
scss/_reset.scss » ('j')
|
scss/_reset.scss » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: scss/_content.scss |
| =================================================================== |
| --- a/scss/_content.scss |
| +++ b/scss/_content.scss |
| @@ -19,180 +19,150 @@ |
| /******************************************************************************* |
| * Content styles |
| ******************************************************************************* |
| * 1. Document |
| * 2. Headings |
| * 3. Body content |
| ******************************************************************************/ |
| -/* Document |
| - ******************************************************************************/ |
| - |
| -p, |
| -ol, |
| -ul, |
| -dl, |
| -pre, |
| -blockquote |
| -{ |
| - /* Set consistent margins (opinionated) */ |
| - margin: 1em 0em; |
| -} |
| - |
| -/* Headings |
| - ******************************************************************************/ |
| - |
| -h1, |
| -h2, |
| -h3, |
| -h4, |
| -h5, |
| -h6 |
| -{ |
| - /* Margin on top **only** (opinionated) */ |
| - margin: 2em 0em 0.5em 0em; |
| -} |
| - |
| -h1 |
| -{ |
| - font-size: 2em; |
| -} |
| - |
| -h2 |
| -{ |
| - font-size: 1.5em; |
| -} |
| - |
| -h3 |
| +.content |
| { |
| - font-size: 1.25em; |
| -} |
| + |
| + /* Document |
| + ******************************************************************************/ |
|
juliandoucette
2017/09/11 15:54:34
NIT: Are these lines too long now that they are in
ire
2017/09/12 07:47:05
They were longer by just 2 spaces, so I shortened
|
| -h4 |
| -{ |
| - font-size: 1em; |
| -} |
| + p, |
| + ol, |
| + ul, |
| + dl, |
| + pre, |
| + blockquote |
| + { |
| + /* Set consistent margins (opinionated) */ |
| + margin: 1em 0em; |
| + } |
| -h5 |
| -{ |
| - font-size: 0.8em; |
| -} |
| + /* Headings |
| + ******************************************************************************/ |
| -h6 |
| -{ |
| - font-size: 0.7em; |
| -} |
| + h1, |
| + h2, |
| + h3, |
| + h4, |
| + h5, |
| + h6 |
| + { |
| + /* Margin on top **only** (opinionated) */ |
| + margin: 2em 0em 0.5em 0em; |
| + } |
| -/* Body content |
| - ******************************************************************************/ |
| + h1 |
| + { |
| + font-size: 2em; |
| + } |
| -abbr |
| -{ |
| - text-decoration: underline; |
| - cursor: help; |
| -} |
| + h2 |
| + { |
| + font-size: 1.5em; |
| + } |
| -b, |
| -strong |
| -{ |
| - font-weight: $bold-weight; |
| -} |
| + h3 |
| + { |
| + font-size: 1.25em; |
| + } |
| + |
| + h4 |
| + { |
| + font-size: 1em; |
| + } |
| -small |
| -{ |
| - font-size: $small-font; |
| -} |
| + h5 |
| + { |
| + font-size: 0.8em; |
| + } |
| -sup |
| -{ |
| - position: relative; |
| - font-size: 75%; |
| - vertical-align: super; |
| -} |
| + h6 |
| + { |
| + font-size: 0.7em; |
| + } |
| + |
| + /* Body content |
| + ******************************************************************************/ |
| + |
| + a, |
| + a:visited |
| + { |
| + color: $accent; |
| + } |
| -a, |
| -a:visited |
| -{ |
| - color: $accent; |
| - /* Remove the gray background on active links in IE 10. */ |
| - background-color: transparent; |
| - text-decoration: none; |
| - /* Set default pointer regardless of href (opinionated) */ |
| - cursor: pointer; |
| -} |
| + hr |
| + { |
| + border: 1px solid $secondary-light; |
| + } |
| + |
| + blockquote |
| + { |
| + padding-left: 1em; |
| + border-left: 5px solid $secondary; |
| + } |
| -a:hover, |
| -a:active, |
| -a:focus |
| -{ |
| - text-decoration: underline; |
| -} |
| + [dir="rtl"] blockquote |
| + { |
| + padding-right: 1em; |
| + padding-left: 0em; |
| + border-right: 5px solid $secondary-light; |
| + border-left: 0px; |
| + } |
| + |
| + ol, |
| + ul |
| + { |
| + padding-left: 1.5em; |
| + } |
| + |
| + [dir="rtl"] ol, |
| + [dir="rtl"] ul |
| + { |
| + padding-right: 2em; |
| + padding-left: 0em; |
| + } |
| -img |
| -{ |
| - /* Make fixed width images responsive */ |
| - max-width: 100%; |
| - /* Remove the border on images inside links in IE 10-. */ |
| - border-style: none; |
| -} |
| + ol |
| + { |
| + list-style: decimal; |
| + } |
| -hr |
| -{ |
| - border: 1px solid $secondary-light; |
| -} |
| + ul |
| + { |
| + list-style: disc; |
| + } |
| + |
| + li |
| + { |
| + margin: 0.25em 0em; |
| + } |
| -blockquote |
| -{ |
| - padding-left: 1em; |
| - border-left: 5px solid $secondary; |
| -} |
| + ol ol, |
| + ul ul, |
| + ol ul, |
| + ul ol |
| + { |
| + /* prevent double spacing lists */ |
| + margin: 0em; |
| + } |
| -[dir="rtl"] blockquote |
| -{ |
| - padding-right: 1em; |
| - padding-left: 0em; |
| - border-right: 5px solid $secondary-light; |
| - border-left: 0px; |
| + ol ol |
| + { |
| + list-style-type: lower-alpha; |
| + } |
| + |
| + dt |
| + { |
| + /* undo browser default (opinionated)*/ |
| + font-weight: $bold-weight; |
| + } |
| + |
| + dd |
| + { |
| + margin: 0.25em 0em 1em 0em; |
| + } |
| } |
| - |
| -ol, |
| -ul |
| -{ |
| - padding-left: 1.5em; |
| -} |
| - |
| -[dir="rtl"] ol, |
| -[dir="rtl"] ul |
| -{ |
| - padding-right: 2em; |
| - padding-left: 0em; |
| -} |
| - |
| -li |
| -{ |
| - margin: 0.25em 0em; |
| -} |
| - |
| -ol ol, |
| -ul ul, |
| -ol ul, |
| -ul ol |
| -{ |
| - /* prevent double spacing lists */ |
| - margin: 0em; |
| -} |
| - |
| -ol ol |
| -{ |
| - list-style-type: lower-alpha; |
| -} |
| - |
| -dt |
| -{ |
| - /* undo browser default (opinionated)*/ |
| - font-weight: $bold-weight; |
| -} |
| - |
| -dd |
| -{ |
| - margin: 0.25em 0em 1em 0em; |
| -} |
« no previous file with comments
|
« no previous file
|
scss/_reset.scss » ('j')
|
scss/_reset.scss » ('J')
