Commit 0ac80a1860809a0a6210231fe7e54cc53c0203b7
Committed by
Antonio Terceiro
Antonio Terceiro
1 parent
7d9c67a4
Exists in
master
and in
29 other branches
Size of titles on tinymce are the same as the size after saving
(ActionItem1517)
Showing
3 changed files
with
16 additions
and
10 deletions
Show diff stats
public/designs/themes/base/style.css
| @@ -269,7 +269,6 @@ body, th, td, input { | @@ -269,7 +269,6 @@ body, th, td, input { | ||
| 269 | #content .main-block h1, #not-found h1, #access-denied h1 { | 269 | #content .main-block h1, #not-found h1, #access-denied h1 { |
| 270 | font-variant: small-caps; | 270 | font-variant: small-caps; |
| 271 | color: #555753; | 271 | color: #555753; |
| 272 | - font-size: 16px; | ||
| 273 | text-align: left; | 272 | text-align: left; |
| 274 | border-bottom: 2px solid #2e3436; | 273 | border-bottom: 2px solid #2e3436; |
| 275 | } | 274 | } |
| @@ -776,7 +775,6 @@ X.sep { | @@ -776,7 +775,6 @@ X.sep { | ||
| 776 | #content .no-boxes h1 { | 775 | #content .no-boxes h1 { |
| 777 | font-variant: small-caps; | 776 | font-variant: small-caps; |
| 778 | color: #555753; | 777 | color: #555753; |
| 779 | - font-size: 18px; | ||
| 780 | text-align: left; | 778 | text-align: left; |
| 781 | border-bottom: 2px solid #2e3436; /*8C0*/ | 779 | border-bottom: 2px solid #2e3436; /*8C0*/ |
| 782 | } | 780 | } |
public/stylesheets/application.css
| @@ -158,11 +158,11 @@ div#notice { | @@ -158,11 +158,11 @@ div#notice { | ||
| 158 | margin: 10px 0px; | 158 | margin: 10px 0px; |
| 159 | /*color: #2A5896;*/ | 159 | /*color: #2A5896;*/ |
| 160 | } | 160 | } |
| 161 | -#content h1 { font-size: 24px } | ||
| 162 | -#content h2 { font-size: 20px } | ||
| 163 | -#content h3 { font-size: 18px } | ||
| 164 | -#content h4 { font-size: 16px } | ||
| 165 | -#content h5 { font-size: 14px } | 161 | +#content h1 { font-size: 20px } |
| 162 | +#content h2 { font-size: 18px } | ||
| 163 | +#content h3 { font-size: 16px } | ||
| 164 | +#content h4 { font-size: 14px } | ||
| 165 | +#content h5 { font-size: 13px } | ||
| 166 | #content h6 { font-size: 12px } | 166 | #content h6 { font-size: 12px } |
| 167 | 167 | ||
| 168 | #content .block-title { | 168 | #content .block-title { |
| @@ -589,9 +589,6 @@ code input { | @@ -589,9 +589,6 @@ code input { | ||
| 589 | list-style: none; | 589 | list-style: none; |
| 590 | margin-bottom: 5px; | 590 | margin-bottom: 5px; |
| 591 | } | 591 | } |
| 592 | -#online-doc-navigation h1 { | ||
| 593 | - font-size: 16px; | ||
| 594 | -} | ||
| 595 | 592 | ||
| 596 | #online-doc-navigation h1, #online-doc h1 { | 593 | #online-doc-navigation h1, #online-doc h1 { |
| 597 | text-align: left; | 594 | text-align: left; |
public/stylesheets/tinymce.css
| @@ -14,3 +14,14 @@ object, embed { | @@ -14,3 +14,14 @@ object, embed { | ||
| 14 | height: 150px; | 14 | height: 150px; |
| 15 | background-image: url(../designs/icons/tango/Tango/22x22/actions/media-playback-start.png); | 15 | background-image: url(../designs/icons/tango/Tango/22x22/actions/media-playback-start.png); |
| 16 | } | 16 | } |
| 17 | + | ||
| 18 | +body.mceContentBody h2 { font-size: 18px } | ||
| 19 | +body.mceContentBody h3 { font-size: 16px } | ||
| 20 | +body.mceContentBody h4 { font-size: 14px } | ||
| 21 | +body.mceContentBody h5 { font-size: 13px } | ||
| 22 | +body.mceContentBody h6 { font-size: 12px } | ||
| 23 | + | ||
| 24 | +body.mceContentBody h1, body.mceContentBody h2, body.mceContentBody h3, | ||
| 25 | +body.mceContentBody h4, body.mceContentBody h5, body.mceContentBody h6 { | ||
| 26 | + margin: 10px 0px; | ||
| 27 | +} |