diff --git a/src/wp-includes/css/editor.css b/src/wp-includes/css/editor.css
index 1cf0ee6da8..64300234bb 100644
--- a/src/wp-includes/css/editor.css
+++ b/src/wp-includes/css/editor.css
@@ -31,33 +31,33 @@
background: #fcfcfc;
border-bottom: 1px solid #dfdfdf;
padding: 0;
- min-height: 40px;
+ min-height: 36px;
}
.mce-window .mce-window-head .mce-title {
- font-size: 22px;
+ font-size: 20px;
font-weight: 600;
- line-height: 40px;
+ line-height: 36px;
margin: 0;
- padding: 0 40px 0 16px;
+ padding: 0 36px 0 16px;
}
.mce-window .mce-window-head .mce-close {
color: transparent;
top: 0;
right: 0;
- width: 40px;
- height: 40px;
- line-height: 40px;
+ width: 36px;
+ height: 36px;
+ line-height: 36px;
text-align: center;
}
.mce-window .mce-window-head .mce-close:before {
- font: normal 20px/2 'dashicons';
+ font: normal 20px/36px 'dashicons';
text-align: center;
color: #666;
- width: 40px;
- height: 40px;
+ width: 36px;
+ height: 36px;
display: block;
}
@@ -66,8 +66,8 @@
}
.mce-window .mce-window-head .mce-dragh {
- width: -webkit-calc( 100% - 40px );
- width: calc( 100% - 40px );
+ width: -webkit-calc( 100% - 36px );
+ width: calc( 100% - 36px );
}
.mce-textbox {
@@ -214,7 +214,7 @@ div.mce-statusbar {
}
.mce-toolbar .mce-colorbutton .mce-preview {
- margin-left: -18px;
+ margin-left: -17px;
padding: 0;
width: 18px;
}
@@ -235,23 +235,22 @@ div.mce-statusbar {
border-color: #bbb;
}
-
-.mce-toolbar .mce-btn .mce-caret {
- border: none;
- margin: 0 0 0 -5px;
- width: 16px;
+.mce-panel .mce-btn i.mce-caret {
+ border-top: 6px solid #777;
}
-.mce-toolbar .mce-listbox .mce-caret {
- margin-top: 0;
- padding: 2px 0 0;
- right: 0;
- top: 0;
- width: 16px;
+.mce-panel .mce-btn:hover i.mce-caret {
+ border-top-color: #333;
}
-.mce-toolbar .mce-listbox .mce-caret:before {
- margin-left: -6px;
+.mce-panel .mce-active i.mce-caret {
+ border-top: 0;
+ border-bottom: 6px solid #333;
+ margin-top: 7px;
+}
+
+.mce-listbox.mce-active i.mce-caret {
+ margin-top: -3px;
}
.mce-toolbar .mce-splitbtn:hover .mce-open {
@@ -307,6 +306,10 @@ div.mce-menu .mce-menu-item-sep,
padding-left: 3px;
}
+.mce-menu-has-icons i.mce-ico:before {
+ margin-left: -2px;
+}
+
/* Buttons in modals */
.mce-primary button,
.mce-primary button i {
@@ -412,13 +415,21 @@ div.mce-menu .mce-menu-item-sep,
}
@media screen and ( max-width: 782px ) {
+ .mce-toolbar .mce-btn button {
+ padding: 5px 6px;
+ }
+
+ #wp-fullscreen-buttons .mce-btn,
+ .mce-toolbar .mce-btn-group .mce-btn {
+ margin: 0 3px;
+ }
+
+ .mce-toolbar .mce-colorbutton .mce-preview {
+ margin-left: -20px;
+ }
+
.mce-window .mce-btn {
- padding: 10px 14px;
- line-height: 1;
- font-size: 14px;
- vertical-align: middle;
- height: auto;
- margin-bottom: 4px;
+ padding: 2px 0;
}
}
@@ -456,14 +467,15 @@ div.mce-menu .mce-menu-item-sep,
}
/* TinyMCE icons */
-.mce-toolbar .mce-ico,
-.mce-toolbar .mce-caret {
+.mce-toolbar .mce-ico {
color: #777;
line-height: 20px;
width: 20px;
height: 20px;
text-align: center;
text-shadow: none;
+ margin: 0;
+ padding: 0;
}
.mce-toolbar .mce-btn:hover .mce-ico,
@@ -477,6 +489,10 @@ div.mce-menu .mce-menu-item-sep,
border-left-color: #bdbdbd;
}
+.mce-toolbar .mce-btn .mce-open {
+ line-height: 20px;
+}
+
i.mce-i-bold,
i.mce-i-italic,
i.mce-i-bullist,
@@ -509,7 +525,6 @@ i.mce-i-wp_help,
i.mce-i-wp-media-library,
i.mce-i-ltr,
i.mce-i-wp_page,
-i.mce-caret,
.mce-close {
font: normal 20px/1 'dashicons';
padding: 0;
@@ -517,6 +532,8 @@ i.mce-caret,
speak: none;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
+ margin-left: -2px;
+ padding-right: 2px;
}
i.mce-i-bold:before {
@@ -637,14 +654,6 @@ i.mce-i-wp_page:before {
content: '\f105';
}
-i.mce-caret:before {
- content: '\f140';
-}
-
-.mce-active i.mce-caret:before {
- content: '\f142';
-}
-
.mce-close:before {
content: '\f158';
}
diff --git a/src/wp-includes/js/tinymce/plugins/charmap/plugin.js b/src/wp-includes/js/tinymce/plugins/charmap/plugin.js
index 7019269f88..203a38067a 100644
--- a/src/wp-includes/js/tinymce/plugins/charmap/plugin.js
+++ b/src/wp-includes/js/tinymce/plugins/charmap/plugin.js
@@ -342,7 +342,11 @@ tinymce.PluginManager.add('charmap', function(editor) {
minHeight: 80
}
],
- buttons: [] // WP, see #27107
+ buttons: [
+ {text: "Close", onclick: function() {
+ win.close();
+ }}
+ ]
});
}
@@ -358,4 +362,4 @@ tinymce.PluginManager.add('charmap', function(editor) {
onclick: showDialog,
context: 'insert'
});
-});
+});
\ No newline at end of file
diff --git a/src/wp-includes/js/tinymce/plugins/charmap/plugin.min.js b/src/wp-includes/js/tinymce/plugins/charmap/plugin.min.js
index bee3fddefa..eee3bb1e56 100644
--- a/src/wp-includes/js/tinymce/plugins/charmap/plugin.min.js
+++ b/src/wp-includes/js/tinymce/plugins/charmap/plugin.min.js
@@ -1 +1 @@
-tinymce.PluginManager.add("charmap",function(a){function b(){function b(a){for(;a;){if("TD"==a.nodeName)return a;a=a.parentNode}}var d,e,f,g;d='
';var h=25;for(f=0;10>f;f++){for(d+="",e=0;h>e;e++){var i=c[f*h+e];d+=''+(i?String.fromCharCode(parseInt(i[0],10)):" ")+" | "}d+="
"}d+="
";var j={type:"container",html:d,onclick:function(b){var c=b.target;/^(TD|DIV)$/.test(c.nodeName)&&(a.execCommand("mceInsertContent",!1,tinymce.trim(c.innerText||c.textContent)),b.ctrlKey||g.close())},onmouseover:function(a){var c=b(a.target);c&&g.find("#preview").text(c.firstChild.firstChild.data)}};g=a.windowManager.open({title:"Special character",spacing:10,padding:10,items:[j,{type:"label",name:"preview",text:" ",style:"font-size: 40px; text-align: center",border:1,minWidth:100,minHeight:80}],buttons:[]})}var c=[["160","no-break space"],["38","ampersand"],["34","quotation mark"],["162","cent sign"],["8364","euro sign"],["163","pound sign"],["165","yen sign"],["169","copyright sign"],["174","registered sign"],["8482","trade mark sign"],["8240","per mille sign"],["181","micro sign"],["183","middle dot"],["8226","bullet"],["8230","three dot leader"],["8242","minutes / feet"],["8243","seconds / inches"],["167","section sign"],["182","paragraph sign"],["223","sharp s / ess-zed"],["8249","single left-pointing angle quotation mark"],["8250","single right-pointing angle quotation mark"],["171","left pointing guillemet"],["187","right pointing guillemet"],["8216","left single quotation mark"],["8217","right single quotation mark"],["8220","left double quotation mark"],["8221","right double quotation mark"],["8218","single low-9 quotation mark"],["8222","double low-9 quotation mark"],["60","less-than sign"],["62","greater-than sign"],["8804","less-than or equal to"],["8805","greater-than or equal to"],["8211","en dash"],["8212","em dash"],["175","macron"],["8254","overline"],["164","currency sign"],["166","broken bar"],["168","diaeresis"],["161","inverted exclamation mark"],["191","turned question mark"],["710","circumflex accent"],["732","small tilde"],["176","degree sign"],["8722","minus sign"],["177","plus-minus sign"],["247","division sign"],["8260","fraction slash"],["215","multiplication sign"],["185","superscript one"],["178","superscript two"],["179","superscript three"],["188","fraction one quarter"],["189","fraction one half"],["190","fraction three quarters"],["402","function / florin"],["8747","integral"],["8721","n-ary sumation"],["8734","infinity"],["8730","square root"],["8764","similar to"],["8773","approximately equal to"],["8776","almost equal to"],["8800","not equal to"],["8801","identical to"],["8712","element of"],["8713","not an element of"],["8715","contains as member"],["8719","n-ary product"],["8743","logical and"],["8744","logical or"],["172","not sign"],["8745","intersection"],["8746","union"],["8706","partial differential"],["8704","for all"],["8707","there exists"],["8709","diameter"],["8711","backward difference"],["8727","asterisk operator"],["8733","proportional to"],["8736","angle"],["180","acute accent"],["184","cedilla"],["170","feminine ordinal indicator"],["186","masculine ordinal indicator"],["8224","dagger"],["8225","double dagger"],["192","A - grave"],["193","A - acute"],["194","A - circumflex"],["195","A - tilde"],["196","A - diaeresis"],["197","A - ring above"],["198","ligature AE"],["199","C - cedilla"],["200","E - grave"],["201","E - acute"],["202","E - circumflex"],["203","E - diaeresis"],["204","I - grave"],["205","I - acute"],["206","I - circumflex"],["207","I - diaeresis"],["208","ETH"],["209","N - tilde"],["210","O - grave"],["211","O - acute"],["212","O - circumflex"],["213","O - tilde"],["214","O - diaeresis"],["216","O - slash"],["338","ligature OE"],["352","S - caron"],["217","U - grave"],["218","U - acute"],["219","U - circumflex"],["220","U - diaeresis"],["221","Y - acute"],["376","Y - diaeresis"],["222","THORN"],["224","a - grave"],["225","a - acute"],["226","a - circumflex"],["227","a - tilde"],["228","a - diaeresis"],["229","a - ring above"],["230","ligature ae"],["231","c - cedilla"],["232","e - grave"],["233","e - acute"],["234","e - circumflex"],["235","e - diaeresis"],["236","i - grave"],["237","i - acute"],["238","i - circumflex"],["239","i - diaeresis"],["240","eth"],["241","n - tilde"],["242","o - grave"],["243","o - acute"],["244","o - circumflex"],["245","o - tilde"],["246","o - diaeresis"],["248","o slash"],["339","ligature oe"],["353","s - caron"],["249","u - grave"],["250","u - acute"],["251","u - circumflex"],["252","u - diaeresis"],["253","y - acute"],["254","thorn"],["255","y - diaeresis"],["913","Alpha"],["914","Beta"],["915","Gamma"],["916","Delta"],["917","Epsilon"],["918","Zeta"],["919","Eta"],["920","Theta"],["921","Iota"],["922","Kappa"],["923","Lambda"],["924","Mu"],["925","Nu"],["926","Xi"],["927","Omicron"],["928","Pi"],["929","Rho"],["931","Sigma"],["932","Tau"],["933","Upsilon"],["934","Phi"],["935","Chi"],["936","Psi"],["937","Omega"],["945","alpha"],["946","beta"],["947","gamma"],["948","delta"],["949","epsilon"],["950","zeta"],["951","eta"],["952","theta"],["953","iota"],["954","kappa"],["955","lambda"],["956","mu"],["957","nu"],["958","xi"],["959","omicron"],["960","pi"],["961","rho"],["962","final sigma"],["963","sigma"],["964","tau"],["965","upsilon"],["966","phi"],["967","chi"],["968","psi"],["969","omega"],["8501","alef symbol"],["982","pi symbol"],["8476","real part symbol"],["978","upsilon - hook symbol"],["8472","Weierstrass p"],["8465","imaginary part"],["8592","leftwards arrow"],["8593","upwards arrow"],["8594","rightwards arrow"],["8595","downwards arrow"],["8596","left right arrow"],["8629","carriage return"],["8656","leftwards double arrow"],["8657","upwards double arrow"],["8658","rightwards double arrow"],["8659","downwards double arrow"],["8660","left right double arrow"],["8756","therefore"],["8834","subset of"],["8835","superset of"],["8836","not a subset of"],["8838","subset of or equal to"],["8839","superset of or equal to"],["8853","circled plus"],["8855","circled times"],["8869","perpendicular"],["8901","dot operator"],["8968","left ceiling"],["8969","right ceiling"],["8970","left floor"],["8971","right floor"],["9001","left-pointing angle bracket"],["9002","right-pointing angle bracket"],["9674","lozenge"],["9824","black spade suit"],["9827","black club suit"],["9829","black heart suit"],["9830","black diamond suit"],["8194","en space"],["8195","em space"],["8201","thin space"],["8204","zero width non-joiner"],["8205","zero width joiner"],["8206","left-to-right mark"],["8207","right-to-left mark"],["173","soft hyphen"]];a.addButton("charmap",{icon:"charmap",tooltip:"Special character",onclick:b}),a.addMenuItem("charmap",{icon:"charmap",text:"Special character",onclick:b,context:"insert"})});
\ No newline at end of file
+tinymce.PluginManager.add("charmap",function(e){function a(){function a(e){for(;e;){if("TD"==e.nodeName)return e;e=e.parentNode}}var i,r,o,n;i='';var l=25;for(o=0;10>o;o++){for(i+="",r=0;l>r;r++){var s=t[o*l+r];i+=''+(s?String.fromCharCode(parseInt(s[0],10)):" ")+" | "}i+="
"}i+="
";var c={type:"container",html:i,onclick:function(a){var t=a.target;/^(TD|DIV)$/.test(t.nodeName)&&(e.execCommand("mceInsertContent",!1,tinymce.trim(t.innerText||t.textContent)),a.ctrlKey||n.close())},onmouseover:function(e){var t=a(e.target);t&&n.find("#preview").text(t.firstChild.firstChild.data)}};n=e.windowManager.open({title:"Special character",spacing:10,padding:10,items:[c,{type:"label",name:"preview",text:" ",style:"font-size: 40px; text-align: center",border:1,minWidth:100,minHeight:80}],buttons:[{text:"Close",onclick:function(){n.close()}}]})}var t=[["160","no-break space"],["38","ampersand"],["34","quotation mark"],["162","cent sign"],["8364","euro sign"],["163","pound sign"],["165","yen sign"],["169","copyright sign"],["174","registered sign"],["8482","trade mark sign"],["8240","per mille sign"],["181","micro sign"],["183","middle dot"],["8226","bullet"],["8230","three dot leader"],["8242","minutes / feet"],["8243","seconds / inches"],["167","section sign"],["182","paragraph sign"],["223","sharp s / ess-zed"],["8249","single left-pointing angle quotation mark"],["8250","single right-pointing angle quotation mark"],["171","left pointing guillemet"],["187","right pointing guillemet"],["8216","left single quotation mark"],["8217","right single quotation mark"],["8220","left double quotation mark"],["8221","right double quotation mark"],["8218","single low-9 quotation mark"],["8222","double low-9 quotation mark"],["60","less-than sign"],["62","greater-than sign"],["8804","less-than or equal to"],["8805","greater-than or equal to"],["8211","en dash"],["8212","em dash"],["175","macron"],["8254","overline"],["164","currency sign"],["166","broken bar"],["168","diaeresis"],["161","inverted exclamation mark"],["191","turned question mark"],["710","circumflex accent"],["732","small tilde"],["176","degree sign"],["8722","minus sign"],["177","plus-minus sign"],["247","division sign"],["8260","fraction slash"],["215","multiplication sign"],["185","superscript one"],["178","superscript two"],["179","superscript three"],["188","fraction one quarter"],["189","fraction one half"],["190","fraction three quarters"],["402","function / florin"],["8747","integral"],["8721","n-ary sumation"],["8734","infinity"],["8730","square root"],["8764","similar to"],["8773","approximately equal to"],["8776","almost equal to"],["8800","not equal to"],["8801","identical to"],["8712","element of"],["8713","not an element of"],["8715","contains as member"],["8719","n-ary product"],["8743","logical and"],["8744","logical or"],["172","not sign"],["8745","intersection"],["8746","union"],["8706","partial differential"],["8704","for all"],["8707","there exists"],["8709","diameter"],["8711","backward difference"],["8727","asterisk operator"],["8733","proportional to"],["8736","angle"],["180","acute accent"],["184","cedilla"],["170","feminine ordinal indicator"],["186","masculine ordinal indicator"],["8224","dagger"],["8225","double dagger"],["192","A - grave"],["193","A - acute"],["194","A - circumflex"],["195","A - tilde"],["196","A - diaeresis"],["197","A - ring above"],["198","ligature AE"],["199","C - cedilla"],["200","E - grave"],["201","E - acute"],["202","E - circumflex"],["203","E - diaeresis"],["204","I - grave"],["205","I - acute"],["206","I - circumflex"],["207","I - diaeresis"],["208","ETH"],["209","N - tilde"],["210","O - grave"],["211","O - acute"],["212","O - circumflex"],["213","O - tilde"],["214","O - diaeresis"],["216","O - slash"],["338","ligature OE"],["352","S - caron"],["217","U - grave"],["218","U - acute"],["219","U - circumflex"],["220","U - diaeresis"],["221","Y - acute"],["376","Y - diaeresis"],["222","THORN"],["224","a - grave"],["225","a - acute"],["226","a - circumflex"],["227","a - tilde"],["228","a - diaeresis"],["229","a - ring above"],["230","ligature ae"],["231","c - cedilla"],["232","e - grave"],["233","e - acute"],["234","e - circumflex"],["235","e - diaeresis"],["236","i - grave"],["237","i - acute"],["238","i - circumflex"],["239","i - diaeresis"],["240","eth"],["241","n - tilde"],["242","o - grave"],["243","o - acute"],["244","o - circumflex"],["245","o - tilde"],["246","o - diaeresis"],["248","o slash"],["339","ligature oe"],["353","s - caron"],["249","u - grave"],["250","u - acute"],["251","u - circumflex"],["252","u - diaeresis"],["253","y - acute"],["254","thorn"],["255","y - diaeresis"],["913","Alpha"],["914","Beta"],["915","Gamma"],["916","Delta"],["917","Epsilon"],["918","Zeta"],["919","Eta"],["920","Theta"],["921","Iota"],["922","Kappa"],["923","Lambda"],["924","Mu"],["925","Nu"],["926","Xi"],["927","Omicron"],["928","Pi"],["929","Rho"],["931","Sigma"],["932","Tau"],["933","Upsilon"],["934","Phi"],["935","Chi"],["936","Psi"],["937","Omega"],["945","alpha"],["946","beta"],["947","gamma"],["948","delta"],["949","epsilon"],["950","zeta"],["951","eta"],["952","theta"],["953","iota"],["954","kappa"],["955","lambda"],["956","mu"],["957","nu"],["958","xi"],["959","omicron"],["960","pi"],["961","rho"],["962","final sigma"],["963","sigma"],["964","tau"],["965","upsilon"],["966","phi"],["967","chi"],["968","psi"],["969","omega"],["8501","alef symbol"],["982","pi symbol"],["8476","real part symbol"],["978","upsilon - hook symbol"],["8472","Weierstrass p"],["8465","imaginary part"],["8592","leftwards arrow"],["8593","upwards arrow"],["8594","rightwards arrow"],["8595","downwards arrow"],["8596","left right arrow"],["8629","carriage return"],["8656","leftwards double arrow"],["8657","upwards double arrow"],["8658","rightwards double arrow"],["8659","downwards double arrow"],["8660","left right double arrow"],["8756","therefore"],["8834","subset of"],["8835","superset of"],["8836","not a subset of"],["8838","subset of or equal to"],["8839","superset of or equal to"],["8853","circled plus"],["8855","circled times"],["8869","perpendicular"],["8901","dot operator"],["8968","left ceiling"],["8969","right ceiling"],["8970","left floor"],["8971","right floor"],["9001","left-pointing angle bracket"],["9002","right-pointing angle bracket"],["9674","lozenge"],["9824","black spade suit"],["9827","black club suit"],["9829","black heart suit"],["9830","black diamond suit"],["8194","en space"],["8195","em space"],["8201","thin space"],["8204","zero width non-joiner"],["8205","zero width joiner"],["8206","left-to-right mark"],["8207","right-to-left mark"],["173","soft hyphen"]];e.addButton("charmap",{icon:"charmap",tooltip:"Special character",onclick:a}),e.addMenuItem("charmap",{icon:"charmap",text:"Special character",onclick:a,context:"insert"})});
\ No newline at end of file
diff --git a/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js b/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js
index e838f7d429..3534e6aa62 100644
--- a/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js
+++ b/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js
@@ -237,6 +237,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
if ( typeof wp !== 'undefined' && wp.media && wp.media.editor ) {
editor.addMenuItem( 'add_media', {
text: 'Add Media',
+ icon: 'wp-media-library',
context: 'insert',
cmd: 'WP_Medialib'
});
@@ -245,6 +246,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
// Insert "Read More..."
editor.addMenuItem( 'wp_more', {
text: 'Insert Read More tag',
+ icon: 'wp_more',
context: 'insert',
onclick: function() {
editor.execCommand( 'WP_More', 'more' );
@@ -254,6 +256,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
// Insert "Next Page"
editor.addMenuItem( 'wp_page', {
text: 'Page break',
+ icon: 'wp_page',
context: 'insert',
onclick: function() {
editor.execCommand( 'WP_More', 'nextpage' );
diff --git a/src/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.js b/src/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.js
index 8865bef142..cd8fa15af1 100644
--- a/src/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.js
+++ b/src/wp-includes/js/tinymce/plugins/wpfullscreen/plugin.js
@@ -96,6 +96,7 @@ tinymce.PluginManager.add( 'wpfullscreen', function( editor ) {
editor.addMenuItem( 'wp_fullscreen', {
text: 'Distraction Free Writing',
+ icon: 'wp_fullscreen',
shortcut: 'Alt+Shift+W',
context: 'view',
onclick: toggleFullscreen