Skip to content

71 custom styling #83

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

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

71 custom styling #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f549431
Removed leftover styling from #63
Sep 18, 2025
d183335
Merge branch '71-Custom_Styling' of github.com:DiamondLightSource/mx-…
Oct 27, 2025
f5c84c7
Progress
Oct 27, 2025
719ebb3
Removed redundant styling on typography
Oct 28, 2025
2a00fd4
Added more props for button
Oct 28, 2025
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
27 changes: 20 additions & 7 deletions src/blueapi/BlueapiComponents.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { parseInstrumentSession, readVisitFromPv } from "./visit";
type SeverityLevel = "success" | "info" | "warning" | "error";
type VariantChoice = "outlined" | "contained";
type ButtonSize = "small" | "medium" | "large";
type ButtonColor = "primary" | "secondary" | "custom";

type RunPlanButtonProps = {
btnLabel: string;
Expand All @@ -21,6 +22,11 @@ type RunPlanButtonProps = {
title?: string;
btnVariant?: VariantChoice;
btnSize?: ButtonSize;
btnColor?: ButtonColor;
disabled?: boolean;
sx?: object;
tooltipSx?: object;
typographySx?: object;
};

// @{todo} Ideally we should be able to set up the stylings for
Expand All @@ -47,6 +53,10 @@ export function RunPlanButton(props: RunPlanButtonProps) {
const params = props.planParams ? props.planParams : {};
const variant = props.btnVariant ? props.btnVariant : "outlined";
const size = props.btnSize ? props.btnSize : "medium";
const color = props.btnColor ? props.btnColor : "primary";
const disabled = props.disabled ? props.disabled : false;
const sx = props.sx ? props.sx : {}; // Style for the button component which is the most likely to be customised
const tooltipSx = props.tooltipSx ? props.tooltipSx : {};

const handleClick = () => {
setOpenSnackbar(true);
Expand Down Expand Up @@ -85,18 +95,21 @@ export function RunPlanButton(props: RunPlanButtonProps) {

return (
<div>
<Tooltip title={props.title ? props.title : ""} placement="bottom">
<Tooltip
title={props.title ? props.title : ""}
placement="bottom"
sx={tooltipSx}
arrow
>
<Button
variant={variant}
color="custom"
color={color}
size={size}
disabled={disabled}
onClick={handleClick}
sx={sx}
>
<Typography
variant="button"
fontWeight="fontWeightBold"
sx={{ display: "block" }}
>
<Typography variant="button" fontWeight="fontWeightBold">
{props.btnLabel}
</Typography>
</Button>
Expand Down
23 changes: 16 additions & 7 deletions src/screens/OavMover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,13 +261,13 @@ export function CoordinateSystem() {
setOpen(false);
};

// const buttonStyle = {
// color: "white",
// padding: "12px",
// backgroundColor: "#1c2025",
// width: "100%",
// height: "85%",
// };
const buttonStyle = {
color: "white",
padding: "12px",
backgroundColor: "#1c2025",
width: "90%",
height: "85%",
};

return (
<>
Expand All @@ -287,6 +287,8 @@ export function CoordinateSystem() {
title="Go to Fiducial 0"
btnVariant="contained"
btnSize="large"
sx={buttonStyle}
tooltipSx={{ color: "green" }}
/>
</Grid2>
<Grid2 size={4}>
Expand All @@ -297,6 +299,7 @@ export function CoordinateSystem() {
title="Go to Fiducial 1"
btnVariant="contained"
btnSize="large"
sx={buttonStyle}
/>
</Grid2>
<Grid2 size={4}>
Expand All @@ -307,6 +310,7 @@ export function CoordinateSystem() {
title="Go to Fiducial 2"
btnVariant="contained"
btnSize="large"
sx={buttonStyle}
/>
</Grid2>
<Grid2 size={4}>
Expand All @@ -315,6 +319,7 @@ export function CoordinateSystem() {
planName="gui_set_fiducial_0"
title="Set Fiducial 0"
btnVariant="contained"
sx={buttonStyle}
/>
</Grid2>
<Grid2 size={4}>
Expand All @@ -324,6 +329,7 @@ export function CoordinateSystem() {
planParams={{ point: "1" }}
title="Set Fiducial 1"
btnVariant="contained"
sx={buttonStyle}
/>
</Grid2>
<Grid2 size={4}>
Expand All @@ -333,6 +339,7 @@ export function CoordinateSystem() {
planParams={{ point: "2" }}
title="Set Fiducial 2"
btnVariant="contained"
sx={buttonStyle}
/>
</Grid2>
<Grid2 size={6}>
Expand All @@ -341,6 +348,7 @@ export function CoordinateSystem() {
planName="cs_maker"
title="Create the coordinate system on the pmac."
btnVariant="contained"
sx={buttonStyle}
/>
</Grid2>
<Grid2 size={6}>
Expand All @@ -349,6 +357,7 @@ export function CoordinateSystem() {
planName="block_check"
title="Check the coordinate system was set up correctly."
btnVariant="contained"
sx={buttonStyle}
/>
</Grid2>
</Grid2>
Expand Down