Changeset 26392

Timestamp:

11/26/2013 05:08:37 AM (11 years ago)

Author:

helen

Message:

Dashboard columns:

• Improve responsive breakpoints for.
• Remove obsolete network admin option.
• Remove unnecessary JS.

props SergeyBiryukov, kraftbj, lessbloat. fixes #26074.

Location:

trunk/src/wp-admin

Files:

• css/wp-admin.css (modified) (2 diffs)
• includes/dashboard.php (modified) (1 diff)
• js/dashboard.js (modified) (2 diffs)
• network/index.php (modified) (1 diff)

trunk/src/wp-admin/css/wp-admin.css

@@ -2441 +2441 @@
 
 /* two columns on the dash, but keep the setting if one is selected */
-@media only screen and (min-width: 800px) and (max-width: 1399px) {
+@media only screen and (min-width: 800px) and (max-width: 1499px) {
     #wpbody-content #dashboard-widgets .postbox-container {
         width: 49.5%;
@@ -2483 +2483 @@
 
 /* three columns on the dash */
-@media only screen and (min-width: 1400px) and (max-width: 1800px) {
+@media only screen and (min-width: 1500px) and (max-width: 1800px) {
     #wpbody-content #dashboard-widgets .postbox-container {
         width: 33.5%;

trunk/src/wp-admin/includes/dashboard.php

@@ -136 +136 @@
 function wp_dashboard() {
     $screen = get_current_screen();
-    $class = 'columns-' . get_current_screen()->get_columns();
 
 ?>
-<div id="dashboard-widgets" class="metabox-holder <?php echo $class; ?>">
+<div id="dashboard-widgets" class="metabox-holder">
     <div id='postbox-container-1' class='postbox-container'>
     <?php do_meta_boxes( $screen->id, 'normal', '' ); ?>

trunk/src/wp-admin/js/dashboard.js

@@ -7 +7 @@
         welcomePanelHide = $('#wp_welcome_panel-hide'),
         updateWelcomePanel,
-        metaboxHolder = $( '.metabox-holder' ),
-        updateColumnCount;
+        metaboxHolder = $( '.metabox-holder' );
 
     updateWelcomePanel = function( visible ) {
@@ -133 +132 @@
     });
 
-    updateColumnCount = function( $window, $holder ) {
-        var cols = 1,
-            windowWidth = parseInt( $window.width(), 10 );
-
-        if (799 < windowWidth && 1299 > windowWidth) {
-            cols = 2;
-        }
-
-        if (1300 < windowWidth && 1799 > windowWidth) {
-            cols = 3;
-        }
-
-        if (1800 < windowWidth) {
-            cols = 4;
-        }
-
-        $holder.attr( 'class', $holder.attr( 'class' ).replace( /columns-\d+/, 'columns-' + cols ) );
-    };
-
-    // Update main column count on load
-    updateColumnCount( $window, metaboxHolder );
-
-    $window.on( 'resize', _.debounce(function() {
-        updateColumnCount( $window, metaboxHolder );
-    }, 30 ) );
-
 } );

trunk/src/wp-admin/network/index.php

@@ -61 +61 @@
 add_thickbox();
 
-add_screen_option('layout_columns', array('max' => 4, 'default' => 2) );
-
 require_once( ABSPATH . 'wp-admin/admin-header.php' );