Committer: skomarov
LJSUP-10170: Correct css in RTEU trunk/htdocs/js/ck/contents.css U trunk/htdocs/js/ck/plugins/livejournal/plugin.js U trunk/htdocs/js/ck/skins/v2/dialog.css U trunk/htdocs/js/ck/skins/v2/editor.css
Modified: trunk/htdocs/js/ck/contents.css =================================================================== --- trunk/htdocs/js/ck/contents.css 2011-10-25 13:11:15 UTC (rev 20428) +++ trunk/htdocs/js/ck/contents.css 2011-10-25 14:21:56 UTC (rev 20429) @@ -113,52 +113,55 @@ } /* LJ Like buttons */ -.lj-like-item { +.lj-like-wrapper { display: inline-block; - margin-right: 15px; - background: url(/js/ck/images/lj-like-buttons.png) no-repeat; - vertical-align: middle; - font-size: 0; - cursor: pointer; + padding: 10px; } -.fb { - width: 93px; - height: 20px; - background-position: 0 0; - } -.tw { - width: 55px; - height: 20px; - background-position: 0 -46px; - } -.go { - width: 32px; - height: 20px; - background-position: 0 -90px; - } -.vk { - width: 40px; - height: 22px; - background-position: 0 -67px; - } -.lj { - width: 67px; - height: 24px; - background-position: 0 -21px; - } - -/* LJ map */ - .lj-map P { - position: relative; - top: 45%; + .lj-like-item { display: inline-block; - padding: 5px 15px; - margin: 0; - background: #FFF; - border: 1px solid #FF0000; - text-align: center; - text-transform: uppercase; - line-height: 12px; - font-size: 12px; - color: #FF0000; + margin-right: 15px; + background: url(/js/ck/images/lj-like-buttons.png) no-repeat; + vertical-align: middle; + font-size: 0; + cursor: pointer; } + .fb { + width: 93px; + height: 20px; + background-position: 0 0; + } + .tw { + width: 55px; + height: 20px; + background-position: 0 -46px; + } + .go { + width: 32px; + height: 20px; + background-position: 0 -90px; + } + .vk { + width: 40px; + height: 22px; + background-position: 0 -67px; + } + .lj { + width: 67px; + height: 24px; + background-position: 0 -21px; + } +/* LJ map */ +.lj-map { + position: relative; + top: 45%; + display: inline-block; + padding: 5px 15px; + margin: 0; + background: #FFF; + border: 1px solid #FF0000; + text-align: center; + text-transform: uppercase; + line-height: 12px; + font-size: 12px; + color: #FF0000; + } Modified: trunk/htdocs/js/ck/plugins/livejournal/plugin.js =================================================================== --- trunk/htdocs/js/ck/plugins/livejournal/plugin.js 2011-10-25 13:11:15 UTC (rev 20428) +++ trunk/htdocs/js/ck/plugins/livejournal/plugin.js 2011-10-25 14:21:56 UTC (rev 20429) @@ -469,7 +469,7 @@ var length = frames.count(); while (length--) { - var iFrameCss = 'widht: 100%; margin: 0; padding 0; overflow-y: hidden;', + var iFrameCss = 'width: 100%; margin: 0; padding 0; overflow-y: hidden;', frame = frames.getItem(length), cmd = frame.getAttribute('lj-cmd'), frameWin = frame.$.contentWindow, @@ -1046,13 +1046,13 @@ editor .addCss('.lj-like {' + + 'width: 100%;' + + 'height: 44px !important;' + 'overflow: hidden;' + 'padding: 0;' + 'margin: 0;' + 'background: #D2D2D2;' + 'border: 1px dotted #000;' + - 'width: 100%;' + - 'height: 24px;' + '}'); for (var i = 0; i < buttonsLength; i++) { @@ -1086,7 +1086,7 @@ } var attr = [], - likeHtml = '', + likeHtml = '<span class="lj-like-wrapper">', likeNode = ljTagsData.LJLike.node; for (var i = 0; i < buttonsLength; i++) { @@ -1099,7 +1099,7 @@ likeHtml += button.html; } } - + likeHtml += '</span>'; if (attr.length) { if (likeNode) { ljTagsData.LJLike.node.setAttribute('buttons', attr.join(',')); @@ -1188,6 +1188,7 @@ ////////// LJ Map Button ////////////// editor .addCss('.lj-map {' + + 'width: 100%;' + 'overflow: hidden;' + 'min-height: 13px;' + 'margin-top: 20px;' + @@ -1210,7 +1211,7 @@ fakeElement.attributes['lj-style'] = element.attributes.style; } fakeElement.attributes['lj-cmd'] = 'LJLike'; - fakeElement.attributes['lj-content'] = ''; + fakeElement.attributes['lj-content'] = '<span class="lj-like-wrapper">'; fakeElement.attributes['frameBorder'] = 0; fakeElement.attributes['allowTransparency'] = 'true'; @@ -1226,6 +1227,7 @@ attr.push(buttonName); } } + fakeElement.attributes['lj-content'] += '</span>'; fakeElement.attributes.buttons = attr.join(','); return fakeElement; @@ -1313,7 +1315,8 @@ fakeElement.attributes['lj-url'] = element.attributes.url ? encodeURIComponent(element.attributes.url) : ''; fakeElement.attributes['class'] = 'lj-map'; - fakeElement.attributes['lj-content'] = '<p>map</p>'; + fakeElement.attributes['lj-content'] = '<p class="lj-map">map</p>'; + fakeElement.attributes['lj-style'] = ' height: 100%; text-align: center;'; fakeElement.attributes['frameBorder'] = 0; fakeElement.attributes['allowTransparency'] = 'true'; Modified: trunk/htdocs/js/ck/skins/v2/dialog.css =================================================================== --- trunk/htdocs/js/ck/skins/v2/dialog.css 2011-10-25 13:11:15 UTC (rev 20428) +++ trunk/htdocs/js/ck/skins/v2/dialog.css 2011-10-25 14:21:56 UTC (rev 20429) @@ -133,6 +133,7 @@ position:static; } .cke_skin_v2 .cke_dialog_contents { + width: 100%; background-color:#F7F7F7; border:#CEC6B5 1px solid; overflow:auto; Modified: trunk/htdocs/js/ck/skins/v2/editor.css =================================================================== --- trunk/htdocs/js/ck/skins/v2/editor.css 2011-10-25 13:11:15 UTC (rev 20428) +++ trunk/htdocs/js/ck/skins/v2/editor.css 2011-10-25 14:21:56 UTC (rev 20429) @@ -1278,6 +1278,16 @@ display:inline; display:inline-block; } +.cke_skin_v2 .cke_button_LJJustifyLeft .cke_icon { + background-position:0 -216px; + } +.cke_skin_v2 .cke_button_LJJustifyCenter .cke_icon { + background-position:0 -232px; + } +.cke_skin_v2 .cke_button_LJJustifyRight .cke_icon { + background-position:0 -248px; + } + .cke_skin_v2 .cke_styles_panel { width:150px; height:170px;