Fossil SCM
Merged two redundant style rules for sidebars. Manual merge error?
Commit
825efe96d25864cebc92adbdbffe6b8333fadfdffc29afd5787cfbbec4a0f764
Parent
6b520900c9b3c29…
1 file changed
+1
-4
+1
-4
| --- src/default.css | ||
| +++ src/default.css | ||
| @@ -1539,16 +1539,13 @@ | ||
| 1539 | 1539 | .markdown blockquote, p.blockquote, .sidebar { |
| 1540 | 1540 | background-color: rgba(0, 0, 0, 0.05); |
| 1541 | 1541 | border-left: 3px solid #777; |
| 1542 | 1542 | padding: 0.1em 1em; |
| 1543 | 1543 | } |
| 1544 | -.sidebar { | |
| 1545 | - font-size: 90%; | |
| 1546 | -} | |
| 1547 | 1544 | .sidebar { |
| 1548 | 1545 | /* Generic form that can be applied to any block element. */ |
| 1549 | - font-size: 0.9em; | |
| 1546 | + font-size: 90%; | |
| 1550 | 1547 | } |
| 1551 | 1548 | div.sidebar { |
| 1552 | 1549 | /* Special exception for div-type sidebars, where there is no p |
| 1553 | 1550 | * wrapper inside to give us the extra padding we want. */ |
| 1554 | 1551 | padding: 1em; |
| 1555 | 1552 |
| --- src/default.css | |
| +++ src/default.css | |
| @@ -1539,16 +1539,13 @@ | |
| 1539 | .markdown blockquote, p.blockquote, .sidebar { |
| 1540 | background-color: rgba(0, 0, 0, 0.05); |
| 1541 | border-left: 3px solid #777; |
| 1542 | padding: 0.1em 1em; |
| 1543 | } |
| 1544 | .sidebar { |
| 1545 | font-size: 90%; |
| 1546 | } |
| 1547 | .sidebar { |
| 1548 | /* Generic form that can be applied to any block element. */ |
| 1549 | font-size: 0.9em; |
| 1550 | } |
| 1551 | div.sidebar { |
| 1552 | /* Special exception for div-type sidebars, where there is no p |
| 1553 | * wrapper inside to give us the extra padding we want. */ |
| 1554 | padding: 1em; |
| 1555 |
| --- src/default.css | |
| +++ src/default.css | |
| @@ -1539,16 +1539,13 @@ | |
| 1539 | .markdown blockquote, p.blockquote, .sidebar { |
| 1540 | background-color: rgba(0, 0, 0, 0.05); |
| 1541 | border-left: 3px solid #777; |
| 1542 | padding: 0.1em 1em; |
| 1543 | } |
| 1544 | .sidebar { |
| 1545 | /* Generic form that can be applied to any block element. */ |
| 1546 | font-size: 90%; |
| 1547 | } |
| 1548 | div.sidebar { |
| 1549 | /* Special exception for div-type sidebars, where there is no p |
| 1550 | * wrapper inside to give us the extra padding we want. */ |
| 1551 | padding: 1em; |
| 1552 |