Skip to content
This repository

fix bug 769351 - Preventing entity conversion breaking templates #325

Merged
merged 2 commits into from almost 2 years ago

2 participants

David Walsh Les Orchard
David Walsh
Collaborator

This also fixes the edit header's alignment issues with the "i" info icon.

Les Orchard lmorchard merged commit 026343b into from June 29, 2012
Les Orchard lmorchard closed this June 29, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
1  apps/wiki/templates/wiki/ckeditor_config.js
@@ -73,6 +73,7 @@ CKEDITOR.editorConfig = function(config) {
73 73
 
74 74
     config.extraPlugins = 'autogrow,definitionlist,mdn-buttons,mdn-link,mdn-syntaxhighlighter,mdn-keystrokes';
75 75
     config.removePlugins = 'link,tab';
  76
+    config.entities = false;
76 77
     
77 78
     config.toolbar_MDN = [
78 79
         ['Source', 'mdnSaveExit', 'mdnSave', '-', 'PasteText', 'PasteFromWord', '-', 'SpellChecker', 'Scayt', '-', 'Find', 'Replace', '-', 'ShowBlocks'],
6  media/css/wiki-screen.css
@@ -189,12 +189,12 @@ a.edit-section:hover, a.edit-section:active, a.edit-section:focus { color: #333;
189 189
 .editing ul.metadata li .metadataDisplay { display:inline-block; padding: 8px 0 0 3px; }
190 190
 
191 191
 .editing .title { float: left; width: 55%; }
192  
-.editing .title h1 { display: inline-block; width: auto; float: none; color: #888; }
  192
+.editing .title h1 { display: inline-block; width: auto; float: none; color: #888; float:left; }
193 193
 .editing .title h1 em { color: #333; font-style: normal; }
194  
-.editing #btn-properties { position: relative; font-size: 18px; padding: 0; margin-left: 6px; width: 1em; height: 1em; line-height: 1.2; text-indent: -999em; overflow: hidden; background: #b4b4b4 url("../img/wiki/icons/icn-info.png") center center no-repeat; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; -moz-border-radius: 1em; -webkit-border-radius: 1em; border-radius: 1em; z-index:3; }
  194
+.editing #btn-properties { position: relative; font-size: 18px; padding: 0; margin-left: 6px; width: 1em; height: 1em; line-height: 1.2; text-indent: -999em; overflow: hidden; background: #b4b4b4 url("../img/wiki/icons/icn-info.png") center center no-repeat; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; -moz-border-radius: 1em; -webkit-border-radius: 1em; border-radius: 1em; z-index:3; margin-top: 9px; }
195 195
 .editing #btn-properties:hover, .editing #btn-properties:focus { background-color: #25a; }
196 196
 
197  
-.editing .save-state { font-size: .785em; margin: -1.75em 0 1.5em; color: #888; padding-left: 18px; }
  197
+.editing .save-state { font-size: .785em; margin: -1.75em 0 1.5em; color: #888; padding-left: 18px; clear:both; }
198 198
 .editing #btn-savedraft { font-family: inherit; font-size: 1em; line-height: 1; text-transform: none; color: #333; padding: 0; background: transparent none; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; }
199 199
 .editing #btn-savedraft:hover, .editing #btn-savedraft:focus { text-decoration: underline; color: #25a; }
200 200
 
Commit_comment_tip

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.