From 5e7726079e941c371e33a736406450d6e35d0358 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Tue, 22 Jan 2013 23:32:51 -0500
Subject: [PATCH] studio html editor - styled <pre> and <code> elements,
 revised code tinyMCE icon

---
 cms/static/css/tiny-mce.css                       |   1 +
 common/lib/xmodule/xmodule/css/html/display.scss  |   1 +
 .../lib/xmodule/xmodule/js/src/html/edit.coffee   |   2 +-
 common/static/images/ico-tinymce-code.png         | Bin 0 -> 553 bytes
 4 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 common/static/images/ico-tinymce-code.png

diff --git a/cms/static/css/tiny-mce.css b/cms/static/css/tiny-mce.css
index a6a6e8d727..8c69c4af75 100644
--- a/cms/static/css/tiny-mce.css
+++ b/cms/static/css/tiny-mce.css
@@ -117,6 +117,7 @@ code {
     font-family: monospace, serif;
     background: none;
     color: #3c3c3c;
+    padding: 0;
 }
 
 table {
diff --git a/common/lib/xmodule/xmodule/css/html/display.scss b/common/lib/xmodule/xmodule/css/html/display.scss
index 75c2ed75c5..18794dd0b7 100644
--- a/common/lib/xmodule/xmodule/css/html/display.scss
+++ b/common/lib/xmodule/xmodule/css/html/display.scss
@@ -100,6 +100,7 @@ code {
   color: $baseFontColor;
   font-family: monospace, serif;
   background: none;
+  padding: 0;
 }
 
 table {
diff --git a/common/lib/xmodule/xmodule/js/src/html/edit.coffee b/common/lib/xmodule/xmodule/js/src/html/edit.coffee
index 6318f002f1..6de8acb8fd 100644
--- a/common/lib/xmodule/xmodule/js/src/html/edit.coffee
+++ b/common/lib/xmodule/xmodule/js/src/html/edit.coffee
@@ -51,7 +51,7 @@ class @HTMLEditingDescriptor
   @setupTinyMCE: (ed) ->
     ed.addButton('wrapAsCode', {
       title : 'Code Block',
-      image : '/static/images/code.gif',
+      image : '/static/images/ico-tinymce-code.png',
       onclick : () ->
         ed.formatter.toggle('code')
     })
diff --git a/common/static/images/ico-tinymce-code.png b/common/static/images/ico-tinymce-code.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc0b8e61f2d778daee57f255a43f36dfc0a59cbf
GIT binary patch
literal 553
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqJQaZv%WnT*Km0M*;$R7wFC6?63Ji
zmS0JbU+{rTYyyjacg>TwnR;0>fs3`m(5LX2kxSTzZ|d2+C&B~&ZT-74LiFQFCWVwg
zV&`6#`~FIeO)l*yDQK*D(Vg)=gx~9D(HHitM~t7CqgWX7<G=L-O`hxN;uunKYwLMa
zzQYV6%omJ|fnceK+yCG4%Y(eSrfmHBL+m!+jVI|DPlCg)h%={L{SceJe@E;$?Hv>B
z55;8X+X%#(v}nBgG%>1v(UGsG8g4)2b+Reu$zJ4>%iwuck|9YlYgWagNcJ5Q-I;$h
zEttJR#&d^ex|hPdW!GMWro73xwN|WHBUbuS`lKEAeU5z+`2O?MrxOpZ&wBfP|0Cu{
Xa@p?^c1$w|I+VfF)z4*}Q$iB}I9%QR

literal 0
HcmV?d00001