Skip to content

Commit bcd9d1a

Browse files
azaozzazaozz
committed
Moves orphaned sidebars to main content area above Inactive Widgets, props aaroncampbell, see #17979
git-svn-id: https://develop.svn.wordpress.org/trunk@18631 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 4782c3d commit bcd9d1a

10 files changed

Lines changed: 64 additions & 48 deletions

File tree

‎wp-admin/css/ie.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎wp-admin/css/ie.dev.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ table.ie-fixed {
408408
width: 99%;
409409
}
410410

411-
#wp_inactive_widgets {
411+
.inactive-sidebar .widgets-sortables {
412412
padding-bottom: 8px;
413413
}
414414

@@ -437,7 +437,7 @@ table.ie-fixed {
437437
}
438438

439439
.widget-liquid-right .widget,
440-
#wp_inactive_widgets .widget {
440+
.inactive-sidebar .widget {
441441
position: relative;
442442
}
443443

‎wp-admin/css/wp-admin-rtl.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎wp-admin/css/wp-admin-rtl.dev.css‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2160,7 +2160,7 @@ div.widget-liquid-right {
21602160
clear: left;
21612161
}
21622162

2163-
#wp_inactive_widgets .widget {
2163+
.inactive-sidebar .widget {
21642164
float: right;
21652165
}
21662166

@@ -2172,7 +2172,7 @@ div.sidebar-name h3 {
21722172
float: right;
21732173
}
21742174

2175-
#wp_inactive_widgets .widget-placeholder {
2175+
.inactive-sidebar .widget-placeholder {
21762176
float: right;
21772177
}
21782178

@@ -2189,4 +2189,3 @@ div.sidebar-name h3 {
21892189
float: left;
21902190
}
21912191

2192-

‎wp-admin/css/wp-admin.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎wp-admin/css/wp-admin.dev.css‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7285,7 +7285,7 @@ div.widget-liquid-right {
72857285
}
72867286

72877287
.widget-liquid-right .widget,
7288-
#wp_inactive_widgets .widget,
7288+
.inactive-sidebar .widget,
72897289
.widget-liquid-right .sidebar-description {
72907290
width: 250px;
72917291
margin: 0 auto 20px;
@@ -7296,7 +7296,7 @@ div.widget-liquid-right {
72967296
margin-bottom: 10px;
72977297
}
72987298

7299-
#wp_inactive_widgets .widget {
7299+
.inactive-sidebar .widget {
73007300
margin: 0 10px 20px;
73017301
float: left;
73027302
}
@@ -7370,7 +7370,7 @@ div.sidebar-name {
73707370
box-shadow: none;
73717371
}
73727372

7373-
#wp_inactive_widgets {
7373+
.inactive-sidebar {
73747374
padding: 5px 5px 0;
73757375
}
73767376

@@ -7403,7 +7403,7 @@ div.sidebar-name {
74037403
width: 250px;
74047404
}
74057405

7406-
#wp_inactive_widgets .widget-placeholder {
7406+
.inactive-sidebar .widget-placeholder {
74077407
margin: 0 10px 20px;
74087408
float: left;
74097409
}
@@ -7542,7 +7542,7 @@ a.widget-control-edit {
75427542

75437543
#available-widgets .widget-control-edit .add,
75447544
#widgets-right .widget-control-edit .edit,
7545-
#wp_inactive_widgets .widget-control-edit .edit {
7545+
.inactive-sidebar .widget-control-edit .edit {
75467546
display: inline;
75477547
}
75487548

@@ -7562,7 +7562,7 @@ a.widget-control-edit {
75627562
}
75637563

75647564
.inactive p.description {
7565-
margin: 5px 15px 8px;
7565+
margin: 5px 15px 10px;
75667566
}
75677567

75687568
#available-widgets p.description {
@@ -7636,4 +7636,3 @@ a.widget-control-edit {
76367636
.widgets_access .widget .widget-top {
76377637
cursor: default;
76387638
}
7639-

‎wp-admin/js/widgets.dev.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,9 @@ wpWidgets = {
134134
}
135135
wpWidgets.saveOrder(sb);
136136
},
137-
receive: function(e,ui) {
138-
if ( !$(this).is(':visible') )
139-
$(this).sortable('cancel');
137+
receive: function(e, ui) {
138+
if ( !$(this).is(':visible') || this.id.indexOf('orphaned_widgets') != -1 )
139+
$(ui.sender).sortable('cancel');
140140
}
141141
}).sortable('option', 'connectWith', 'div.widgets-sortables').parent().filter('.closed').children('.widgets-sortables').sortable('disable');
142142

0 commit comments

Comments
 (0)