WordPress.org

Make WordPress Core

Changeset 18578


Ignore:
Timestamp:
08/21/11 15:38:14 (3 years ago)
Author:
azaozz
Message:

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

Location:
trunk
Files:
3 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/css/farbtastic.css

    r10150 r18578  
     1 
    12.farbtastic { 
    23  position: relative; 
    34} 
     5 
    46.farbtastic * { 
    57  position: absolute; 
    68  cursor: crosshair; 
    79} 
    8 .farbtastic, .farbtastic .wheel { 
     10 
     11.farbtastic, 
     12.farbtastic .wheel { 
    913  width: 195px; 
    1014  height: 195px; 
    1115} 
    12 .farbtastic .color, .farbtastic .overlay { 
     16 
     17.farbtastic .color, 
     18.farbtastic .overlay { 
    1319  top: 47px; 
    1420  left: 47px; 
     
    1622  height: 101px; 
    1723} 
     24 
    1825.farbtastic .wheel { 
    1926  background: url(../images/wheel.png) no-repeat; 
     
    2128  height: 195px; 
    2229} 
     30 
    2331.farbtastic .overlay { 
    2432  background: url(../images/mask.png) no-repeat; 
    2533} 
     34 
    2635.farbtastic .marker { 
    2736  width: 17px; 
     
    3140  background: url(../images/marker.png) no-repeat; 
    3241} 
     42 
     43 
     44/* farbtastic-rtl */ 
     45.rtl .farbtastic .color, 
     46.rtl .farbtastic .overlay { 
     47    left: 0; 
     48    right: 47px; 
     49} 
     50 
     51.rtl .farbtastic .marker { 
     52    margin: -8px -8px 0 0; 
     53} 
     54 
     55 
  • trunk/wp-admin/css/install.css

    r18406 r18578  
    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;} 
     1html{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;} 
  • trunk/wp-admin/css/install.dev.css

    r18406 r18578  
    212212    background-color: #ffffe0; 
    213213} 
     214 
     215 
     216/* install-rtl */ 
     217body.rtl { 
     218    font-family: Tahoma, arial; 
     219} 
     220 
     221.rtl h1 { 
     222    font-family: arial; 
     223    margin: 5px -4px 0 0; 
     224} 
     225 
     226.rtl ul, 
     227.rtl  ol { 
     228    padding: 5px 22px 5px 5px; 
     229} 
     230 
     231.rtl .step, 
     232.rtl th, 
     233.rtl .form-table th { 
     234    text-align: right; 
     235} 
     236 
     237.rtl .submit input, 
     238.rtl .button, 
     239.rtl .button-secondary { 
     240    margin-right: 0; 
     241} 
     242 
     243.rtl #user_login, 
     244.rtl #admin_email, 
     245.rtl #pass1, 
     246.rtl #pass2 { 
     247    direction: ltr; 
     248} 
     249 
  • trunk/wp-includes/script-loader.php

    r18577 r18578  
    399399    $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '.dev' : ''; 
    400400 
    401     $rtl_styles = array( 'wp-admin', 'colors-fresh', 'colors-classic', 'ie', 'install', 'media', 'farbtastic', 'admin-bar', 'wplink' ); 
     401    $rtl_styles = array( 'wp-admin', 'colors-fresh', 'colors-classic', 'ie', 'media', 'admin-bar', 'wplink' ); 
    402402    // Any rtl stylesheets that don't have a .dev version for ltr 
    403403    $no_suffix = array( 'farbtastic' ); 
     
    419419 
    420420    $styles->add( 'media', "/wp-admin/css/media$suffix.css", array(), '20110707' ); 
    421     $styles->add( 'install', "/wp-admin/css/install$suffix.css", array(), '20110707' ); // Readme as well 
     421    $styles->add( 'install', "/wp-admin/css/install$suffix.css", array(), '20110821' ); // Readme as well 
    422422    $styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20090514' ); 
    423     $styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.3u' ); 
     423    $styles->add( 'farbtastic', '/wp-admin/css/farbtastic.css', array(), '1.3u1' ); 
    424424    $styles->add( 'jcrop', '/wp-includes/js/jcrop/jquery.Jcrop.css', array(), '0.9.8' ); 
    425425    $styles->add( 'imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.1' ); 
Note: See TracChangeset for help on using the changeset viewer.