Fix styling issues after rebase

Automattic · Dec 15, 2015 · 63db848 · 63db848
1 parent 8531782
commit 63db848
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 17 deletions.
diff --git a/client/reader/following-edit/index.jsx b/client/reader/following-edit/index.jsx
@@ -381,7 +381,10 @@ var FollowingEdit = React.createClass( {
 					autoFocus={ true }
 					additionalClasses="following-edit__existing-feed-search"
 					placeholder={ searchPlaceholder }
-					onSearch={ this.doSearch } initialValue={ this.props.search } delaySearch={ true } ref="url-search" />
+					onSearch={ this.doSearch }
+					initialValue={ this.props.search }
+					delaySearch={ true }
+					ref="url-search" />
 				{ this.state.isAttemptingFollow && ! this.state.lastError ? <SubscriptionPlaceholder key={ 'placeholder-add-feed' } /> : null }
 				{ subscriptionsToDisplay.length === 0 && this.props.search ?
 					<NoResults text={ this.translate( 'No subscriptions match that search.' ) } /> :

diff --git a/client/reader/following-edit/style.scss b/client/reader/following-edit/style.scss
@@ -1,6 +1,12 @@
 .following-edit {
 	position: relative;
 
+	&.is-adding {
+		.search-card {
+			display: none;
+		}
+	}
+
 	ul {
 		list-style-type: none;
 		margin: 0;
@@ -129,7 +135,7 @@
 		}
 	}
 
-	.noticon {
+	.search-open__icon {
 		display: none;
 	}
 
@@ -141,14 +147,7 @@
 		z-index: 23; // Higher than <Search>'s z-index: 22;
 	}
 
-	.noticon-close-alt {
-		top: -2px;
-		right: -2px;
-		color: $gray;
-	}
-
-	.gridicons-add-outline,
-	.noticon-close-alt {
+	.gridicons-add-outline {
 		transform: translateX( 30px );
 		transition: all 0.15s ease-in-out;
 	}
@@ -157,8 +156,7 @@
 		opacity: 1;
 		pointer-events: auto;
 
-		.gridicons-add-outline,
-		.noticon-close-alt {
+		.gridicons-add-outline {
 			transform: translateX( 0 );
 		}
 	}
@@ -200,10 +198,6 @@
 				margin-bottom: 11px;
 			}
 		}
-
-		.reader-list-item__icon .noticon {
-			display: block;
-		}
 	}
 }
 
@@ -370,6 +364,7 @@
 	margin-top: 12px;
 }
 
+
 @include breakpoint( ">660px" ) {
 	.following-edit {
 		.follow-button__label {
@@ -381,4 +376,4 @@
 			margin-right: 100px;
 		}
 	}
-}
+}