<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[26140] trunk/src/wp-admin: Bring in the widgets component of MP6.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/26140">26140</a></dd>
<dt>Author</dt> <dd>iammattthomas</dd>
<dt>Date</dt> <dd>2013-11-13 20:05:51 +0000 (Wed, 13 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Bring in the widgets component of MP6. See <a href="http://core.trac.wordpress.org/ticket/25858">#25858</a>.
* A cleaner UI, with a simpler design for available and inactive widgets, and more emphasis on your sidebars.
* Available widgets and sidebars expand to two columns at larger screen sizes making it easier to manage sites with lots of sidebars.
* New dropzone indicator for empty sidebars.
Props shaunandrews, joen, iammattthomas.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsswpadmincss">trunk/src/wp-admin/css/wp-admin.css</a></li>
<li><a href="#trunksrcwpadminincludeswidgetsphp">trunk/src/wp-admin/includes/widgets.php</a></li>
<li><a href="#trunksrcwpadminjswidgetsjs">trunk/src/wp-admin/js/widgets.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsswpadmincss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/css/wp-admin.css (26139 => 26140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/wp-admin.css 2013-11-13 19:53:01 UTC (rev 26139)
+++ trunk/src/wp-admin/css/wp-admin.css 2013-11-13 20:05:51 UTC (rev 26140)
</span><span class="lines">@@ -630,8 +630,7 @@
</span><span class="cx"> .nav-menus-php .major-publishing-actions .form-invalid,
</span><span class="cx"> #TB_window,
</span><span class="cx"> .tbtitle,
</span><del>-.highlight,
-.editwidget .widget-inside {
</del><ins>+.highlight {
</ins><span class="cx"> border-width: 1px;
</span><span class="cx"> border-style: solid;
</span><span class="cx"> }
</span><span class="lines">@@ -2558,7 +2557,6 @@
</span><span class="cx"> margin-bottom: 20px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.widget,
</del><span class="cx"> .postbox,
</span><span class="cx"> .stuffbox {
</span><span class="cx"> margin-bottom: 20px;
</span><span class="lines">@@ -2566,7 +2564,6 @@
</span><span class="cx"> line-height: 1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.widget .widget-top,
</del><span class="cx"> .postbox h3,
</span><span class="cx"> .stuffbox h3 {
</span><span class="cx"> margin-top: 1px;
</span><span class="lines">@@ -9702,58 +9699,93 @@
</span><span class="cx"> margin-bottom: 10px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/* widgets */
</del><span class="cx">
</span><del>-/* 2 column liquid layout */
-div.widget-liquid-left {
- float: left;
- clear: left;
- width: 100%;
- margin-right: -325px;
</del><ins>+/* General Widget Styles */
+
+.widget {
+ margin: 10px auto;
+ /* min-width: 50%; Not sure if this is needed */
+ position: relative;
+ border: none !important; /* ln 991 in colors-fresh.css */
+ box-sizing: border-box;
+ -moz-box-sizing:border-box;
+ -webkit-box-sizing:border-box;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-div#widgets-left {
- margin-left: 5px;
- margin-right: 325px;
</del><ins>+.widget-top {
+ font-size: 12px;
+ font-weight: 600;
+ background: #f7f7f7;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-div#widgets-right {
- width: 285px;
- margin: 0 auto;
</del><ins>+.widget-top a.widget-action,
+.widget-top a.widget-action:hover {
+ text-decoration: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-div.widget-liquid-right {
- float: right;
- clear: right;
- width: 300px;
</del><ins>+.widget-title h4 {
+ margin: 0;
+ padding: 18px 15px;
+ line-height: 1;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.widget-liquid-right .widget {
- position: relative;
</del><ins>+.widget-inside {
+ background: #fff !important; /* ln 1204 in colors.fresh.css */
+ padding: 1px 15px 15px 15px;
+ line-height: 16px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.widget-liquid-right .widget,
-.inactive-sidebar .widget,
-.widget-liquid-right .sidebar-description {
- width: 250px;
- margin: 0 auto 20px;
</del><ins>+/* Widget Dragging Helpers */
+
+.widget.ui-draggable-dragging {
+ width: 280px !important;
+ min-width: 280px !important;
</ins><span class="cx"> }
</span><ins>+.widget.ui-sortable-helper {
+ border: 1px solid #DEDEDE;
+ border-radius: 3px;
+ box-shadow: 0 1px 3px rgba(0,0,0,0.2);
+ opacity: 0.8;
+ z-index: 2000;
+}
+.widget-placeholder {
+ border: 1px solid #dedede;
+ border-bottom: none;
+ margin: 0 auto;
+ height: 43px;
+ width: 100%;
+ background: #eee;
+ box-shadow: inset 0 1px 2px rgba(0,0,0,0.05);
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+}
</ins><span class="cx">
</span><del>-.widget-liquid-right .widget,
-.widget-liquid-right .sidebar-description {
- overflow: hidden;
</del><ins>+
+/* Widget Sidebars */
+.sidebar-name {
+ border: none;
+ position: relative;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.widget-liquid-right .sidebar-description {
- margin-bottom: 10px;
</del><ins>+.sidebar-name-arrow {
+ position: absolute;
+ top: 0;
+ right: 0;
+ bottom: 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.inactive-sidebar .widget {
- margin: 0 10px 20px;
- display: inline-block;
</del><ins>+.js .sidebar-name {
+ cursor: pointer;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-div.sidebar-name h3 {
</del><ins>+.sidebar-name h3 {
</ins><span class="cx"> font-weight: normal;
</span><span class="cx"> font-size: 15px;
</span><span class="cx"> margin: 0;
</span><span class="lines">@@ -9762,303 +9794,363 @@
</span><span class="cx"> white-space: nowrap;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-div.sidebar-name {
- font-size: 13px;
- border-bottom-width: 1px;
- border-bottom-style: solid;
</del><ins>+.widgets-holder-wrap .description {
+ padding: 0;
+ margin: 0;
+ font-style: normal;
+ font-size: 12px;
+ color: #777;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.js .sidebar-name {
- cursor: pointer;
</del><ins>+/* Widgets 2-col Layout */
+div.widget-liquid-left {
+ margin: 0;
+ width: 38%;
+ float: left;
+ border-right: 2px solid #ccc;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.js .closed .sidebar-name {
- -webkit-border-bottom-right-radius: 3px;
- -webkit-border-bottom-left-radius: 3px;
- border-bottom-right-radius: 3px;
- border-bottom-left-radius: 3px;
</del><ins>+div.widget-liquid-right {
+ float: right;
+ width: 60%;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.widget-liquid-right .widgets-sortables,
-#widgets-left .widget-holder {
- border-width: 0 1px 1px;
- border-style: none solid solid;
- -webkit-border-bottom-right-radius: 3px;
- -webkit-border-bottom-left-radius: 3px;
- border-bottom-right-radius: 3px;
- border-bottom-left-radius: 3px;
</del><ins>+/* Widgets Left - Available Widgets */
+
+div#widgets-left {
+ margin: 0;
+ padding: 12px 5% 0 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.js .closed .widgets-sortables,
-.js .closed .widget-holder,
-.js .closed br.clear {
- display: none;
</del><ins>+div#widgets-left .closed .sidebar-name,
+div#widgets-left .inactive-sidebar.closed .sidebar-name {
+ margin-bottom: 10px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.widget-liquid-right .widgets-sortables {
- padding: 15px 0 0;
</del><ins>+div#widgets-left .sidebar-name h3 {
+ padding: 10px 0;
+ margin: 0 10px 0 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#available-widgets .widget-holder {
- padding: 7px 5px 0;
</del><ins>+div#widgets-left .sidebar-name:hover h3 {
+ color: #464646;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.inactive-sidebar {
- padding: 5px 5px 0;
</del><ins>+div#widgets-left .sidebar-name .sidebar-name-arrow:before {
+ right: 0;
+ top: 4px;
+ padding: 4px 6px 4px 4px;
+ border-radius: 20px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#widget-list .widget {
- width: 250px;
- margin: 0 10px 15px;
- border: 0 none;
</del><ins>+div#widgets-left .sidebar-name:hover .sidebar-name-arrow:before {
+ background: #ccc;
+}
+
+div#widgets-left .closed .sidebar-name .sidebar-name-arrow:before {
+ background: #999;
+ color: #fff;
+}
+
+div#widgets-left .widget-holder {
</ins><span class="cx"> background: transparent;
</span><del>- display: inline-block;
- vertical-align: top;
</del><ins>+ border: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#widget-list .widget-description {
- padding: 5px 8px;
</del><ins>+#available-widgets {
+ background: transparent !important; /* ln 1620 colors-fresh.css */
+ margin: 0;
+ border-radius: none;
+ box-shadow: none;
+ border: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.widget-placeholder {
- border-width: 1px;
- border-style: dashed;
- margin: 0 auto 20px;
- height: 34px;
- width: 250px;
</del><ins>+#available-widgets .widget-title-action {
+ display: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.inactive-sidebar .widget-placeholder {
- margin: 0 10px 20px;
- float: left;
</del><ins>+#available-widgets .widget {
+ margin: 10px 0 0 0;
+ background: #ddd;
+ border-radius: 3px;
</ins><span class="cx"> }
</span><ins>+#available-widgets .widget:nth-child(odd) {
+ clear: both;
+}
</ins><span class="cx">
</span><del>-div.widgets-holder-wrap {
- padding: 0;
- margin: 10px 0 20px;
</del><ins>+#available-widgets .widget-top {
+ border-radius: 3px;
+ background: #ffffff; /* ln 1047 in colors-fresh.css */
+ border: 1px solid #bbb !important; /* ln 991 in colors-fresh.css */
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#widgets-left #available-widgets {
- background-color: transparent;
- border: 0 none;
</del><ins>+#available-widgets .widget-top:hover {
+ border-color: #999 !important; /* ln 991 in colors-fresh.css */
+ box-shadow: 0 1px 3px rgba(0,0,0,0.2);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-ul#widget-list {
- list-style: none;
- margin: 0;
</del><ins>+#available-widgets .widget .widget-description {
+ display: block;
+padding: 10px 16px;
+font-size: 12px;
+}
+
+/* Inactive Sidebars */
+#widgets-left .inactive-sidebar {
+ clear: both;
+ width: 100%;
+ background: transparent;
</ins><span class="cx"> padding: 0;
</span><del>- min-height: 100px;
</del><ins>+ margin: 0 0 20px 0;
+ border: none;
+ box-shadow: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.widget .widget-top {
- font-size: 12px;
- font-weight: 600;
- height: 26px;
</del><ins>+#widgets-left .inactive-sidebar.first {
+ margin-top: 40px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.widget .widget-top,
-.menu-item-handle {
- margin-top: 0;
- padding: 4px;
</del><ins>+#widgets-left .inactive-sidebar .widget {
+ margin: 10px 0 0 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.widget-top .widget-title {
- padding: 7px 9px;
</del><ins>+#widgets-left .inactive-sidebar .widget-inside {
+ -webkit-border-bottom-right-radius: 3px;
+ -webkit-border-bottom-left-radius: 3px;
+ -moz-border-radius-bottomright: 3px;
+ -moz-border-radius-bottomleft: 3px;
+ border-bottom-right-radius: 3px;
+ border-bottom-left-radius: 3px;
+ background: #dfdfdf;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.widget-top .widget-title-action {
- float: right;
</del><ins>+#widgets-left .inactive-sidebar .widget-top {
+ background: #fff !important; /* ln 991 in colors-fresh.css */
+ border: 1px solid #bbb !important; /* ln 991 in colors-fresh.css */
+ border-radius: 3px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-a.widget-action {
- display: block;
- width: 24px;
- height: 26px;
- text-decoration: none;
</del><ins>+#widgets-left .inactive-sidebar .widget-top:hover {
+ border-color: #999 !important; /* ln 991 in colors-fresh.css */
+ box-shadow: 0 1px 3px rgba(0,0,0,0.2);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#available-widgets a.widget-action {
- display: none;
</del><ins>+/* Not sure what this is for... */
+div#widgets-left .inactive-sidebar .widget.expanded {
+ left: auto;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.widget-top a.widget-action,
-.widget-top a.widget-action:hover {
- background: none !important;
- border: none !important;
- width: 30px;
- margin-right: 0 !important;
- margin-top: 3px;
- text-decoration: none;
</del><ins>+#widgets-left .inactive-sidebar .widget-title-action {
+ float: right;
+ position: relative;
+ top: 13px;
+ right: 10px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.nav-menus-php .item-edit:after,
-.widget-top a.widget-action:after,
-.control-section .accordion-section-title::after,
-.accordion-section-title::after {
- right: 0;
- content: '\f141';
- border: none;
- background: none;
- font: normal 20px/1 'dashicons';
- speak: none;
- display: block;
</del><ins>+div#widgets-left .inactive-sidebar .widget-action:after {
+ content: '\f111';
+ color: #888;
+}
+
+div#widgets-left .inactive-sidebar .widgets-sortables {
+ min-height: 42px;
</ins><span class="cx"> padding: 0;
</span><del>- text-indent: 0;
- text-align: center;
</del><ins>+ background: transparent;
+ margin: 0;
</ins><span class="cx"> position: relative;
</span><del>- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
- text-decoration: none !important;
</del><span class="cx"> }
</span><span class="cx">
</span><del>-.control-section .accordion-section-title::after,
-.accordion-section-title::after {
- float: right;
- right: 20px;
- top: -2px;
</del><ins>+div#widgets-left .inactive-sidebar .widget-placeholder {
+ border: 1px solid #ccc;
+ margin: 0 auto 10px auto;
+ height: 43px;
+ width: 100%;
+ border-radius: 3px;
+ background: #aaa;
+ box-shadow: inset 0 1px 2px rgba(0,0,0,0.05);
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.widget-top a.widget-action:after {
- content: '\f140';
</del><ins>+/* Widgets Right */
+
+div#widgets-right:after {
+ content: ".";
+ display: block;
+ height: 0;
+ clear: both;
+ visibility: hidden;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.control-section.open .accordion-section-title::after,
-#customize-info.open .accordion-section-title::after,
-.nav-menus-php .menu-item-edit-active .item-edit:after {
- content: '\f140';
</del><ins>+div#widgets-right .widgets-holder-wrap {
+ margin: 10px 0 0 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.nav-menus-php .item-controls .item-type {
- padding: 11px;
- margin-right: 10px;
</del><ins>+div#widgets-right .widget {
+ margin: 0 auto;
+ border: 1px solid #dedede !important; /* ln 991 in colors-fresh.css */
+ border-bottom: none !important; /* ln 991 in colors-fresh.css */
+ margin-left: 0 !important; /* Wide format widgets are the devil */
+ width: 100% !important; /* Wide format widgets are the devil */
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.widget .widget-inside,
-.widget .widget-description {
- padding: 12px 12px 10px;
- font-size: 12px;
- line-height: 16px;
</del><ins>+div#widgets-right .sidebar-description {
+ border-top: 1px solid #eeeeee;
+ padding: 10px 15px 15px 15px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.widget-inside,
-.widget-description {
</del><ins>+div#widgets-right .closed .sidebar-description {
</ins><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#available-widgets .widget-description {
- display: block;
</del><ins>+div#widgets-right .sidebar-name h3 {
+ padding: 15px 15px;
</ins><span class="cx"> }
</span><del>-
-.widget .widget-inside p {
- margin: 0 0 1em;
</del><ins>+div#widgets-right .sidebar-name .sidebar-name-arrow:before {
+ right: 0;
+ top: 4px;
+}
+div#widgets-right .widget-top {
+ border-bottom: none;
</ins><span class="cx"> padding: 0;
</span><ins>+ background: #f7f7f7;
</ins><span class="cx"> }
</span><del>-
-.widget-title h4 {
- margin: 0;
- padding-bottom: 0.2em;
- line-height: 1;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
</del><ins>+div#widgets-right .widget-title-action {
+ float: right;
+ position: relative;
+ top: 14px;
+ right: 10px;
</ins><span class="cx"> }
</span><del>-
-.widgets-sortables {
- min-height: 90px;
</del><ins>+div#widgets-right a.widget-action:after {
+ content: '\f111';
+ color: #888;
</ins><span class="cx"> }
</span><del>-
-.widget-control-actions {
- margin-top: 8px;
</del><ins>+div#widgets-right .widget-inside {
+ border-top: 1px solid #dedede;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.widget-control-actions a {
- text-decoration: none;
</del><ins>+/* The last widget has some additional borders */
+div#widgets-right .widget:last-child {
+ border-bottom: 1px solid #dedede !important; /* ln 991 in colors-fresh.css */
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.widget-control-actions a:hover {
- text-decoration: underline;
</del><ins>+div#widgets-right .widgets-sortables {
+ min-height: 42px !important; /* Inline styles */
+ padding: 0 8px;
+ margin-bottom: 8px;
+ position: relative;
</ins><span class="cx"> }
</span><del>-
-.widget-control-actions div.alignleft {
- margin-top: 6px;
</del><ins>+div#widgets-right .widgets-sortables:before {
+ display: block;
+ content: "";
+ text-align: center;
+ position: absolute;
+ left: 8px;
+ right: 8px;
+ bottom: 1px;
+ height: 40px;
+ border: 1px dashed #dedede;
+ border-radius: 3px;
+ line-height: 40px;
+ font-weight: 600;
+ color: #aaa;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-div#sidebar-info {
- padding: 0 1em;
- margin-bottom: 1em;
- font-size: 12px;
</del><ins>+/* Accessibility Mode */
+#available-widgets .widget-control-edit .edit {
+ display :none;
</ins><span class="cx"> }
</span><del>-
-.widget-title a,
-.widget-title a:hover {
- text-decoration: none;
- border-bottom: none;
-}
-
-.widget-control-edit {
</del><ins>+#available-widgets .widget-control-edit .add {
</ins><span class="cx"> display: block;
</span><del>- font-size: 12px;
- font-weight: normal;
- line-height: 26px;
- padding: 0 8px 0 0;
</del><ins>+ position: absolute;
+ top: 0;
+ right: 50px;
+ bottom: 0;
+ left: 0;
+ z-index: 40;
+ text-align: center;
+ text-indent: -5000px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-a.widget-control-edit {
- text-decoration: none;
</del><ins>+#widgets-right .widget-control-edit {
+ background: #EEE;
+ margin: -14px -10px 0 0;
+ padding: 16px 15px;
+ border-left: 1px solid #DDD;
</ins><span class="cx"> }
</span><del>-
-.widget-control-edit .add,
-.widget-control-edit .edit {
</del><ins>+#widgets-right .widget-control-edit .add {
</ins><span class="cx"> display: none;
</span><span class="cx"> }
</span><del>-
-#available-widgets .widget-control-edit .add,
-#widgets-right .widget-control-edit .edit,
-.inactive-sidebar .widget-control-edit .edit {
- display: inline;
</del><ins>+#widgets-right .widget-control-edit:hover {
+ background: #444;
</ins><span class="cx"> }
</span><ins>+#widgets-right .widget-control-edit:before {
+ content: '\f111';
+ display: inline-block;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+ font: normal 16px/1 'dashicons';
+ vertical-align: top;
+ position: relative;
+ top: -1px;
+ padding-right: 4px;
+}
</ins><span class="cx">
</span><span class="cx"> .editwidget {
</span><del>- margin: 0 auto 15px;
</del><ins>+ margin: 0 auto;
</ins><span class="cx"> }
</span><del>-
-.editwidget .widget-inside {
- display: block;
- padding: 10px;
</del><ins>+.editwidget .widget-control-actions {
+ margin-top: 20px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.inactive p.description {
- margin: 5px 15px 10px;
</del><ins>+.js .closed .widgets-sortables,
+.js .closed .widget-holder,
+.js .closed br.clear {
+ display: none;
</ins><span class="cx"> }
</span><del>-
-#available-widgets p.description {
- margin: 0 12px 12px;
</del><ins>+.nav-menus-php .item-edit:after,
+.widget-top a.widget-action:after,
+.control-section .accordion-section-title::after,
+.accordion-section-title::after {
+ right: 0;
+ content: '\f141';
+ border: none;
+ background: none;
+ font: normal 20px/1 'dashicons';
+ speak: none;
+ display: block;
+ padding: 0;
+ text-indent: 0;
+ text-align: center;
+ position: relative;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+ text-decoration: none !important;
</ins><span class="cx"> }
</span><del>-
-.widget-position {
- margin-top: 8px;
</del><ins>+.control-section .accordion-section-title::after,
+.accordion-section-title::after {
+ float: right;
+ right: 20px;
+ top: -2px;
</ins><span class="cx"> }
</span><del>-
-.inactive {
- padding-top: 2px;
</del><ins>+.control-section.open .accordion-section-title::after,
+#customize-info.open .accordion-section-title::after,
+.nav-menus-php .menu-item-edit-active .item-edit:after {
+ content: '\f140';
</ins><span class="cx"> }
</span><del>-
-.sidebar-name .spinner {
- float: none;
- margin: -4px 3px;
</del><ins>+.nav-menus-php .item-controls .item-type {
+ padding: 11px;
+ margin-right: 10px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.sidebar-name-arrow {
- float: right;
- height: 29px;
- width: 26px;
</del><ins>+/* Hide Widget Settings by Default */
+.widget-inside,
+.widget-description {
+ display: none;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-.widget-title .in-widget-title {
- font-size: 12px;
- white-space: nowrap;
-}
-
</del><ins>+/* Dragging widgets over the available widget area show's a "Deactivate" message */
</ins><span class="cx"> #removing-widget {
</span><span class="cx"> display: none;
</span><span class="cx"> font-weight: normal;
</span><span class="lines">@@ -10131,6 +10223,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #widgets-chooser {
</span><ins>+ clear: both;
</ins><span class="cx"> display: none;
</span><span class="cx"> margin: auto;
</span><span class="cx"> padding-bottom: 10px;
</span><span class="lines">@@ -10336,6 +10429,32 @@
</span><span class="cx"> /* =Media Queries
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span><ins>+@media screen and (max-width: 480px) {
+ div.widget-liquid-left {
+ width: 100%;
+ float: none;
+ border-right: none;
+ padding-right: 0;
+ }
+
+ #widgets-left .sidebar-name {
+ margin-right: 0;
+ }
+
+ #widgets-left #available-widgets .widget-top {
+ margin-right: 0;
+ }
+
+ #widgets-left .inactive-sidebar .widgets-sortables {
+ margin-right: 0;
+ }
+
+ div.widget-liquid-right {
+ width: 100%;
+ float: none;
+ }
+}
+
</ins><span class="cx"> @media only screen and (max-width: 768px) {
</span><span class="cx"> /* categories */
</span><span class="cx"> #col-left {
</span><span class="lines">@@ -10407,7 +10526,34 @@
</span><span class="cx"> width: auto;
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+@media only screen and (min-width: 1250px) {
+ #widgets-left #available-widgets .widget {
+ width: 49%;
+ float: left;
+ }
+
+ #widgets-left #available-widgets .widget:nth-child(even) {
+ float: right;
+ }
</ins><span class="cx">
</span><ins>+ #widgets-right .widgets-holder-wrap {
+ width: 48.5%;
+ float: left;
+ }
+
+ #widgets-right .widgets-holder-wrap:nth-child(odd) {
+ clear: both;
+ }
+
+ #widgets-right .widgets-holder-wrap:nth-child(even) {
+ float: right;
+ }
+
+ #widgets-right.single-sidebar .widgets-holder-wrap {
+ width: 100%;
+ }
+}
+
</ins><span class="cx"> /**
</span><span class="cx"> * HiDPI Displays
</span><span class="cx"> */
</span><span class="lines">@@ -10415,8 +10561,7 @@
</span><span class="cx"> (-o-min-device-pixel-ratio: 5/4),
</span><span class="cx"> (-webkit-min-device-pixel-ratio: 1.25),
</span><span class="cx"> (min-resolution: 120dpi) {
</span><del>-
- tr.wp-locked .locked-indicator {
</del><ins>+ tr.wp-locked .locked-indicator {
</ins><span class="cx"> background-image: url('../images/lock-2x.png');
</span><span class="cx"> background-size: 16px 16px;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludeswidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/widgets.php (26139 => 26140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/widgets.php 2013-11-13 19:53:01 UTC (rev 26139)
+++ trunk/src/wp-admin/includes/widgets.php 2013-11-13 20:05:51 UTC (rev 26140)
</span><span class="lines">@@ -67,8 +67,6 @@
</span><span class="cx"> function wp_list_widget_controls( $sidebar ) {
</span><span class="cx"> add_filter( 'dynamic_sidebar_params', 'wp_list_widget_controls_dynamic_sidebar' );
</span><span class="cx">
</span><del>- echo "<div id='$sidebar' class='widgets-sortables'>\n";
-
</del><span class="cx"> $description = wp_sidebar_description( $sidebar );
</span><span class="cx">
</span><span class="cx"> if ( !empty( $description ) ) {
</span><span class="lines">@@ -77,6 +75,7 @@
</span><span class="cx"> echo "</div>\n";
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ echo "<div id='$sidebar' class='widgets-sortables'>\n";
</ins><span class="cx"> dynamic_sidebar( $sidebar );
</span><span class="cx"> echo "</div>\n";
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpadminjswidgetsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/widgets.js (26139 => 26140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/widgets.js 2013-11-13 19:53:01 UTC (rev 26139)
+++ trunk/src/wp-admin/js/widgets.js 2013-11-13 20:05:51 UTC (rev 26140)
</span><span class="lines">@@ -363,9 +363,7 @@
</span><span class="cx"> sidebar.closest( '.widgets-holder-wrap' ).removeClass('closed');
</span><span class="cx"> sidebar.sortable('refresh');
</span><span class="cx">
</span><del>- // Change for MP6
- // widget.prependTo( sidebar );
- sidebar.find( '.sidebar-description' ).after( widget );
</del><ins>+ widget.prependTo( sidebar );
</ins><span class="cx">
</span><span class="cx"> wpWidgets.save( widget, 0, 0, 1 );
</span><span class="cx"> // No longer "new" widget
</span></span></pre>
</div>
</div>
</body>
</html>