fix merge

elastic · Jul 25, 2018 · 3d8b9b9 · 3d8b9b9
1 parent 0e898e5
commit 3d8b9b9
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 50 deletions.
diff --git a/x-pack/plugins/spaces/public/views/space_selector/__snapshots__/space_selector.test.js.snap b/x-pack/plugins/spaces/public/views/space_selector/__snapshots__/space_selector.test.js.snap
@@ -6,61 +6,61 @@ exports[`it renders without crashing 1`] = `
   style={undefined}
 >
   <div
-    className="euiPageHeader spaceSelector__heading"
+    className="euiPageBody"
   >
     <div
-      className="euiPageHeaderSection spaceSelector__logoHeader"
+      className="euiPageHeader euiPageHeader--responsive spaceSelector__heading"
     >
       <div
-        className="spaceSelector__logoCircle"
+        className="euiPageHeaderSection spaceSelector__logoHeader"
       >
-        <svg
-          className="euiIcon euiIcon--xxLarge"
-          focusable="false"
-          height="40"
-          style={
-            Object {
-              "fill": undefined,
+        <div
+          className="spaceSelector__logoCircle"
+        >
+          <svg
+            className="euiIcon euiIcon--xxLarge"
+            focusable="false"
+            height="40"
+            style={
+              Object {
+                "fill": undefined,
+              }
             }
-          }
-          tabIndex={undefined}
-          viewBox="0 0 30 40"
-          width="30"
-          xmlns="http://www.w3.org/2000/svg"
+            tabIndex={undefined}
+            viewBox="0 0 30 40"
+            width="30"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M.874 40H30c0-8.046-4.566-15.197-11.652-19.768L.874 40z"
+              fill="#3EBEB0"
+            />
+            <path
+              d="M0 26v14h1.873L18.35 20.229a31.291 31.291 0 0 0-3.562-1.974L0 26z"
+              fill="#37A595"
+            />
+            <path
+              d="M0 13v23l14.79-17.748C10.424 16.186 15.38 14 10 14L0 13z"
+              fill="#353535"
+            />
+            <path
+              d="M30 0H0v15c5.38 0 10.424 1.186 14.79 3.252L30 0z"
+              fill="#E9478B"
+            />
+          </svg>
+        </div>
+        <div
+          className="euiSpacer euiSpacer--l"
+        />
+        <span
+          className="euiTextColor euiTextColor--ghost euiTitle euiTitle--large"
         >
-          <path
-            d="M.874 40H30c0-8.046-4.566-15.197-11.652-19.768L.874 40z"
-            fill="#3EBEB0"
-          />
-          <path
-            d="M0 26v14h1.873L18.35 20.229a31.291 31.291 0 0 0-3.562-1.974L0 26z"
-            fill="#37A595"
-          />
-          <path
-            d="M0 13v23l14.79-17.748C10.424 16.186 15.38 14 10 14L0 13z"
-            fill="#353535"
-          />
-          <path
-            d="M30 0H0v15c5.38 0 10.424 1.186 14.79 3.252L30 0z"
-            fill="#E9478B"
-          />
-        </svg>
+          <p>
+            Select your space
+          </p>
+        </span>
       </div>
-      <div
-        className="euiSpacer euiSpacer--l"
-      />
-      <span
-        className="euiTextColor euiTextColor--ghost euiTitle euiTitle--large"
-      >
-        <p>
-          Select your space
-        </p>
-      </span>
     </div>
-  </div>
-  <div
-    className="euiPageBody"
-  >
     <div
       className="euiPanel euiPanel--paddingLarge euiPageContent spaceSelector__pageContent"
     >
@@ -98,11 +98,11 @@ exports[`it renders without crashing 1`] = `
         <div
           className="euiTextAlign euiTextAlign--center"
         >
-          <span
+          <div
             className="euiTextColor euiTextColor--subdued"
           >
             No spaces match search criteria
-          </span>
+          </div>
         </div>
       </div>
     </div>

diff --git a/yarn.lock b/yarn.lock
@@ -6624,7 +6624,7 @@ iconv-lite@0.4.7:
   version "0.4.7"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.7.tgz#89d32fec821bf8597f44609b4bc09bed5c209a23"
 
-iconv-lite@^0.4.22:
+iconv-lite@^0.4.22, iconv-lite@~0.4.13:
   version "0.4.23"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
   dependencies:
@@ -12038,7 +12038,7 @@ rxjs@^6.2.1:
   dependencies:
     tslib "^1.9.0"
 
-safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"