From ba3ad767719cd697bea66da84731986b4ba048fb Mon Sep 17 00:00:00 2001 From: azaozz Date: Sun, 21 Aug 2011 15:38:14 +0000 Subject: [PATCH] Merged install.css with install-rtl.css (it is used only when installing so it makes sense to be a separate stylesheet), merged farbtastic.css with farbtastic-rtl.css, see #18314 git-svn-id: http://svn.automattic.com/wordpress/trunk@18578 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/css/farbtastic-rtl.css | 7 ------- wp-admin/css/farbtastic.css | 29 ++++++++++++++++++++++--- wp-admin/css/install-rtl.css | 1 - wp-admin/css/install-rtl.dev.css | 23 -------------------- wp-admin/css/install.css | 2 +- wp-admin/css/install.dev.css | 36 ++++++++++++++++++++++++++++++++ wp-includes/script-loader.php | 6 +++--- 7 files changed, 66 insertions(+), 38 deletions(-) delete mode 100644 wp-admin/css/farbtastic-rtl.css delete mode 100644 wp-admin/css/install-rtl.css delete mode 100644 wp-admin/css/install-rtl.dev.css diff --git a/wp-admin/css/farbtastic-rtl.css b/wp-admin/css/farbtastic-rtl.css deleted file mode 100644 index 7a8badb434..0000000000 --- a/wp-admin/css/farbtastic-rtl.css +++ /dev/null @@ -1,7 +0,0 @@ -.farbtastic .color, .farbtastic .overlay { - left: 0; - right: 47px; -} -.farbtastic .marker { - margin: -8px -8px 0 0; -} diff --git a/wp-admin/css/farbtastic.css b/wp-admin/css/farbtastic.css index 71ad3c13d0..1022b71a1f 100644 --- a/wp-admin/css/farbtastic.css +++ b/wp-admin/css/farbtastic.css @@ -1,32 +1,55 @@ + .farbtastic { position: relative; } + .farbtastic * { position: absolute; cursor: crosshair; } -.farbtastic, .farbtastic .wheel { + +.farbtastic, +.farbtastic .wheel { width: 195px; height: 195px; } -.farbtastic .color, .farbtastic .overlay { + +.farbtastic .color, +.farbtastic .overlay { top: 47px; left: 47px; width: 101px; height: 101px; } + .farbtastic .wheel { background: url(../images/wheel.png) no-repeat; width: 195px; height: 195px; } + .farbtastic .overlay { background: url(../images/mask.png) no-repeat; } + .farbtastic .marker { width: 17px; height: 17px; margin: -8px 0 0 -8px; overflow: hidden; background: url(../images/marker.png) no-repeat; -} \ No newline at end of file +} + + +/* farbtastic-rtl */ +.rtl .farbtastic .color, +.rtl .farbtastic .overlay { + left: 0; + right: 47px; +} + +.rtl .farbtastic .marker { + margin: -8px -8px 0 0; +} + + diff --git a/wp-admin/css/install-rtl.css b/wp-admin/css/install-rtl.css deleted file mode 100644 index e422eced92..0000000000 --- a/wp-admin/css/install-rtl.css +++ /dev/null @@ -1 +0,0 @@ -body{font-family:Tahoma,arial;}h1{font-family:arial;margin:5px -4px 0 0;}ul,ol{padding:5px 22px 5px 5px;}.step,th{text-align:right;}.submit input,.button,.button-secondary{font-family:Tahoma,arial;margin-right:0;}.form-table th{text-align:right;}#user_login,#admin_email,#pass1,#pass2{direction:ltr;} \ No newline at end of file diff --git a/wp-admin/css/install-rtl.dev.css b/wp-admin/css/install-rtl.dev.css deleted file mode 100644 index 9e0be9976b..0000000000 --- a/wp-admin/css/install-rtl.dev.css +++ /dev/null @@ -1,23 +0,0 @@ -body { - font-family: Tahoma, arial; -} -h1 { - font-family: arial; - margin: 5px -4px 0 0; -} -ul, ol { - padding: 5px 22px 5px 5px; -} -.step, th { - text-align: right; -} -.submit input, .button, .button-secondary { - font-family: Tahoma, arial; - margin-right: 0; -} -.form-table th { - text-align: right; -} -#user_login, #admin_email, #pass1, #pass2 { - direction: ltr; -} \ No newline at end of file diff --git a/wp-admin/css/install.css b/wp-admin/css/install.css index fa76872490..8de165c8c6 100644 --- a/wp-admin/css/install.css +++ b/wp-admin/css/install.css @@ -1 +1 @@ -html{background:#f9f9f9;}body{background:#fff;color:#333;font-family:sans-serif;margin:2em auto;width:700px;padding:1em 2em;-moz-border-radius:11px;-khtml-border-radius:11px;-webkit-border-radius:11px;border-radius:11px;border:1px solid #dfdfdf;}a{color:#2583ad;text-decoration:none;}a:hover{color:#d54e21;}h1{border-bottom:1px solid #dadada;clear:both;color:#666;font:24px Georgia,"Times New Roman",Times,serif;margin:5px 0 0 -4px;padding:0;padding-bottom:7px;}h2{font-size:16px;}p,li,dd,dt{padding-bottom:2px;font-size:12px;line-height:18px;}code,.code{font-size:13px;}ul,ol,dl{padding:5px 5px 5px 22px;}a img{border:0;}abbr{border:0;font-variant:normal;}#logo{margin:6px 0 14px 0;border-bottom:none;text-align:center;}.step{margin:20px 0 15px;}.step,th{text-align:left;padding:0;}.submit input,.button,.button-secondary{font-family:sans-serif;text-decoration:none;font-size:14px!important;line-height:16px;padding:6px 12px;cursor:pointer;border:1px solid #bbb;color:#464646;-moz-border-radius:15px;-khtml-border-radius:15px;-webkit-border-radius:15px;border-radius:15px;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;-khtml-box-sizing:content-box;box-sizing:content-box;}.button:hover,.button-secondary:hover,.submit input:hover{color:#000;border-color:#666;}.button,.submit input,.button-secondary{background:#f2f2f2 url(../images/white-grad.png) repeat-x scroll left top;}.button:active,.submit input:active,.button-secondary:active{background:#eee url(../images/white-grad-active.png) repeat-x scroll left top;}textarea{border:1px solid #bbb;-moz-border-radius:3px;-khtml-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;}.form-table{border-collapse:collapse;margin-top:1em;width:100%;}.form-table td{margin-bottom:9px;padding:10px;border-bottom:8px solid #fff;font-size:12px;}.form-table th{font-size:13px;text-align:left;padding:16px 10px 10px 10px;border-bottom:8px solid #fff;width:130px;vertical-align:top;}.form-table tr{background:#f3f3f3;}.form-table code{line-height:18px;font-size:18px;}.form-table p{margin:4px 0 0 0;font-size:11px;}.form-table input{line-height:20px;font-size:15px;padding:2px;}.form-table th p{font-weight:normal;}#error-page{margin-top:50px;}#error-page p{font-size:12px;line-height:18px;margin:25px 0 20px;}#error-page code,.code{font-family:Consolas,Monaco,monospace;}#pass-strength-result{background-color:#eee;border-color:#ddd!important;border-style:solid;border-width:1px;margin:5px 5px 5px 1px;padding:5px;text-align:center;width:200px;display:none;}#pass-strength-result.bad{background-color:#ffb78c;border-color:#ff853c!important;}#pass-strength-result.good{background-color:#ffec8b;border-color:#fc0!important;}#pass-strength-result.short{background-color:#ffa0a0;border-color:#f04040!important;}#pass-strength-result.strong{background-color:#c3ff88;border-color:#8dff1c!important;}.message{border:1px solid #e6db55;padding:.3em .6em;margin:5px 0 15px;background-color:#ffffe0;} \ No newline at end of file +html{background:#f9f9f9;}body{background:#fff;color:#333;font-family:sans-serif;margin:2em auto;width:700px;padding:1em 2em;-moz-border-radius:11px;-khtml-border-radius:11px;-webkit-border-radius:11px;border-radius:11px;border:1px solid #dfdfdf;}a{color:#2583ad;text-decoration:none;}a:hover{color:#d54e21;}h1{border-bottom:1px solid #dadada;clear:both;color:#666;font:24px Georgia,"Times New Roman",Times,serif;margin:5px 0 0 -4px;padding:0;padding-bottom:7px;}h2{font-size:16px;}p,li,dd,dt{padding-bottom:2px;font-size:12px;line-height:18px;}code,.code{font-size:13px;}ul,ol,dl{padding:5px 5px 5px 22px;}a img{border:0;}abbr{border:0;font-variant:normal;}#logo{margin:6px 0 14px 0;border-bottom:none;text-align:center;}.step{margin:20px 0 15px;}.step,th{text-align:left;padding:0;}.submit input,.button,.button-secondary{font-family:sans-serif;text-decoration:none;font-size:14px!important;line-height:16px;padding:6px 12px;cursor:pointer;border:1px solid #bbb;color:#464646;-moz-border-radius:15px;-khtml-border-radius:15px;-webkit-border-radius:15px;border-radius:15px;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;-khtml-box-sizing:content-box;box-sizing:content-box;}.button:hover,.button-secondary:hover,.submit input:hover{color:#000;border-color:#666;}.button,.submit input,.button-secondary{background:#f2f2f2 url(../images/white-grad.png) repeat-x scroll left top;}.button:active,.submit input:active,.button-secondary:active{background:#eee url(../images/white-grad-active.png) repeat-x scroll left top;}textarea{border:1px solid #bbb;-moz-border-radius:3px;-khtml-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;}.form-table{border-collapse:collapse;margin-top:1em;width:100%;}.form-table td{margin-bottom:9px;padding:10px;border-bottom:8px solid #fff;font-size:12px;}.form-table th{font-size:13px;text-align:left;padding:16px 10px 10px 10px;border-bottom:8px solid #fff;width:130px;vertical-align:top;}.form-table tr{background:#f3f3f3;}.form-table code{line-height:18px;font-size:18px;}.form-table p{margin:4px 0 0 0;font-size:11px;}.form-table input{line-height:20px;font-size:15px;padding:2px;}.form-table th p{font-weight:normal;}#error-page{margin-top:50px;}#error-page p{font-size:12px;line-height:18px;margin:25px 0 20px;}#error-page code,.code{font-family:Consolas,Monaco,monospace;}#pass-strength-result{background-color:#eee;border-color:#ddd!important;border-style:solid;border-width:1px;margin:5px 5px 5px 1px;padding:5px;text-align:center;width:200px;display:none;}#pass-strength-result.bad{background-color:#ffb78c;border-color:#ff853c!important;}#pass-strength-result.good{background-color:#ffec8b;border-color:#fc0!important;}#pass-strength-result.short{background-color:#ffa0a0;border-color:#f04040!important;}#pass-strength-result.strong{background-color:#c3ff88;border-color:#8dff1c!important;}.message{border:1px solid #e6db55;padding:.3em .6em;margin:5px 0 15px;background-color:#ffffe0;}body.rtl{font-family:Tahoma,arial;}.rtl h1{font-family:arial;margin:5px -4px 0 0;}.rtl ul,.rtl ol{padding:5px 22px 5px 5px;}.rtl .step,.rtl th,.rtl .form-table th{text-align:right;}.rtl .submit input,.rtl .button,.rtl .button-secondary{margin-right:0;}.rtl #user_login,.rtl #admin_email,.rtl #pass1,.rtl #pass2{direction:ltr;} \ No newline at end of file diff --git a/wp-admin/css/install.dev.css b/wp-admin/css/install.dev.css index d1a389f10d..66169ee391 100644 --- a/wp-admin/css/install.dev.css +++ b/wp-admin/css/install.dev.css @@ -211,3 +211,39 @@ textarea { margin: 5px 0 15px; background-color: #ffffe0; } + + +/* install-rtl */ +body.rtl { + font-family: Tahoma, arial; +} + +.rtl h1 { + font-family: arial; + margin: 5px -4px 0 0; +} + +.rtl ul, +.rtl ol { + padding: 5px 22px 5px 5px; +} + +.rtl .step, +.rtl th, +.rtl .form-table th { + text-align: right; +} + +.rtl .submit input, +.rtl .button, +.rtl .button-secondary { + margin-right: 0; +} + +.rtl #user_login, +.rtl #admin_email, +.rtl #pass1, +.rtl #pass2 { + direction: ltr; +} + diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index eb11757c99..239282dfd7 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -398,7 +398,7 @@ function wp_default_styles( &$styles ) { $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '.dev' : ''; - $rtl_styles = array( 'wp-admin', 'colors-fresh', 'colors-classic', 'ie', 'install', 'media', 'farbtastic', 'admin-bar', 'wplink' ); + $rtl_styles = array( 'wp-admin', 'colors-fresh', 'colors-classic', 'ie', 'media', 'admin-bar', 'wplink' ); // Any rtl stylesheets that don't have a .dev version for ltr $no_suffix = array( 'farbtastic' ); @@ -418,9 +418,9 @@ function wp_default_styles( &$styles ) { $styles->add( 'colors-classic', "/wp-admin/css/colors-classic$suffix.css", array('wp-admin'), $colors_version ); $styles->add( 'media', "/wp-admin/css/media$suffix.css", array(), '20110707' ); - $styles->add( 'install', "/wp-admin/css/install$suffix.css", array(), '20110707' ); // Readme as well + $styles->add( 'install', "/wp-admin/css/install$suffix.css", array(), '20110821' ); // Readme as well $styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20090514' ); - $styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.3u' ); + $styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.3u1' ); $styles->add( 'jcrop', '/wp-includes/js/jcrop/jquery.Jcrop.css', array(), '0.9.8' ); $styles->add( 'imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.1' ); $styles->add( 'admin-bar', "/wp-includes/css/admin-bar$suffix.css", array(), '20110622' );