Merge branch 'MDL-42102-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 31 Oct 2013 10:38:25 +0000 (18:38 +0800)
committerSam Hemelryk <sam@moodle.com>
Fri, 1 Nov 2013 00:59:27 +0000 (08:59 +0800)
Conflicts:
lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/ui.css

lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/attributes.png [new file with mode: 0644]
lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/attributes.svg [new file with mode: 0644]
lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/cancel.png
lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/cancel.svg
lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/text_color_picker.png [new file with mode: 0644]
lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/text_color_picker.svg [new file with mode: 0644]
lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/text_highlight_picker.png [new file with mode: 0644]
lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/text_highlight_picker.svg [new file with mode: 0644]
lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/ui.css

diff --git a/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/attributes.png b/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/attributes.png
new file mode 100644 (file)
index 0000000..f5137ee
Binary files /dev/null and b/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/attributes.png differ
diff --git a/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/attributes.svg b/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/attributes.svg
new file mode 100644 (file)
index 0000000..18c892e
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="0 -0.1 16 16" style="overflow:visible;enable-background:new 0 -0.1 16 16;"\r
+        xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<path style="fill:#999999;" d="M14,5.4v9.5H0v-13h10.5l-2,2H1v10h12V6.4L14,5.4z M14.5,3.5l1.1-1.1C16,2,16,1.4,15.6,1l-0.7-0.7\r
+       c-0.4-0.4-1-0.4-1.4,0l-1.1,1.1L14.5,3.5z M13.7,4.3L8.1,9.9L6,9.9l0-2.1l5.6-5.6L13.7,4.3z"/>\r
+</svg>\r
index 607dc55..adeb35d 100644 (file)
Binary files a/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/cancel.png and b/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/cancel.png differ
index 271743b..cf88a6b 100644 (file)
@@ -6,12 +6,10 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"\r
-        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
+        xml:space="preserve">\r
 <defs>\r
 </defs>\r
-<path style="fill:#999999;" d="M15.9,12.9L15.9,12.9L11,8l4.9-4.9C15.9,3.1,15.9,3,16,3c0.1-0.2,0-0.4-0.1-0.5l-2.3-2.3\r
-       C13.4,0,13.2,0,13,0c-0.1,0-0.1,0.1-0.2,0.1L8,5L3.1,0.1C3.1,0.1,3,0.1,3,0C2.8,0,2.6,0,2.4,0.1L0.1,2.4C0,2.6,0,2.8,0,3\r
-       c0,0.1,0.1,0.1,0.1,0.2L5,8l-4.9,4.9C0.1,12.9,0.1,13,0,13c-0.1,0.2,0,0.4,0.1,0.5l2.3,2.3C2.6,16,2.8,16,3,16\r
-       c0.1,0,0.1-0.1,0.2-0.1L8,11l4.9,4.9c0.1,0.1,0.1,0.1,0.2,0.1c0.2,0.1,0.4,0,0.5-0.1l2.3-2.3C16,13.4,16,13.2,16,13\r
-       C15.9,13,15.9,12.9,15.9,12.9"/>\r
+<path style="fill:#989898;" d="M8,0C3.6,0,0,3.6,0,8c0,4.4,3.6,8,8,8c4.4,0,8-3.6,8-8C16,3.6,12.4,0,8,0z M8,15c-3.9,0-7-3.1-7-7\r
+       s3.1-7,7-7s7,3.1,7,7S11.9,15,8,15z M8.2,9.6l-2.7,2.7C4.9,12,4.4,11.5,4,11l2.8-2.8l-3-3c0.4-0.6,0.9-1,1.4-1.4l3,3L11,4\r
+       c0.5,0.4,1,0.9,1.3,1.5L9.6,8.2l2.5,2.5c-0.4,0.6-0.9,1-1.4,1.4L8.2,9.6z"/>\r
 </svg>\r
diff --git a/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/text_color_picker.png b/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/text_color_picker.png
new file mode 100644 (file)
index 0000000..8582e31
Binary files /dev/null and b/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/text_color_picker.png differ
diff --git a/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/text_color_picker.svg b/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/text_color_picker.svg
new file mode 100644 (file)
index 0000000..4502db8
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="-2 -1.6 16 16"\r
+        style="overflow:visible;enable-background:new -2 -1.6 16 16;" xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<path style="fill:#999999;" d="M0,12c0.4,0,0.8-0.2,1-0.6c0.2-0.2,0.4-0.7,0.7-1.5l4-9.9h0.5l4,9.5c0.5,1.1,0.8,1.7,1,2.1\r
+       s0.5,0.5,0.9,0.4v0.5H6.4V12c0.6,0,1-0.1,1.2-0.1s0.3-0.3,0.3-0.6c0-0.1,0-0.4-0.1-0.6c-0.1-0.2-0.1-0.4-0.2-0.6L7,8.9H3\r
+       c-0.3,0.7-0.4,1.2-0.5,1.4c-0.2,0.5-0.2,0.8-0.2,1c0,0.3,0.2,0.4,0.5,0.6C3,11.9,3.3,11.9,3.7,12v0.5H0V12z M6.8,8.2L5,4H4.9\r
+       L3.2,8.2H6.8z"/>\r
+</svg>\r
diff --git a/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/text_highlight_picker.png b/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/text_highlight_picker.png
new file mode 100644 (file)
index 0000000..b56921d
Binary files /dev/null and b/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/text_highlight_picker.png differ
diff --git a/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/text_highlight_picker.svg b/lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/img/text_highlight_picker.svg
new file mode 100644 (file)
index 0000000..e313998
--- /dev/null
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"\r
+        xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<path style="fill:#999999;" d="M5.4,14.5L4.5,16H0v-0.1l1.9-3.3L5.4,14.5z M16,0h-0.3l-4.5,10.3L2.7,5.5l4-5.5H5.5L1.3,5.8L1.6,6\r
+       c0.4,1,1.2,3.5,0.2,5.3l4.8,2.8c1.1-1.9,3.6-2.4,4.7-2.5l0.4,0.2l4.4-10V0z"/>\r
+</svg>\r
index bacf74c..c528a6c 100644 (file)
 .moodleSkin span.mce_visualblocks {background:url(img/visual_blocks.png) center center no-repeat;}
 .moodleSkin span.mce_backward {background:url(img/backward.png) center center no-repeat;}
 .moodleSkin span.mce_forward {background:url(img/forward.png) center center no-repeat;}
+.moodleSkin span.mce_attribs {background:url(img/attributes.png) center center no-repeat;}
 
-.moodleSkin span.mce_forecolorpicker {background:url(img/text_color.png) center center no-repeat;}
-.moodleSkin span.mce_backcolorpicker {background:url(img/text_highlight.png) center center no-repeat;}
+.moodleSkin span.mce_forecolorpicker {background:url(img/text_color_picker.png) center center no-repeat;}
+.moodleSkin span.mce_backcolorpicker {background:url(img/text_highlight_picker.png) center center no-repeat;}
 .moodleSkin .mce_forecolor span.mceAction {background:url(img/text_color.png) center center no-repeat;}
 .moodleSkin .mce_backcolor span.mceAction {background:url(img/text_highlight.png) center center no-repeat;}