From 167db2d9da27e3e8bb7104ea141ca0e4834a8496 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <nacin@git.wordpress.org>
Date: Wed, 5 Dec 2012 19:15:40 +0000
Subject: [PATCH] Media: Account for the most obvious and common style
 conflicts that may occur when the media modal is loaded on the frontend.
 Tested primarily with P2. props lessbloat, helenyhou. fixes #22752.

git-svn-id: https://develop.svn.wordpress.org/trunk@23077 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-includes/css/media-views.css | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/wp-includes/css/media-views.css b/wp-includes/css/media-views.css
index 85dc99dfa3..b24b3dbb30 100644
--- a/wp-includes/css/media-views.css
+++ b/wp-includes/css/media-views.css
@@ -20,6 +20,7 @@
 }
 
 .media-frame a {
+	border-bottom: none;
 	color: #21759b;
 }
 
@@ -61,6 +62,11 @@
 	border-color: #dfdfdf;
 }
 
+.media-frame select {
+	height: 24px;
+	padding: 2px;
+}
+
 .media-frame input:disabled,
 .media-frame textarea:disabled,
 .media-frame input[readonly],
@@ -241,6 +247,10 @@
 	display: block;
 }
 
+.media-sidebar .setting .link-to-custom {
+	margin: 3px 0;
+}
+
 .media-sidebar .setting span {
 	min-width: 30%;
 	margin-right: 4%;
@@ -1070,6 +1080,10 @@
 	margin: 4em 0;
 }
 
+.uploader-inline-content .post-upload-ui {
+	margin-bottom: 2em;
+}
+
 .uploader-inline .has-upload-message .upload-ui {
 	margin: 0 0 4em;
 }
@@ -1182,6 +1196,7 @@
 
 .media-selection .selection-view {
 	display: inline-block;
+	vertical-align: top;
 }
 
 .media-selection .attachments {