Skip to content

Commit

Permalink
[6.x] Upgrade styled-components to 3.3.3 (elastic#20257) (elastic#20368)
Browse files Browse the repository at this point in the history 
Backports the following commits to 6.x:
 - Upgrade styled-components to 3.3.3  (elastic#20257)
  • Loading branch information
@weltenwort
weltenwort authored Jul 3, 2018
1 parent 5400617 commit a954f44
Show file tree
Hide file tree
Showing 7 changed files with 139 additions and 127 deletions.
2 changes: 1 addition & 1 deletion x-pack/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
"rison-node": "0.3.1",
"rxjs": "^6.2.1",
"semver": "5.1.0",
"styled-components": "2.3.2",
"styled-components": "3.3.3",
"tar-fs": "1.13.0",
"tinycolor2": "1.3.0",
"ui-select": "0.19.4",
Expand Down
134 changes: 67 additions & 67 deletions ...omponents/app/ErrorGroupDetails/DetailView/__test__/__snapshots__/DetailView.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,6 @@
exports[`DetailView should render empty state 1`] = `""`;

exports[`DetailView should render with data 1`] = `
.c0 {
position: relative;
border: 1px solid #d9d9d9;
border-radius: 5px;
margin-top: 24px;
}
.c1 {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-pack: justify;
-webkit-justify-content: space-between;
-ms-flex-pack: justify;
justify-content: space-between;
-webkit-align-items: flex-start;
-webkit-box-align: flex-start;
-ms-flex-align: flex-start;
align-items: flex-start;
padding: 24px 24px 0;
margin-bottom: 16px;
}
.c2 {
margin: 24px 0;
font-size: 20px;
margin: 0;
}
.c3 {
display: -webkit-box;
display: -webkit-flex;
Expand All @@ -54,6 +24,12 @@ exports[`DetailView should render with data 1`] = `
margin-bottom: 16px;
}
.c8 {
width: 33%;
margin-bottom: 16px;
width: 66%;
}
.c5 {
margin-bottom: 8px;
font-size: 12px;
Expand All @@ -73,12 +49,6 @@ exports[`DetailView should render with data 1`] = `
color: #999999;
}
.c8 {
width: 33%;
margin-bottom: 16px;
width: 66%;
}
.c9 {
display: inline-block;
max-width: 100%;
Expand All @@ -88,9 +58,10 @@ exports[`DetailView should render with data 1`] = `
line-height: 16px;
}
.c10 {
padding: 0 24px;
border-bottom: 1px solid #d9d9d9;
.c2 {
margin: 24px 0;
font-size: 20px;
margin: 0;
}
.c11 {
Expand Down Expand Up @@ -118,34 +89,6 @@ exports[`DetailView should render with data 1`] = `
user-select: none;
}
.c13 {
padding: 24px 24px 0;
}
.c14 {
margin: 0 0 24px 0;
position: relative;
font-family: "SFMono-Regular",Consolas,"Liberation Mono",Menlo,Courier,monospace;
border: 1px solid #d9d9d9;
border-radius: 5px;
background: #f5f5f5;
}
.c14 .c16 {
color: #000000;
}
.c15 {
color: #999999;
padding: 8px;
border-bottom: 1px solid #d9d9d9;
border-radius: 5px 5px 0 0;
}
.c17 {
font-weight: bold;
}
.c18 {
position: relative;
border-radius: 0 0 5px 5px;
Expand Down Expand Up @@ -229,6 +172,30 @@ exports[`DetailView should render with data 1`] = `
z-index: 2;
}
.c15 {
color: #999999;
padding: 8px;
border-bottom: 1px solid #d9d9d9;
border-radius: 5px 5px 0 0;
}
.c17 {
font-weight: bold;
}
.c14 {
margin: 0 0 24px 0;
position: relative;
font-family: "SFMono-Regular",Consolas,"Liberation Mono",Menlo,Courier,monospace;
border: 1px solid #d9d9d9;
border-radius: 5px;
background: #f5f5f5;
}
.c14 .c16 {
color: #000000;
}
.c26 {
margin: 0 0 24px 0;
-webkit-user-select: none;
Expand All @@ -237,6 +204,39 @@ exports[`DetailView should render with data 1`] = `
user-select: none;
}
.c0 {
position: relative;
border: 1px solid #d9d9d9;
border-radius: 5px;
margin-top: 24px;
}
.c1 {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-box-pack: justify;
-webkit-justify-content: space-between;
-ms-flex-pack: justify;
justify-content: space-between;
-webkit-align-items: flex-start;
-webkit-box-align: flex-start;
-ms-flex-align: flex-start;
align-items: flex-start;
padding: 24px 24px 0;
margin-bottom: 16px;
}
.c10 {
padding: 0 24px;
border-bottom: 1px solid #d9d9d9;
}
.c13 {
padding: 24px 24px 0;
}
<div
className="c0"
>
Expand Down
8 changes: 4 additions & 4 deletions ...s/apm/public/components/app/ServiceOverview/List/__test__/__snapshots__/List.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,10 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
width: 40%;
}
.c3 {
width: 15%;
}
.c2 {
font-size: 16px;
max-width: 100%;
Expand All @@ -218,10 +222,6 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
text-overflow: ellipsis;
}
.c3 {
width: 15%;
}
<div
className="kuiControlledTable"
>
Expand Down
48 changes: 24 additions & 24 deletions .../apm/public/components/shared/CodePreview/__test__/__snapshots__/CodePreview.test.js.snap
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,6 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`CodePreview should render with data 1`] = `
.c0 {
margin: 0 0 24px 0;
position: relative;
font-family: "SFMono-Regular",Consolas,"Liberation Mono",Menlo,Courier,monospace;
border: 1px solid #d9d9d9;
border-radius: 5px;
background: #f5f5f5;
}
.c0 .c2 {
color: #000000;
}
.c1 {
color: #999999;
padding: 8px;
border-bottom: 1px solid #d9d9d9;
border-radius: 5px 5px 0 0;
}
.c3 {
font-weight: bold;
}
.c4 {
position: relative;
border-radius: 0 0 5px 5px;
Expand Down Expand Up @@ -108,6 +84,30 @@ exports[`CodePreview should render with data 1`] = `
z-index: 2;
}
.c1 {
color: #999999;
padding: 8px;
border-bottom: 1px solid #d9d9d9;
border-radius: 5px 5px 0 0;
}
.c3 {
font-weight: bold;
}
.c0 {
margin: 0 0 24px 0;
position: relative;
font-family: "SFMono-Regular",Consolas,"Liberation Mono",Menlo,Courier,monospace;
border: 1px solid #d9d9d9;
border-radius: 5px;
background: #f5f5f5;
}
.c0 .c2 {
color: #000000;
}
<div
className="c0"
>
Expand Down
10 changes: 5 additions & 5 deletions ...m/public/components/shared/charts/Histogram/__test__/__snapshots__/Histogram.test.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1407,17 +1407,17 @@ exports[`Histogram when hovering over a non-empty bucket should have correct mar
font-size: 12px;
}
.c3 {
color: #666666;
font-size: 14px;
}
.c4 {
color: #999999;
margin: 8px;
font-size: 12px;
}
.c3 {
color: #666666;
font-size: 14px;
}
<div
className="rv-hint rv-hint--horizontalAlign-right
rv-hint--verticalAlign-bottom"
Expand Down
32 changes: 19 additions & 13 deletions x-pack/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3439,10 +3439,6 @@ [email protected]:
version "4.2.0"
resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d"

hoist-non-react-statics@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb"

hoist-non-react-statics@^2.3.0:
version "2.3.1"
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.3.1.tgz#343db84c6018c650778898240135a1420ee22ce0"
Expand Down Expand Up @@ -6211,6 +6207,10 @@ react-input-autosize@^2.1.2, react-input-autosize@^2.2.1:
dependencies:
prop-types "^15.5.8"

react-is@^16.3.1:
version "16.4.1"
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.4.1.tgz#d624c4650d2c65dbd52c72622bbf389435d9776e"

react-markdown-renderer@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/react-markdown-renderer/-/react-markdown-renderer-1.4.0.tgz#f3b95bd9fc7f7bf8ab3f0150aa696b41740e7d01"
Expand Down Expand Up @@ -7332,22 +7332,28 @@ strip-json-comments@~2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"

styled-components@2.3.2:
version "2.3.2"
resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-2.3.2.tgz#323d86cc9ac89f3fd233a2dfa0849da236f143e3"
styled-components@3.3.3:
version "3.3.3"
resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-3.3.3.tgz#09e702055ab11f7a8eab8229b1c0d0b855095686"
dependencies:
buffer "^5.0.3"
css-to-react-native "^2.0.3"
fbjs "^0.8.9"
hoist-non-react-statics "^1.2.0"
fbjs "^0.8.16"
hoist-non-react-statics "^2.5.0"
is-plain-object "^2.0.1"
prop-types "^15.5.4"
stylis "^3.4.0"
react-is "^16.3.1"
stylis "^3.5.0"
stylis-rule-sheet "^0.0.10"
supports-color "^3.2.3"

stylis@^3.4.0:
version "3.4.7"
resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.4.7.tgz#4fa57ef276d1ed20aafda4e1a97c35b5b87d59ce"
stylis-rule-sheet@^0.0.10:
version "0.0.10"
resolved "https://registry.yarnpkg.com/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz#44e64a2b076643f4b52e5ff71efc04d8c3c4a430"

stylis@^3.5.0:
version "3.5.1"
resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.5.1.tgz#fd341d59f57f9aeb412bc14c9d8a8670b438e03b"

[email protected]:
version "4.4.1"
Expand Down
Loading

0 comments on commit a954f44

Please sign in to comment.