Skip to content

Image SCSS to MergeStyles Part 2: Style Conversion #4151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oengusmacinog-zz merged 6 commits into from
Mar 2, 2018
Merged

Image SCSS to MergeStyles Part 2: Style Conversion #4151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
08c2ece
convert scss to mergestyles
oengusmacinog-zz Mar 1, 2018
36248ab
update snapshots
oengusmacinog-zz Mar 1, 2018
f3cf986
rush change
oengusmacinog-zz Mar 1, 2018
c6dca71
missing semicolon
oengusmacinog-zz Mar 1, 2018
41c1873
update experiments snapshots
oengusmacinog-zz Mar 1, 2018
2f8d391
cleanup
oengusmacinog-zz Mar 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions common/changes/@uifabric/experiments/image-scss2ms-pt2_2018-03-01-20-29.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "@uifabric/experiments",
"comment": "Converting Image SCSS to MergeStyles step 2 - style conversion (snapshots updated)",
"type": "minor"
}
],
"packageName": "@uifabric/experiments",
"email": "v-brgarl@microsoft.com"
}
11 changes: 11 additions & 0 deletions common/changes/office-ui-fabric-react/image-scss2ms-pt2_2018-03-01-20-29.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment": "Converting Image SCSS to MergeStyles step 2 - style conversion",
"type": "minor"
}
],
"packageName": "office-ui-fabric-react",
"email": "v-brgarl@microsoft.com"
}
216 changes: 198 additions & 18 deletions ...fice-ui-fabric-react/src/components/ActivityItem/__snapshots__/ActivityItem.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,12 @@ exports[`ActivityItem renders compact with a single persona correctly 1`] = `
</span>
</div>
<div
className="ms-Image ms-Persona-image"
className=
ms-Image
ms-Persona-image
{
overflow: hidden;
}
style={
Object {
"height": undefined,
Expand All @@ -92,7 +97,22 @@ exports[`ActivityItem renders compact with a single persona correctly 1`] = `
>
<img
alt=""
className="ms-Image-image ms-Image-image--portrait undefined ms-Image-image--cover undefined is-notLoaded is-fadeIn"
className=
ms-Image-image
ms-Image-image--cover
ms-Image-image--portrait
is-notLoaded
is-fadeIn
{
display: block;
height: auto;
left: 50%;
opacity: 0;
position: relative;
top: 50%;
transform: translate(-50%,-50%);
width: 100%;
}
onError={[Function]}
onLoad={[Function]}
role={undefined}
Expand Down Expand Up @@ -293,7 +313,12 @@ exports[`ActivityItem renders compact with multiple personas correctly 1`] = `
</span>
</div>
<div
className="ms-Image ms-Persona-image"
className=
ms-Image
ms-Persona-image
{
overflow: hidden;
}
style={
Object {
"height": undefined,
Expand All @@ -303,7 +328,22 @@ exports[`ActivityItem renders compact with multiple personas correctly 1`] = `
>
<img
alt=""
className="ms-Image-image ms-Image-image--portrait undefined ms-Image-image--cover undefined is-notLoaded is-fadeIn"
className=
ms-Image-image
ms-Image-image--cover
ms-Image-image--portrait
is-notLoaded
is-fadeIn
{
display: block;
height: auto;
left: 50%;
opacity: 0;
position: relative;
top: 50%;
transform: translate(-50%,-50%);
width: 100%;
}
onError={[Function]}
onLoad={[Function]}
role={undefined}
Expand All @@ -329,7 +369,12 @@ exports[`ActivityItem renders compact with multiple personas correctly 1`] = `
style={undefined}
>
<div
className="ms-Image ms-Persona-image"
className=
ms-Image
ms-Persona-image
{
overflow: hidden;
}
style={
Object {
"height": undefined,
Expand All @@ -339,7 +384,22 @@ exports[`ActivityItem renders compact with multiple personas correctly 1`] = `
>
<img
alt=""
className="ms-Image-image ms-Image-image--portrait undefined ms-Image-image--cover undefined is-notLoaded is-fadeIn"
className=
ms-Image-image
ms-Image-image--cover
ms-Image-image--portrait
is-notLoaded
is-fadeIn
{
display: block;
height: auto;
left: 50%;
opacity: 0;
position: relative;
top: 50%;
transform: translate(-50%,-50%);
width: 100%;
}
onError={[Function]}
onLoad={[Function]}
role={undefined}
Expand Down Expand Up @@ -378,7 +438,12 @@ exports[`ActivityItem renders compact with multiple personas correctly 1`] = `
</span>
</div>
<div
className="ms-Image ms-Persona-image"
className=
ms-Image
ms-Persona-image
{
overflow: hidden;
}
style={
Object {
"height": undefined,
Expand All @@ -388,7 +453,22 @@ exports[`ActivityItem renders compact with multiple personas correctly 1`] = `
>
<img
alt=""
className="ms-Image-image ms-Image-image--portrait undefined ms-Image-image--cover undefined is-notLoaded is-fadeIn"
className=
ms-Image-image
ms-Image-image--cover
ms-Image-image--portrait
is-notLoaded
is-fadeIn
{
display: block;
height: auto;
left: 50%;
opacity: 0;
position: relative;
top: 50%;
transform: translate(-50%,-50%);
width: 100%;
}
onError={[Function]}
onLoad={[Function]}
role={undefined}
Expand Down Expand Up @@ -491,7 +571,12 @@ exports[`ActivityItem renders with a single persona correctly 1`] = `
</span>
</div>
<div
className="ms-Image ms-Persona-image"
className=
ms-Image
ms-Persona-image
{
overflow: hidden;
}
style={
Object {
"height": 32,
Expand All @@ -501,7 +586,22 @@ exports[`ActivityItem renders with a single persona correctly 1`] = `
>
<img
alt=""
className="ms-Image-image ms-Image-image--portrait undefined ms-Image-image--cover undefined is-notLoaded is-fadeIn"
className=
ms-Image-image
ms-Image-image--cover
ms-Image-image--portrait
is-notLoaded
is-fadeIn
{
display: block;
height: auto;
left: 50%;
opacity: 0;
position: relative;
top: 50%;
transform: translate(-50%,-50%);
width: 100%;
}
onError={[Function]}
onLoad={[Function]}
role={undefined}
Expand Down Expand Up @@ -715,7 +815,12 @@ exports[`ActivityItem renders with multiple personas correctly 1`] = `
</span>
</div>
<div
className="ms-Image ms-Persona-image"
className=
ms-Image
ms-Persona-image
{
overflow: hidden;
}
style={
Object {
"height": undefined,
Expand All @@ -725,7 +830,22 @@ exports[`ActivityItem renders with multiple personas correctly 1`] = `
>
<img
alt=""
className="ms-Image-image ms-Image-image--portrait undefined ms-Image-image--cover undefined is-notLoaded is-fadeIn"
className=
ms-Image-image
ms-Image-image--cover
ms-Image-image--portrait
is-notLoaded
is-fadeIn
{
display: block;
height: auto;
left: 50%;
opacity: 0;
position: relative;
top: 50%;
transform: translate(-50%,-50%);
width: 100%;
}
onError={[Function]}
onLoad={[Function]}
role={undefined}
Expand All @@ -744,7 +864,12 @@ exports[`ActivityItem renders with multiple personas correctly 1`] = `
style={undefined}
>
<div
className="ms-Image ms-Persona-image"
className=
ms-Image
ms-Persona-image
{
overflow: hidden;
}
style={
Object {
"height": undefined,
Expand All @@ -754,7 +879,22 @@ exports[`ActivityItem renders with multiple personas correctly 1`] = `
>
<img
alt=""
className="ms-Image-image ms-Image-image--portrait undefined ms-Image-image--cover undefined is-notLoaded is-fadeIn"
className=
ms-Image-image
ms-Image-image--cover
ms-Image-image--portrait
is-notLoaded
is-fadeIn
{
display: block;
height: auto;
left: 50%;
opacity: 0;
position: relative;
top: 50%;
transform: translate(-50%,-50%);
width: 100%;
}
onError={[Function]}
onLoad={[Function]}
role={undefined}
Expand Down Expand Up @@ -786,7 +926,12 @@ exports[`ActivityItem renders with multiple personas correctly 1`] = `
</span>
</div>
<div
className="ms-Image ms-Persona-image"
className=
ms-Image
ms-Persona-image
{
overflow: hidden;
}
style={
Object {
"height": undefined,
Expand All @@ -796,7 +941,22 @@ exports[`ActivityItem renders with multiple personas correctly 1`] = `
>
<img
alt=""
className="ms-Image-image ms-Image-image--portrait undefined ms-Image-image--cover undefined is-notLoaded is-fadeIn"
className=
ms-Image-image
ms-Image-image--cover
ms-Image-image--portrait
is-notLoaded
is-fadeIn
{
display: block;
height: auto;
left: 50%;
opacity: 0;
position: relative;
top: 50%;
transform: translate(-50%,-50%);
width: 100%;
}
onError={[Function]}
onLoad={[Function]}
role={undefined}
Expand All @@ -815,7 +975,12 @@ exports[`ActivityItem renders with multiple personas correctly 1`] = `
style={undefined}
>
<div
className="ms-Image ms-Persona-image"
className=
ms-Image
ms-Persona-image
{
overflow: hidden;
}
style={
Object {
"height": undefined,
Expand All @@ -825,7 +990,22 @@ exports[`ActivityItem renders with multiple personas correctly 1`] = `
>
<img
alt=""
className="ms-Image-image ms-Image-image--portrait undefined ms-Image-image--cover undefined is-notLoaded is-fadeIn"
className=
ms-Image-image
ms-Image-image--cover
ms-Image-image--portrait
is-notLoaded
is-fadeIn
{
display: block;
height: auto;
left: 50%;
opacity: 0;
position: relative;
top: 50%;
transform: translate(-50%,-50%);
width: 100%;
}
onError={[Function]}
onLoad={[Function]}
role={undefined}
Expand Down
Loading