Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-25 06:14:58 +02:00
Code Issues Projects Releases Wiki Activity

Remove more references to MP6 and standardize on .wp-ui-* for prefixed generic class names. props nacin, kovshenin, fixes #26263.

Browse Source 
Built from https://develop.svn.wordpress.org/trunk@26635


git-svn-id: http://core.svn.wordpress.org/trunk@26525 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Helen Hou-Sandí 2013-12-04 21:16:11 +00:00
parent cac815c4e9
commit dbe43017b5
23 changed files with 78 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
wp-admin/css/colors-rtl.css
View File

@ -46,33 +46,33 @@ input[type=radio]:checked:before {
}
/* Helper classes for pulling MP6 colors */
/* Helper classes for plugins to leverage the active WordPress color scheme */
.mp6-primary {
.wp-ui-primary {
color: #fff;
background-color: #333;
}
.mp6-text-primary {
.wp-ui-text-primary {
color: #333;
}
.mp6-highlight {
.wp-ui-highlight {
color: white;
background-color: #1e8cbe;
}
.mp6-text-highlight {
.wp-ui-text-highlight {
color: #1e8cbe;
}
.mp6-notification {
.wp-ui-notification {
color: #fff;
background-color: #D54E21;
}
.mp6-text-notification {
.wp-ui-text-notification {
color: #D54E21;
}
.mp6-text-icon {
.wp-ui-text-icon {
color: #999;
}

2
wp-admin/css/colors-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

16
wp-admin/css/colors.css
View File

@ -46,33 +46,33 @@ input[type=radio]:checked:before {
}
/* Helper classes for pulling MP6 colors */
/* Helper classes for plugins to leverage the active WordPress color scheme */
.mp6-primary {
.wp-ui-primary {
color: #fff;
background-color: #333;
}
.mp6-text-primary {
.wp-ui-text-primary {
color: #333;
}
.mp6-highlight {
.wp-ui-highlight {
color: white;
background-color: #1e8cbe;
}
.mp6-text-highlight {
.wp-ui-text-highlight {
color: #1e8cbe;
}
.mp6-notification {
.wp-ui-notification {
color: #fff;
background-color: #D54E21;
}
.mp6-text-notification {
.wp-ui-text-notification {
color: #D54E21;
}
.mp6-text-icon {
.wp-ui-text-icon {
color: #999;
}

2
wp-admin/css/colors.min.css vendored
View File

File diff suppressed because one or more lines are too long

14
wp-admin/css/colors/_admin.scss
View File

@ -53,31 +53,31 @@ input[type=radio]:checked:before {
@include button( $button-color );
}
.mp6-primary {
.wp-ui-primary {
color: $text-color;
background-color: $base-color;
}
.mp6-text-primary {
.wp-ui-text-primary {
color: $base-color;
}
.mp6-highlight {
.wp-ui-highlight {
color: $menu-highlight-text;
background-color: $menu-highlight-background;
}
.mp6-text-highlight {
.wp-ui-text-highlight {
color: $menu-highlight-background;
}
.mp6-notification {
.wp-ui-notification {
color: $menu-bubble-text;
background-color: $menu-bubble-background;
}
.mp6-text-notification {
.wp-ui-text-notification {
color: $menu-bubble-background;
}
.mp6-text-icon {
.wp-ui-text-icon {
color: $menu-icon;
}
}

14
wp-admin/css/colors/blue/colors-rtl.css
View File

@ -49,22 +49,22 @@ input[type=radio]:checked:before {
background: #db9825 !important;
border-color: #bd831f !important;
text-shadow: none !important; }
.wp-core-ui .mp6-primary {
.wp-core-ui .wp-ui-primary {
color: white;
background-color: #52accc; }
.wp-core-ui .mp6-text-primary {
.wp-core-ui .wp-ui-text-primary {
color: #52accc; }
.wp-core-ui .mp6-highlight {
.wp-core-ui .wp-ui-highlight {
color: white;
background-color: #096484; }
.wp-core-ui .mp6-text-highlight {
.wp-core-ui .wp-ui-text-highlight {
color: #096484; }
.wp-core-ui .mp6-notification {
.wp-core-ui .wp-ui-notification {
color: white;
background-color: #e1a948; }
.wp-core-ui .mp6-text-notification {
.wp-core-ui .wp-ui-text-notification {
color: #e1a948; }
.wp-core-ui .mp6-text-icon {
.wp-core-ui .wp-ui-text-icon {
color: #e5f8ff; }
/* List tables */

2
wp-admin/css/colors/blue/colors-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

14
wp-admin/css/colors/blue/colors.css
View File

@ -49,22 +49,22 @@ input[type=radio]:checked:before {
background: #db9825 !important;
border-color: #bd831f !important;
text-shadow: none !important; }
.wp-core-ui .mp6-primary {
.wp-core-ui .wp-ui-primary {
color: white;
background-color: #52accc; }
.wp-core-ui .mp6-text-primary {
.wp-core-ui .wp-ui-text-primary {
color: #52accc; }
.wp-core-ui .mp6-highlight {
.wp-core-ui .wp-ui-highlight {
color: white;
background-color: #096484; }
.wp-core-ui .mp6-text-highlight {
.wp-core-ui .wp-ui-text-highlight {
color: #096484; }
.wp-core-ui .mp6-notification {
.wp-core-ui .wp-ui-notification {
color: white;
background-color: #e1a948; }
.wp-core-ui .mp6-text-notification {
.wp-core-ui .wp-ui-text-notification {
color: #e1a948; }
.wp-core-ui .mp6-text-icon {
.wp-core-ui .wp-ui-text-icon {
color: #e5f8ff; }
/* List tables */

2
wp-admin/css/colors/blue/colors.min.css vendored
View File

File diff suppressed because one or more lines are too long

14
wp-admin/css/colors/light/colors-rtl.css
View File

@ -49,22 +49,22 @@ input[type=radio]:checked:before {
background: #0384a4 !important;
border-color: #036881 !important;
text-shadow: none !important; }
.wp-core-ui .mp6-primary {
.wp-core-ui .wp-ui-primary {
color: #333333;
background-color: #e5e5e5; }
.wp-core-ui .mp6-text-primary {
.wp-core-ui .wp-ui-text-primary {
color: #e5e5e5; }
.wp-core-ui .mp6-highlight {
.wp-core-ui .wp-ui-highlight {
color: white;
background-color: #888888; }
.wp-core-ui .mp6-text-highlight {
.wp-core-ui .wp-ui-text-highlight {
color: #888888; }
.wp-core-ui .mp6-notification {
.wp-core-ui .wp-ui-notification {
color: white;
background-color: #d64e07; }
.wp-core-ui .mp6-text-notification {
.wp-core-ui .wp-ui-text-notification {
color: #d64e07; }
.wp-core-ui .mp6-text-icon {
.wp-core-ui .wp-ui-text-icon {
color: #999999; }
/* List tables */

2
wp-admin/css/colors/light/colors-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

14
wp-admin/css/colors/light/colors.css
View File

@ -49,22 +49,22 @@ input[type=radio]:checked:before {
background: #0384a4 !important;
border-color: #036881 !important;
text-shadow: none !important; }
.wp-core-ui .mp6-primary {
.wp-core-ui .wp-ui-primary {
color: #333333;
background-color: #e5e5e5; }
.wp-core-ui .mp6-text-primary {
.wp-core-ui .wp-ui-text-primary {
color: #e5e5e5; }
.wp-core-ui .mp6-highlight {
.wp-core-ui .wp-ui-highlight {
color: white;
background-color: #888888; }
.wp-core-ui .mp6-text-highlight {
.wp-core-ui .wp-ui-text-highlight {
color: #888888; }
.wp-core-ui .mp6-notification {
.wp-core-ui .wp-ui-notification {
color: white;
background-color: #d64e07; }
.wp-core-ui .mp6-text-notification {
.wp-core-ui .wp-ui-text-notification {
color: #d64e07; }
.wp-core-ui .mp6-text-icon {
.wp-core-ui .wp-ui-text-icon {
color: #999999; }
/* List tables */

2
wp-admin/css/colors/light/colors.min.css vendored
View File

File diff suppressed because one or more lines are too long

14
wp-admin/css/colors/midnight/colors-rtl.css
View File

@ -49,22 +49,22 @@ input[type=radio]:checked:before {
background: #d92c23 !important;
border-color: #ba251e !important;
text-shadow: none !important; }
.wp-core-ui .mp6-primary {
.wp-core-ui .wp-ui-primary {
color: white;
background-color: #363b3f; }
.wp-core-ui .mp6-text-primary {
.wp-core-ui .wp-ui-text-primary {
color: #363b3f; }
.wp-core-ui .mp6-highlight {
.wp-core-ui .wp-ui-highlight {
color: white;
background-color: #e14d43; }
.wp-core-ui .mp6-text-highlight {
.wp-core-ui .wp-ui-text-highlight {
color: #e14d43; }
.wp-core-ui .mp6-notification {
.wp-core-ui .wp-ui-notification {
color: white;
background-color: #69a8bb; }
.wp-core-ui .mp6-text-notification {
.wp-core-ui .wp-ui-text-notification {
color: #69a8bb; }
.wp-core-ui .mp6-text-icon {
.wp-core-ui .wp-ui-text-icon {
color: #f1f2f3; }
/* List tables */

2
wp-admin/css/colors/midnight/colors-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

14
wp-admin/css/colors/midnight/colors.css
View File

@ -49,22 +49,22 @@ input[type=radio]:checked:before {
background: #d92c23 !important;
border-color: #ba251e !important;
text-shadow: none !important; }
.wp-core-ui .mp6-primary {
.wp-core-ui .wp-ui-primary {
color: white;
background-color: #363b3f; }
.wp-core-ui .mp6-text-primary {
.wp-core-ui .wp-ui-text-primary {
color: #363b3f; }
.wp-core-ui .mp6-highlight {
.wp-core-ui .wp-ui-highlight {
color: white;
background-color: #e14d43; }
.wp-core-ui .mp6-text-highlight {
.wp-core-ui .wp-ui-text-highlight {
color: #e14d43; }
.wp-core-ui .mp6-notification {
.wp-core-ui .wp-ui-notification {
color: white;
background-color: #69a8bb; }
.wp-core-ui .mp6-text-notification {
.wp-core-ui .wp-ui-text-notification {
color: #69a8bb; }
.wp-core-ui .mp6-text-icon {
.wp-core-ui .wp-ui-text-icon {
color: #f1f2f3; }
/* List tables */

2
wp-admin/css/colors/midnight/colors.min.css vendored
View File

File diff suppressed because one or more lines are too long

1
wp-admin/css/wp-admin-rtl.css
View File

@ -12752,7 +12752,6 @@ li#wp-admin-bar-menu-toggle {
padding: 1px 0 0;
}
/* Set drop shadow again per original mp6 plugin settings at line 1265 of colors-mp6.css in r687296, remove when original styles have been corrected */
.plugins tr.active + tr.inactive td.column-description {
-webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1);
-moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1);

1
wp-admin/css/wp-admin.css
View File

@ -12752,7 +12752,6 @@ li#wp-admin-bar-menu-toggle {
padding: 1px 0 0;
}
/* Set drop shadow again per original mp6 plugin settings at line 1265 of colors-mp6.css in r687296, remove when original styles have been corrected */
.plugins tr.active + tr.inactive td.column-description {
-webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1);
-moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1);

2
wp-includes/css/editor-rtl.css
View File

@ -49,7 +49,7 @@
color: #555;
}
/* These are part of TinyMCE, used in TinyMCE Advanced, but not WordPress. These are not MP6-ified. */
/* These are part of TinyMCE, used in TinyMCE Advanced, but not WordPress. These are not updated for 3.8's design. */
.wp_themeSkin span.mce_sup,
.wp_themeSkin span.mce_sub,
.wp_themeSkin span.mce_media,

2
wp-includes/css/editor.css
View File

@ -49,7 +49,7 @@
color: #555;
}
/* These are part of TinyMCE, used in TinyMCE Advanced, but not WordPress. These are not MP6-ified. */
/* These are part of TinyMCE, used in TinyMCE Advanced, but not WordPress. These are not updated for 3.8's design. */
.wp_themeSkin span.mce_sup,
.wp_themeSkin span.mce_sub,
.wp_themeSkin span.mce_media,

4
wp-includes/js/svg-painter.js
View File

@ -167,7 +167,7 @@ var svgPainter = ( function( $, window, document, undefined ) {
return;
}
xml = $element.data( 'mp6-svg-' + color );
xml = $element.data( 'wp-ui-svg-' + color );
if ( ! xml ) {
encoded = $element.css( 'background-image' ).match( /.+data:image\/svg\+xml;base64,(.+?)['"] ?\)/ );
@ -197,7 +197,7 @@ var svgPainter = ( function( $, window, document, undefined ) {
xml = base64.btoa( xml );
}
$element.data( 'mp6-svg-' + color, xml );
$element.data( 'wp-ui-svg-' + color, xml );
}
$element.attr( 'style', 'background-image: url("data:image/svg+xml;base64,' + xml + '") !important;' );

2
wp-includes/js/svg-painter.min.js vendored
View File

@ -1 +1 @@
var svgPainter=function(a,b,c){"use strict";var d,e,f={},g=[];return a(c).ready(function(){c.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#Image","1.1")&&(a(c.body).removeClass("no-svg").addClass("svg"),svgPainter.init())}),e=function(){function a(a,b,c,e,f,g){var h,i,j=0,k=0,l="",m=0;for(a=String(a),i=a.length;i>k;){for(d=a.charCodeAt(k),d=256>d?c[d]:-1,j=(j<<f)+d,m+=f;m>=g;)m-=g,h=j>>m,l+=e.charAt(h),j^=h<<m;++k}return!b&&m>0&&(l+=e.charAt(j<<g-m)),l}function b(b){return b=a(b,!1,h,e,8,6),b+"====".slice(b.length%4||4)}function c(b){var c;b=b.replace(/[^A-Za-z0-9\+\/\=]/g,""),b=String(b).split("="),c=b.length;do--c,b[c]=a(b[c],!0,g,f,6,8);while(c>0);return b=b.join("")}for(var d,e="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",f="",g=[256],h=[256],i=0;256>i;)d=String.fromCharCode(i),f+=d,h[i]=i,g[i]=e.indexOf(d),++i;return{atob:c,btoa:b}}(),{init:function(){d=a("#adminmenu .wp-menu-image, #wpadminbar .ab-item"),this.setColors(),this.findElements(),this.paint()},setColors:function(a){"undefined"==typeof a&&"undefined"!=typeof b._wpColorScheme&&(a=b._wpColorScheme),a&&a.icons&&a.icons.base&&a.icons.current&&a.icons.focus&&(f=a.icons)},findElements:function(){d.each(function(){var b=a(this),c=b.css("background-image");c&&-1!=c.indexOf("data:image/svg+xml;base64")&&g.push(b)})},paint:function(){a.each(g,function(a,b){var c=b.parent().parent();c.hasClass("current")||c.hasClass("wp-has-current-submenu")?svgPainter.paintElement(b,"current"):(svgPainter.paintElement(b,"base"),c.hover(function(){svgPainter.paintElement(b,"focus")},function(){svgPainter.paintElement(b,"base")}))})},paintElement:function(a,c){var d,g,h;if(c&&f.hasOwnProperty(c)&&(h=f[c],h.match(/^(#[0-9a-f]{3}|#[0-9a-f]{6})$/i))){if(d=a.data("mp6-svg-"+h),!d){if(g=a.css("background-image").match(/.+data:image\/svg\+xml;base64,(.+?)['"] ?\)/),!g||!g[1])return;d="atob"in b?b.atob(g[1]):e.atob(g[1]),d=d.replace(/fill="(.+?)"/g,'fill="'+h+'"'),d=d.replace(/style="(.+?)"/g,'style="fill:'+h+'"'),d=d.replace(/fill:.*?;/g,"fill: "+h+";"),d="btoa"in b?b.btoa(d):e.btoa(d),a.data("mp6-svg-"+h,d)}a.attr("style",'background-image: url("data:image/svg+xml;base64,'+d+'") !important;')}}}}(jQuery,window,document);
var svgPainter=function(a,b,c){"use strict";var d,e,f={},g=[];return a(c).ready(function(){c.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#Image","1.1")&&(a(c.body).removeClass("no-svg").addClass("svg"),svgPainter.init())}),e=function(){function a(a,b,c,e,f,g){var h,i,j=0,k=0,l="",m=0;for(a=String(a),i=a.length;i>k;){for(d=a.charCodeAt(k),d=256>d?c[d]:-1,j=(j<<f)+d,m+=f;m>=g;)m-=g,h=j>>m,l+=e.charAt(h),j^=h<<m;++k}return!b&&m>0&&(l+=e.charAt(j<<g-m)),l}function b(b){return b=a(b,!1,h,e,8,6),b+"====".slice(b.length%4||4)}function c(b){var c;b=b.replace(/[^A-Za-z0-9\+\/\=]/g,""),b=String(b).split("="),c=b.length;do--c,b[c]=a(b[c],!0,g,f,6,8);while(c>0);return b=b.join("")}for(var d,e="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",f="",g=[256],h=[256],i=0;256>i;)d=String.fromCharCode(i),f+=d,h[i]=i,g[i]=e.indexOf(d),++i;return{atob:c,btoa:b}}(),{init:function(){d=a("#adminmenu .wp-menu-image, #wpadminbar .ab-item"),this.setColors(),this.findElements(),this.paint()},setColors:function(a){"undefined"==typeof a&&"undefined"!=typeof b._wpColorScheme&&(a=b._wpColorScheme),a&&a.icons&&a.icons.base&&a.icons.current&&a.icons.focus&&(f=a.icons)},findElements:function(){d.each(function(){var b=a(this),c=b.css("background-image");c&&-1!=c.indexOf("data:image/svg+xml;base64")&&g.push(b)})},paint:function(){a.each(g,function(a,b){var c=b.parent().parent();c.hasClass("current")||c.hasClass("wp-has-current-submenu")?svgPainter.paintElement(b,"current"):(svgPainter.paintElement(b,"base"),c.hover(function(){svgPainter.paintElement(b,"focus")},function(){svgPainter.paintElement(b,"base")}))})},paintElement:function(a,c){var d,g,h;if(c&&f.hasOwnProperty(c)&&(h=f[c],h.match(/^(#[0-9a-f]{3}|#[0-9a-f]{6})$/i))){if(d=a.data("wp-ui-svg-"+h),!d){if(g=a.css("background-image").match(/.+data:image\/svg\+xml;base64,(.+?)['"] ?\)/),!g||!g[1])return;d="atob"in b?b.atob(g[1]):e.atob(g[1]),d=d.replace(/fill="(.+?)"/g,'fill="'+h+'"'),d=d.replace(/style="(.+?)"/g,'style="fill:'+h+'"'),d=d.replace(/fill:.*?;/g,"fill: "+h+";"),d="btoa"in b?b.btoa(d):e.btoa(d),a.data("wp-ui-svg-"+h,d)}a.attr("style",'background-image: url("data:image/svg+xml;base64,'+d+'") !important;')}}}}(jQuery,window,document);