Merge pull request #11932 from Automattic/fix/media-modal-upload-by-u…

…rl-styles Media modal: do not apply custom styles to uploading-by-URL box
Automattic · Mar 9, 2017 · 9ae39f5 · 9ae39f5
2 parents 2f5eb7b + 1331edf
commit 9ae39f5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/client/my-sites/media-library/index.jsx b/client/my-sites/media-library/index.jsx
@@ -25,6 +25,7 @@ module.exports = React.createClass( {
 	mixins: [ urlSearch ],
 
 	propTypes: {
+		className: React.PropTypes.string,
 		site: React.PropTypes.object,
 		filter: React.PropTypes.string,
 		enabledFilters: React.PropTypes.arrayOf( React.PropTypes.string ),
@@ -143,9 +144,11 @@ module.exports = React.createClass( {
 			);
 		}
 
-		classes = classNames( 'media-library', {
-			'is-single': this.props.single
-		} );
+		classes = classNames(
+			'media-library',
+			{ 'is-single': this.props.single },
+			this.props.className,
+		);
 
 		return (
 			<div className={ classes }>

diff --git a/client/my-sites/media-library/style.scss b/client/my-sites/media-library/style.scss
@@ -94,14 +94,6 @@
 	}
 }
 
-.media-library__header.media-library__upload-url {
-	padding: 6px 12px;
-	background-color: $white;
-	box-sizing: border-box;
-	box-shadow: 0 0 0 1px transparentize( lighten( $gray, 20% ), .5 ),
-		0 1px 2px lighten( $gray, 30% );
-}
-
 .media-library__upload-buttons {
 	display: inline;
 }

diff --git a/client/my-sites/media/main.jsx b/client/my-sites/media/main.jsx
@@ -238,6 +238,7 @@ export default React.createClass( {
 					<MediaLibrarySelectedData siteId={ site.ID }>
 						<MediaLibrary
 							{ ...this.props }
+							className="media__main-section"
 							onFilterChange={ this.onFilterChange }
 							site={ site }
 							single={ false }

diff --git a/client/my-sites/media/style.scss b/client/my-sites/media/style.scss
@@ -28,3 +28,11 @@
 		color: lighten( $alert-red, 25% );
 	}
 }
+
+.media__main-section .media-library__header.media-library__upload-url {
+	padding: 6px 12px;
+	background-color: $white;
+	box-sizing: border-box;
+	box-shadow: 0 0 0 1px transparentize( lighten( $gray, 20% ), .5 ),
+		0 1px 2px lighten( $gray, 30% );
+}