Merged with WordPress 2.5, unstable, only for testing

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1218 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 126 insertions, 172 deletions

diff --git a/wp-admin/css/widgets.css b/wp-admin/css/widgets.css
index f46c4ce..ea70396 100644
--- a/wp-admin/css/widgets.css
+++ b/wp-admin/css/widgets.css
@@ -1,236 +1,190 @@
-body {
-	height: 100%;
-}
-
-#sbadmin #zones {
-	-moz-user-select: none;
-	-khtml-user-select: none;
-	user-select: none;
-}
-
-#sbreset {
+/* 2 column liquid layout */
+div.widget-liquid-left-holder {
 	float: left;
-	margin: 1px 0;
-}
-
-.dropzone {
-	border: 1px solid #bbb;
-	float: left;
-	margin-right: 10px;
-	padding: 5px;
-	background-color: #f0f8ff;
-}
-
-.dropzone h3 {
-	text-align: center;
-	color: #333;
+	clear: left;
+	width: 100%;
+	margin-right: -310px;
 }
 
-.dropzone input {
-	display: none;
+div.widget-liquid-left {
+	margin-right: 320px;
 }
 
-.dropzone ul {
-	float: left;
-	list-style-type: none;
-	width: 240px;
-	margin: 0;
-	min-height: 200px;
-	padding: 0;
-	display: block;
+div.widget-liquid-right {
+	float: right;
+	clear: right;
+	width: 300px;
+	position: relative;
 }
 
-* .module {
-	width: 238px;
-	padding: 0;
-	margin: 5px 0;
-	cursor: move;
-	display: block;
-	border: 1px solid #ccc;
-	background-color: #fbfbfb;
+/* pasitioning etc. */
+form#widgets-filter {
 	position: relative;
-	text-align: left;
-	line-height: 25px;
 }
 
-* .handle {
-	display: block;
-	width: 216px;
-	padding: 0 10px;
-	position: relative;
-	border-top: 1px solid #f2f2f2;
-	border-right: 1px solid #e8e8e8;
-	border-bottom: 1px solid #e8e8e8;
-	border-left: 1px solid #f2f2f2;
+div#available-widgets-filter {
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
 }
 
-* .popper {
-	margin: 0;
-	display: inline;
+p#widget-search {
 	position: absolute;
-	top: 3px;
-	right: 3px;
-	overflow: hidden;
-	text-align: center;
-	height: 16px;
-	font-size: 18px;
-	line-height: 14px;
-	cursor: pointer;
-	padding: 0 3px 1px;
-	border-top: 4px solid #6da6d1;
-	background: url( ../images/fade-butt.png ) -5px 0px;
-}
-
-* html .popper {
-	padding: 1px 6px 0;
-	font-size: 16px;
-}
-
-#sbadmin p.submit {
-	padding-right: 10px;
-	clear: left;
+	right: 0;
+	top: 0;
+	margin: 0;
 }
 
-.placemat {
-	cursor: default;
+ul#widget-list {
+	list-style: none;
 	margin: 0;
 	padding: 0;
-	position: relative;
 }
 
-.placemat h4 {
-	text-align: center;
-}
-
-.placemat span {
-	background-color: #ffe;
-	border: 1px solid #ccc;
-	padding: 0 10px 10px;
-	position: absolute;
-	text-align: justify;
+ul#widget-list li.widget-list-item {
+	padding: .7em 0.9em;
+	margin: 0;
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+	background-color: transparent;
+	line-height: 1;
 }
 
-#palettediv {
-	border: 1px solid #bbb;
-	background-color: #f0f8ff;
-	height:auto;
-	margin-top: 10px;
-	padding-bottom: 10px;
+ul#widget-list li.widget-list-item h4.widget-title {
+	position: relative;
+	margin: 0;
+	padding: .5em 1em;
+	width: 200px;
+	float: left;
+	font-size: 13px;
+	-moz-border-radius: 3px;
+	-khtml-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;;
 }
 
-#palettediv:after, #zones:after, .dropzone:after {
-	content: ".";
-	display: block;
-	height: 0;
-	clear: both;
-	visibility: hidden;
+#dragHelper h4.widget-title {
+	padding: .5em 1em;
+	margin: 0;
 }
 
-#palettediv, #zones, .dropzone {
+ul#widget-list li.widget-list-item div.widget-description {
 	display: block;
-	min-height: 1px;
+	margin: 0 0 0 200px;
+	padding: 0 0 0 4em;
+	font-size: 11px;
 }
 
