diff -r f507feede89a -r 09a1c134465b web/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css --- a/web/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css Wed Dec 19 12:35:13 2012 -0800 +++ b/web/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css Wed Dec 19 17:46:52 2012 -0800 @@ -5,25 +5,10 @@ padding: 0; } -.submit input, -.button, -.button-primary, -.button-secondary, -.button-highlighted { - font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; - text-decoration: none; - font-size: 11px !important; - line-height: 16px; - padding: 2px 8px; - cursor: pointer; - border-width: 1px; - border-style: solid; - -webkit-border-radius: 11px; - border-radius: 11px; - -moz-box-sizing: content-box; - -webkit-box-sizing: content-box; - -khtml-box-sizing: content-box; - box-sizing: content-box; +body { + font-family: sans-serif; + font-size: 12px; + line-height: 1.4em; } a.button { @@ -33,7 +18,7 @@ textarea, input, select { - font: 13px Verdana, Arial, Helvetica, sans-serif; + font: inherit; margin: 1px; padding: 3px; } @@ -44,10 +29,6 @@ font-style: italic; } -body, td { - font: 13px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; -} - abbr.required { color: #FF0000; text-align: left; @@ -311,6 +292,7 @@ padding: 0 0 0 28px; margin: 0 1em 0 0; } + .image-align-none-label { background: url(../../../../../../wp-admin/images/align-none.png) no-repeat center left; } @@ -400,8 +382,9 @@ } .rtl .show-align, +.rtl #img_size, .rtl .alignright, -.rtl #img_size { +.rtl #img_demo.alignleft { float: left; } @@ -412,7 +395,8 @@ .rtl #img_prop label, .rtl #img_prop input, .rtl #img_size_div, -.rtl .alignleft { +.rtl .alignleft, +.rtl #img_demo.alignright { float: right; } @@ -429,3 +413,31 @@ .rtl #img_size_title { text-align: left; } + +/** + * Retina display 2x icons + */ +@media print, + (-o-min-device-pixel-ratio: 5/4), + (-webkit-min-device-pixel-ratio: 1.25), + (min-resolution: 120dpi) { + .image-align-none-label { + background: url(../../../../../../wp-admin/images/align-none-2x.png) no-repeat center left; + background-size: auto 15px; + } + + .image-align-left-label { + background: url(../../../../../../wp-admin/images/align-left-2x.png) no-repeat center left; + background-size: auto 15px; + } + + .image-align-center-label { + background: url(../../../../../../wp-admin/images/align-center-2x.png) no-repeat center left; + background-size: auto 15px; + } + + .image-align-right-label { + background: url(../../../../../../wp-admin/images/align-right-2x.png) no-repeat center left; + background-size: auto 15px; + } +}