Ticket #28753: 28753.diff

src/wp-admin/css/forms.css

@@ -751 +751 @@
         margin: -3px 3px;
 }
 
+/*------------------------------------------------------------------------------
+  21.0 - Upload File
+------------------------------------------------------------------------------*/
+
+.wp-upload-container {
+        -webkit-box-sizing: border-box;
+        -moz-box-sizing: border-box;
+        box-sizing: border-box;
+        margin: 0px 0 0;
+        padding: 0;
+        width: 100%;
+        overflow: hidden;
+        position: relative;
+        top: 10px;
+}
+.wp-upload-container-hidden {
+        display: none;
+}
+.wp-upload-container .wp-upload-form {
+        background: #fafafa;
+        border: 1px solid #e5e5e5;
+        padding: 30px;
+        margin: 30px auto;
+        max-width: 380px;
+}
+.wp-upload-container .install-help {
+        color: #999;
+        font-size: 18px;
+        font-style: normal;
+        margin: 0;
+        padding: 40px 0 0;
+        text-align: center;
+}
+
+body.show-upload-container .wp-upload-container-hidden {
+        display: block;
+}
+
 /* =Media Queries
 -------------------------------------------------------------- */
 
+@media only screen and (max-width: 1120px) {
+        .wp-upload-container .wp-upload-form {
+                margin: 20px 0;
+                max-width: 100%;
+        }
+        .wp-upload-container .install-help {
+                font-size: 15px;
+                padding: 20px 0 0;
+                text-align: left;
+        }
+}
+
 @media screen and ( max-width: 782px ) {
         /* Input Elements */
         textarea {

src/wp-admin/css/themes.css

@@ -1108 +1108 @@
         cursor: pointer;
 }
 .theme-install-php a.browse-themes,
-.theme-install-php.show-upload-theme a.upload {
+.theme-install-php.show-upload-container a.upload {
         display: none;
 }
-.theme-install-php.show-upload-theme a.browse-themes {
+.theme-install-php.show-upload-container a.browse-themes {
         display: inline;
 }
-.upload-theme {
-        -webkit-box-sizing: border-box;
-        -moz-box-sizing: border-box;
-        box-sizing: border-box;
+
+body.show-upload-container .wp-upload-container + .theme-navigation,
+body.show-upload-container .wp-upload-container + .theme-navigation + .theme-browser {
         display: none;
-        margin: 0px 0 0;
-        padding: 0;
-        width: 100%;
-        overflow: hidden;
-        position: relative;
-        top: 10px;
 }
-body.show-upload-theme .upload-theme {
-        display: block;
-}
-.upload-theme .wp-upload-form {
-        background: #fafafa;
-        border: 1px solid #e5e5e5;
-        padding: 30px;
-        margin: 30px auto;
-        max-width: 380px;
-}
-.upload-theme .install-help {
-        color: #999;
-        font-size: 18px;
-        font-style: normal;
-        margin: 0;
-        padding: 40px 0 0;
-        text-align: center;
-}
-body.show-upload-theme .upload-theme + .theme-navigation,
-body.show-upload-theme .upload-theme + .theme-navigation + .theme-browser {
-        display: none;
-}
 .theme-navigation .theme-count {
         margin-left: 0;
         position: absolute;
@@ -1340 +1311 @@
 body.no-results p.no-themes {
         display: block;
 }
-body.show-upload-theme p.no-themes {
+body.show-upload-container p.no-themes {
         display: none !important;
 }
 
@@ -1358 +1329 @@
         .more-filters-container {
                 border-bottom: 1px solid #eee;
         }
-        .upload-theme .wp-upload-form {
-                margin: 20px 0;
-                max-width: 100%;
-        }
-        .upload-theme .install-help {
-                font-size: 15px;
-                padding: 20px 0 0;
-                text-align: left;
-        }
         .more-filters-container .filters-group {
                 margin-bottom: 0;
                 margin-top: 5px;

src/wp-admin/includes/plugin-install.php

@@ -187 +187 @@
  */
 function install_plugins_upload( $page = 1 ) {
 ?>
-        <h4><?php _e('Install a plugin in .zip format'); ?></h4>
-        <p class="install-help"><?php _e('If you have a plugin in a .zip format, you may install it by uploading it here.'); ?></p>
-        <form method="post" enctype="multipart/form-data" class="wp-upload-form" action="<?php echo self_admin_url('update.php?action=upload-plugin'); ?>">
-                <?php wp_nonce_field( 'plugin-upload'); ?>
-                <label class="screen-reader-text" for="pluginzip"><?php _e('Plugin zip file'); ?></label>
-                <input type="file" id="pluginzip" name="pluginzip" />
-                <?php submit_button( __( 'Install Now' ), 'button', 'install-plugin-submit', false ); ?>
-        </form>
+        <div class="wp-upload-container">
+                <p class="install-help"><?php _e('If you have a plugin in a .zip format, you may install it by uploading it here.'); ?></p>
+                <form method="post" enctype="multipart/form-data" class="wp-upload-form" action="<?php echo self_admin_url('update.php?action=upload-plugin'); ?>">
+                        <?php wp_nonce_field( 'plugin-upload'); ?>
+                        <label class="screen-reader-text" for="pluginzip"><?php _e('Plugin zip file'); ?></label>
+                        <input type="file" id="pluginzip" name="pluginzip" />
+                        <?php submit_button( __( 'Install Now' ), 'button', 'install-plugin-submit', false ); ?>
+                </form>
+        </div>
 <?php
 }
 add_action('install_plugins_upload', 'install_plugins_upload', 10, 1);

src/wp-admin/js/theme.js

@@ -1499 +1499 @@
         uploader: function() {
                 $( 'a.upload' ).on( 'click', function( event ) {
                         event.preventDefault();
-                        $( 'body' ).addClass( 'show-upload-theme' );
+                        $( 'body' ).addClass( 'show-upload-container' );
                         themes.router.navigate( themes.router.baseUrl( '?upload' ), { replace: true } );
                 });
                 $( 'a.browse-themes' ).on( 'click', function( event ) {
                         event.preventDefault();
-                        $( 'body' ).removeClass( 'show-upload-theme' );
+                        $( 'body' ).removeClass( 'show-upload-container' );
                         themes.router.navigate( themes.router.baseUrl( '' ), { replace: true } );
                 });
         },

src/wp-admin/theme-install.php

@@ -114 +114 @@
                 <a href="#" class="browse-themes add-new-h2"><?php _ex( 'Browse', 'themes' ); ?></a>
         </h2>
 
-        <div class="upload-theme">
+        <div class="wp-upload-container wp-upload-container-hidden">
         <?php install_themes_upload(); ?>
         </div>