-* html #palettediv, * html #zones, * html .dropzone {
-	height: 1%;
-}
 
-#palettediv h3 {
-	text-align: center;
-	color: #333;
-	min-height: 1px;
+ul#widget-list li.widget-list-item ul.widget-control-info {
+	display: none;
 }
 
-#palettediv ul {
-	padding: 0 0 0 10px;
+div#sidebar-info {
+	padding: 0 1em;
+	margin-bottom: 1em;
+	font-size: 11px;
 }
 
-#palettediv .module {
-	margin-right: 10px;
-	float: left;
-	width: 120px;
+ul.widget-control-list {
+	list-style: none;
+	margin: 0;
+	padding: 0 1em;
 }
 
-#palettediv .handle {
-	height: 40px;
-	font-size: 90%;
-	width: 110px;
-	padding: 0 5px;
+div#current-widgets p.submit {
+	padding: 1em;
 }
 
-#palettediv .popper {
-	visibility: hidden;
+li.widget-list-control-item {
+	margin: 0 0 1em;
+	-moz-border-radius: 3px;
+	-khtml-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
 }
 
-* html #palettediv ul {
+li.widget-list-control-item h4, #dragHelper li.widget-list-control-item h4, li.widget-sortable h4 {
 	margin: 0;
-	padding: 0 0 0 10px;
+	padding: 0.4em 2.5em 0.4em 0.8em;
+	cursor: move;
+	font-size: 13px;
+	-moz-border-radius: 3px;
+	-khtml-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+}
+
+.widget-control-save, .widget-control-remove {
+	padding: 3px 5px;
+	-moz-border-radius: 3px;
+	-khtml-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+	margin-right: 8px;
+	float: left;
+	text-decoration: none;
 }
 
-#controls {
-	height: 0px;
+h4.widget-title a {
+	position: absolute;
+	right: 1em;
+	text-decoration: underline;
+	border-bottom: none;
 }
 
-.control {
-	position: absolute;
-	display: block;
-	background: #f9fcfe;
-	padding: 0;
+li.widget-list-control-item h4.widget-title a,
+#dragHelper li.widget-list-control-item h4.widget-title a,
+#draghelper li.widget-list-control-item h4.widget-title a:visited {
+	right: 2em;
 }
 
-.controlhandle {
-	cursor: move;
-	background-color: #6da6d1;
-	border-bottom: 2px solid #448abd;
-	color: #333;
-	display: block;
-	margin: 0 0 5px;
-	padding: 4px;
-	font-size: 120%;
+li.widget-list-control-item h4.widget-title a:hover {
+
+	text-decoration: none;
+	border-bottom: none;
 }
 
-.controlcloser {
-	cursor: pointer;
-	font-size: 120%;
-	display: block;
-	position: absolute;
-	top: 2px;
-	right: 8px;
-	padding: 0 3px;
-	font-weight: bold;
+li.widget-list-control-item div.widget-control {
+	display: none;
+	margin: 1em;
+	padding: 0 10px 0 7px; /* Correction for padding, margin, border of inputs */
+	font-size: 11px;
 }
 
-.controlform {
-	margin: 20px 30px;
+li.widget-list-control-item div.widget-control p {
+	margin: 0 0 1em;
+	padding: 0;
 }
 
-.controlform p {
-	text-align: center;
+ul.widget-control-list div.widget-control-actions {
+	margin-right: -10px; /* Correction for padding, margin, border of inputs */
+	margin-left: -6px;
+	border-top-width: 1px;
+	border-top-style: solid;
+	padding: 0.5em 0 0.8em;
 }
 
-.control .checkbox {
-	border: none;
-	background: transparent;
+ul.widget-control-list .widget-title {
+	
 }
 
-.hidden {
-	display: none;
+.widget-control-edit {
+	font-size: 10px;
+	font-weight: normal;
 }
 
-#shadow {
-	background: black;
-	display: none;
-	position: absolute;
-	top: 0px;
-	left: 0px;
-	width: 100%;
+div#current-widgets {
+	padding-top: 1em;
+	border-width: 1px;
+	border-style: solid none none;
 }
 
-#dragHelper {
-	position: absolute;
+#widget-controls .widefat {
+	width: 92%;
+	padding: 3px;
 }
 
-#dragHelper li.module {
+#widget-controls select.widefat {
+	width: auto;
 	display: block;
-	float: left;
 }