diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-10-29 10:49:21 -0300 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-10-29 10:49:21 -0300 |
| commit | 6c4e201e36bf1d8270562f70018d29b40be1ebf3 (patch) | |
| tree | f9bee75b3fd4e6a39dbaeeeff9167c2be05678cd /askbot | |
| parent | c83d17e957ae1b725e9d2ea24e6eeba0e341409f (diff) | |
| download | askbot-6c4e201e36bf1d8270562f70018d29b40be1ebf3.tar.gz askbot-6c4e201e36bf1d8270562f70018d29b40be1ebf3.tar.bz2 askbot-6c4e201e36bf1d8270562f70018d29b40be1ebf3.zip | |
copied styles from askbot to tinymce content
Diffstat (limited to 'askbot')
| -rw-r--r-- | askbot/media/js/tinymce/plugins/preview/preview.html | 1 | ||||
| -rw-r--r-- | askbot/media/style/style.less | 45 | ||||
| -rw-r--r-- | askbot/media/style/tinymce/content.css | 76 |
3 files changed, 94 insertions, 28 deletions
diff --git a/askbot/media/js/tinymce/plugins/preview/preview.html b/askbot/media/js/tinymce/plugins/preview/preview.html index 67e7b142..16693edb 100644 --- a/askbot/media/js/tinymce/plugins/preview/preview.html +++ b/askbot/media/js/tinymce/plugins/preview/preview.html @@ -1,6 +1,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
+<link type="text/css" href="/m/default/media/style/style.css" rel="stylesheet" />
<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
<script type="text/javascript" src="jscripts/embed.js"></script>
<script type="text/javascript"><!--
diff --git a/askbot/media/style/style.less b/askbot/media/style/style.less index 9e2e2a25..828bf996 100644 --- a/askbot/media/style/style.less +++ b/askbot/media/style/style.less @@ -102,18 +102,15 @@ pre { font-family: Consolas, Monaco, Liberation Mono, Lucida Console, Monospace; font-size: 100%; margin-bottom: 10px; - /*overflow: auto;*/ background-color: #F5F5F5; padding-left: 5px; padding-top: 5px; - /*width: 671px;*/ padding-bottom: 20px ! ie7; } code { font-family: Consolas, Monaco, Liberation Mono, Lucida Console, Monospace; font-size: 100%; - } blockquote { @@ -1678,15 +1675,16 @@ ul#related-tags li { } .wmd-preview { + color: #525252; margin: 0; padding: 5px; background-color: #F5F5F5; min-height: 20px; overflow: auto; font-size:13px; - font-family:@body-font; + font-family: @body-font; - p{ + p { margin-bottom: 14px; line-height: 1.4; font-size: 14px; @@ -1695,19 +1693,27 @@ ul#related-tags li { p:last-child{ margin-bottom: 0; } -} -.wmd-preview pre { - background-color: #E7F1F8; + pre { + background-color: #E7F1F8; + } -} + blockquote { + background-color: #eee; + } -.wmd-preview blockquote { - background-color: #eee; -} + img { + max-width: 600px; + } -.wmd-preview IMG { - max-width: 600px; + a { + color: @link; + } + + li { + margin-bottom:7px; + font-size:14px; + } } .defaultSkin table.mceLayout, @@ -3605,17 +3611,6 @@ p.signup_p { } } -/* a workaround to set link colors correctly */ - -.wmd-preview a { - color:@link; -} - -.wmd-preview li { - margin-bottom:7px; - font-size:14px; -} - .search-result-summary { font-weight: bold; font-size:18px; diff --git a/askbot/media/style/tinymce/content.css b/askbot/media/style/tinymce/content.css index 41c45d1e..7a81caaf 100644 --- a/askbot/media/style/tinymce/content.css +++ b/askbot/media/style/tinymce/content.css @@ -51,8 +51,78 @@ font[face=mceinline] {font-family:inherit !important} /* overrides on top of default */ body.mceContentBody { - font-size: 13px; - background-color:#fff; - padding: 0; + font-size: 14px; + background-color: white; + padding: 5px; + margin: 0; line-height:135%; + color: #525252; + font-family: Arial; +} + +body.mceContentBody p { + margin-bottom: 14px; + line-height: 1.4; + font-size: 14px; +} + +body.mceContentBody p:last-child { + margin-bottom: 0; +} + +body.mceContentBody pre { + background-color: #E7F1F8; +} + +body.mceContentBody blockquote { + background-color: #eee; +} + +body.mceContentBody img { + max-width: 600px; +} + +body.mceContentBody a { + color: #1b79bd; +} + +body.mceContentBody li { + margin-bottom:7px; + font-size:14px; +} + +body.mceContentBody ul { + list-style: disc; + margin-left: 20px; + padding-left: 0px; + margin-bottom: 1em; +} + +body.mceContentBody ol { + list-style: decimal; + margin-left: 30px; + margin-bottom: 1em; + padding-left: 0px; +} + +body.mceContentBody pre { + font-family: Consolas, Monaco, Liberation Mono, Lucida Console, Monospace; + font-size: 100%; + margin-bottom: 10px; + background-color: #F5F5F5; + padding-left: 5px; + padding-top: 5px; + padding-bottom: 20px ! ie7; +} + +body.mceContentBody code { + font-family: Consolas, Monaco, Liberation Mono, Lucida Console, Monospace; + font-size: 100%; +} + +body.mceContentBody blockquote { + margin-bottom: 10px; + margin-right: 15px; + padding: 10px 0px 1px 10px; + background-color: #F5F5F5; } |