Skip to content

Commit c8d6e54

Browse files
Merge pull request #201 from DiamondLightSource/fix-webcam-css
Fix Webcam css
2 parents c4eacf1 + 4bcfea7 commit c8d6e54

5 files changed

Lines changed: 19 additions & 2 deletions

File tree

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
.Image {
2+
max-width: 100%;
3+
min-width:100%;
4+
min-height: 100%;
5+
width: 100%;
6+
height: 100%;
7+
object-fit: contain;
8+
overflow: hidden;
9+
}

src/ui/widgets/Image/image.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import {
1414
ColorPropOpt
1515
} from "../propTypes";
1616
import { registerWidget } from "../register";
17+
import classes from "./image.module.css";
1718
import { Box } from "@mui/material";
1819

1920
const widgetName = "image";
@@ -86,6 +87,7 @@ export const ImageComponent = (
8687
return (
8788
<Box sx={fullStyle} onClick={onClick}>
8889
<img
90+
className={classes.Image}
8991
src={imageFileName}
9092
alt={props.alt || undefined}
9193
style={{

src/ui/widgets/Symbol/__snapshots__/symbol.test.tsx.snap

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ exports[`<Symbol /> from .bob file > matches snapshot (using fallback symbol) 1`
66
class="MuiBox-root css-lj78bd"
77
>
88
<img
9+
class="_Image_171889"
910
src="img 1.gif"
1011
style="display: block; transform: rotate(0deg) scaleX(1) scaleY(1); object-fit: contain; object-position: top left; opacity: 1;"
1112
/>
@@ -19,6 +20,7 @@ exports[`<Symbol /> from .bob file > matches snapshot (with index) 1`] = `
1920
class="MuiBox-root css-lj78bd"
2021
>
2122
<img
23+
class="_Image_171889"
2224
src="img 3.svg"
2325
style="display: block; transform: rotate(0deg) scaleX(1) scaleY(1); object-fit: contain; object-position: top left; opacity: 1;"
2426
/>
@@ -32,6 +34,7 @@ exports[`<Symbol /> from .bob file > matches snapshot (with rotation) 1`] = `
3234
class="MuiBox-root css-lj78bd"
3335
>
3436
<img
37+
class="_Image_171889"
3538
src="img 1.gif"
3639
style="display: block; transform: rotate(45deg) scaleX(1) scaleY(1); object-fit: contain; object-position: top left; opacity: 1;"
3740
/>
@@ -45,6 +48,7 @@ exports[`<Symbol /> from .bob file > matches snapshot (without index) 1`] = `
4548
class="MuiBox-root css-lj78bd"
4649
>
4750
<img
51+
class="_Image_171889"
4852
src="img 1.gif"
4953
style="display: block; transform: rotate(0deg) scaleX(1) scaleY(1); object-fit: contain; object-position: top left; opacity: 1;"
5054
/>
@@ -58,6 +62,7 @@ exports[`<Symbol /> from .opi file > matches snapshot (with rotation) 1`] = `
5862
class="MuiBox-root css-lj78bd"
5963
>
6064
<img
65+
class="_Image_171889"
6166
src="img 1.gif"
6267
style="display: block; transform: rotate(45deg) scaleX(1) scaleY(1); object-fit: contain; object-position: top left; opacity: 1;"
6368
/>
@@ -71,6 +76,7 @@ exports[`<Symbol /> from .opi file > matches snapshot 1`] = `
7176
class="MuiBox-root css-lj78bd"
7277
>
7378
<img
79+
class="_Image_171889"
7480
src="img 1.gif"
7581
style="display: block; transform: rotate(0deg) scaleX(1) scaleY(1); object-fit: contain; object-position: top left; opacity: 1;"
7682
/>

src/ui/widgets/Webcam/webcam.module.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
img {
1+
.Webcam {
22
max-width: 100%;
33
min-width:100%;
44
min-height: 100%;

src/ui/widgets/Webcam/webcam.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export const WebcamComponent = (
3636
>
3737
<img
3838
id={props.name}
39-
className={classes.img}
39+
className={classes.Webcam}
4040
src={props.url}
4141
alt={`Loading Webcam MJPEG stream...`}
4242
onError={onError}

0 commit comments

Comments
 (0)