Ticket #20805: 20805-4.patch
File 20805-4.patch, 7.0 KB (added by , 12 years ago) |
---|
-
wp-admin/css/customize-controls.dev.css
402 402 text-align: right; 403 403 } 404 404 405 .customize-section .customize-control-image .actions a {406 display: block;407 }408 409 405 .customize-section .customize-control-image .library ul { 410 406 border-bottom: 1px solid #dfdfdf; 411 407 float: left; … … 456 452 457 453 .customize-section .customize-control-image .library .thumbnail img { 458 454 display: block; 459 max-width: 220px;455 max-width: 90%; 460 456 max-height: 80px; 461 457 462 458 margin: 5px auto; … … 465 461 border: 1px solid #dfdfdf; 466 462 } 467 463 468 .customize-section .customize-control-upload .upload-fallback, 469 .customize-section .customize-control-image .upload-fallback { 464 .customize-section .customize-control-upload .upload-dropzone, 465 .customize-section .customize-control-image .upload-dropzone { 466 margin: 5px 0 0; 467 position: relative; 468 } 469 470 .customize-section .upload-dropzone-text, 471 .customize-section .supports-drag-drop .upload-fallback-button { 470 472 display: none; 471 473 } 472 474 473 .customize-section .customize-control-upload .upload-dropzone, 474 .customize-section .customize-control-image .upload-dropzone { 475 display: none; 475 .customize-section .supports-drag-drop .upload-dropzone-text { 476 display: inline; 477 } 478 479 .customize-section .customize-control-upload .upload-dropzone.supports-drag-drop, 480 .customize-section .customize-control-image .upload-dropzone.supports-drag-drop { 476 481 padding: 15px 10px; 477 482 border: 3px dashed #dfdfdf; 478 483 margin: 5px auto; 479 484 text-align: center; 480 485 color: #777; 481 position: relative; 482 } 483 484 .customize-section .customize-control-upload .upload-dropzone.supports-drag-drop, 485 .customize-section .customize-control-image .upload-dropzone.supports-drag-drop { 486 display: block; 486 cursor: default; 487 487 -webkit-transition: border-color 0.1s; 488 488 -moz-transition: border-color 0.1s; 489 489 -ms-transition: border-color 0.1s; … … 491 491 transition: border-color 0.1s; 492 492 } 493 493 494 .customize-section .customize-control-upload .library ul li, 495 .customize-section .customize-control-image .library ul li { 496 cursor: pointer; 497 } 498 494 499 .customize-section .customize-control-upload .upload-dropzone.supports-drag-drop.drag-over, 495 500 .customize-section .customize-control-image .upload-dropzone.supports-drag-drop.drag-over { 496 501 border-color: #83b4d8; 497 } 498 No newline at end of file 502 } 503 504 /** 505 * iOS can't scroll iframes, 506 * instead it expands the iframe size to match the size of the content 507 */ 508 body.ios { 509 position: static; 510 z-index: 0; 511 overflow: auto; 512 } 513 514 .ios #customize-controls { 515 right: auto; 516 width: 250px; 517 position: fixed; 518 } 519 520 .ios #customize-preview { 521 position: relative; 522 left: 250px; 523 } 524 525 .ios.collapsed #customize-preview { 526 left: 0; 527 width: 100% 528 } 529 530 .ios.collapsed #customize-controls { 531 margin-left: -250px; 532 } 533 -
wp-admin/customize.php
39 39 wp_user_settings(); 40 40 _wp_admin_html_begin(); 41 41 42 $body_class = 'wp-full-overlay'; 43 $is_mobile = $is_ios = false; 44 45 if ( wp_is_mobile() ) { 46 $body_class .= ' mobile'; 47 $is_mobile = true; 48 if ( strpos($_SERVER['HTTP_USER_AGENT'], 'iPad') 49 || strpos($_SERVER['HTTP_USER_AGENT'], 'iPod') 50 || strpos($_SERVER['HTTP_USER_AGENT'], 'iPhone') ) { 51 $body_class .= ' ios'; 52 $is_ios = true; 53 } 54 55 ?><meta name="viewport" id="viewport-meta" content="width=device-width, initial-scale=0.8, minimum-scale=0.5, maximum-scale=2.0"><?php 56 } 57 42 58 $admin_title = sprintf( __( '%1$s — WordPress' ), strip_tags( sprintf( __( 'Customize %s' ), $wp_customize->theme()->display('Name') ) ) ); 43 59 ?><title><?php echo $admin_title; ?></title><?php 44 60 … … 46 62 do_action( 'customize_controls_print_scripts' ); 47 63 ?> 48 64 </head> 49 <body class=" wp-full-overlay">65 <body class="<?php echo $body_class; ?>"> 50 66 <form id="customize-controls" class="wrap wp-full-overlay-sidebar"> 51 67 <?php wp_nonce_field( 'customize_controls' ); ?> 52 68 <div id="customize-header-actions" class="wp-full-overlay-header"> … … 145 161 'isCrossDomain' => $cross_domain, 146 162 'fallback' => $fallback_url, 147 163 ), 164 'is_mobile' => $is_mobile, 165 'is_ios' => $is_ios, 148 166 'settings' => array(), 149 167 'controls' => array(), 150 168 ); -
wp-includes/class-wp-customize-control.php
331 331 $src = call_user_func( $this->get_url, $src ); 332 332 333 333 ?> 334 < labelclass="customize-image-picker">334 <div class="customize-image-picker"> 335 335 <span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span> 336 336 337 337 <div class="customize-control-content"> … … 366 366 <div class="actions"> 367 367 <a href="#" class="remove"><?php _e( 'Remove Image' ); ?></a> 368 368 </div> 369 </ label>369 </div> 370 370 <?php 371 371 } 372 372 … … 384 384 public function tab_upload_new() { 385 385 ?> 386 386 <div class="upload-dropzone"> 387 <?php _e('Drop a file here or <a href="#" class="upload">select a file</a>.'); ?> 387 <span class="upload-dropzone-text"><?php _e('Drop a file here or'); ?></span> 388 <a href="#" class="upload"><span class="upload-dropzone-text"><?php _e('select a file.'); ?></span><span class="upload-fallback-button button-secondary"><?php _e('Select File'); ?></span></a> 388 389 </div> 389 390 <div class="upload-fallback"> 390 391 <span class="button-secondary"><?php _e('Select File'); ?></span> … … 480 481 foreach ( $custom_image_header->default_headers as $header ) 481 482 $this->print_tab_image( $header['url'], $header['thumbnail_url'] ); 482 483 } 483 } 484 No newline at end of file 484 } -
wp-includes/js/customize-loader.dev.js
30 30 this.bind( 'close', this.overlay.hide ); 31 31 32 32 $('#wpbody').on( 'click', '.load-customize', function( event ) { 33 // follow the link if on mobile device 34 if ( $('body').hasClass('mobile') ) 35 return true; 36 33 37 event.preventDefault(); 34 38 35 39 // Load the theme. -
wp-includes/js/plupload/wp-plupload.dev.js
99 99 active = false; 100 100 dropzone.removeClass('drag-over'); 101 101 }); 102 }( this.dropzone, this.uploader.features.dragdrop ));102 }( this.dropzone, this.uploader.features.dragdrop && ! $('body').hasClass('mobile') )); 103 103 104 104 this.browser.on( 'mouseenter', this.refresh ); 105 105 … … 200 200 }); 201 201 202 202 exports.Uploader = Uploader; 203 })( wp, jQuery ); 204 No newline at end of file 203 })( wp, jQuery );