Skip to content

Commit 142cb08

Browse files
committed
improve the display of the buttons, including making the Imaging order button fit
1 parent 3d5c58a commit 142cb08

File tree

4 files changed

+9
-10
lines changed

4 files changed

+9
-10
lines changed

client/fontNormaliser.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ const pixelSizedFont = applyFontOverride(defaultToPx);
5454
export const agateSans = agateSansFont(
5555
pixelSizedFont(sourceFoundations.textSans)
5656
);
57-
export const textSans = pixelSizedFont(sourceFoundations.textSans);
5857

5958
const isAgateLoaded = () => {
6059
let foundAgate = false;

client/src/addToPinboardButton.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ import ReactDOM from "react-dom";
22
import React, { ReactPortal, useContext } from "react";
33
import { css } from "@emotion/react";
44
import { buildPayloadAndType, PayloadAndType } from "./types/PayloadAndType";
5-
import { textSans } from "../fontNormaliser";
5+
import { agateSans } from "../fontNormaliser";
66
import root from "react-shadow/emotion";
77
import * as Sentry from "@sentry/react";
88
import { TelemetryContext, PINBOARD_TELEMETRY_TYPE } from "./types/Telemetry";
99
import { ButtonInOtherTools } from "./buttonInOtherTools";
1010
import {
1111
IMAGINE_REQUEST_TYPES,
1212
IMAGING_REQUEST_ITEM_TYPE,
13-
} from "../../shared/octopusImaging";
13+
} from "shared/octopusImaging";
1414

1515
export const ASSET_HANDLE_HTML_TAG = "asset-handle";
1616

@@ -44,7 +44,7 @@ const AddToPinboardButton = (props: AddToPinboardButtonProps) => {
4444
return (
4545
<root.div
4646
css={css`
47-
${textSans.small()}
47+
${agateSans.small()}
4848
`}
4949
>
5050
<ButtonInOtherTools

client/src/grid/gridDynamicSearchDisplay.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ export const GridDynamicSearchDisplay = ({
9999
{!getGridSearchSummaryQuery.loading && maybeQueryBreakdown && (
100100
<div
101101
css={css`
102-
font-family: ${agateSans.xsmall({ fontWeight: "bold" })};
102+
${agateSans.xsmall({ fontWeight: "bold" })};
103103
display: flex;
104104
flex-wrap: wrap;
105105
gap: ${space["1"]}px;
@@ -116,7 +116,7 @@ export const GridDynamicSearchDisplay = ({
116116

117117
<span
118118
css={css`
119-
font-family: ${agateSans.xxsmall({ fontWeight: "bold" })};
119+
${agateSans.xxsmall({ fontWeight: "bold" })};
120120
line-height: 36px;
121121
margin-bottom: 6px;
122122
`}
@@ -126,7 +126,7 @@ export const GridDynamicSearchDisplay = ({
126126

127127
<span
128128
css={css`
129-
font-family: ${agateSans.xxsmall({ fontWeight: "bold" })};
129+
${agateSans.xxsmall({ fontWeight: "bold" })};
130130
`}
131131
>
132132
{!getGridSearchSummaryQuery.loading &&
@@ -140,7 +140,7 @@ export const GridDynamicSearchDisplay = ({
140140
<div>
141141
<span
142142
css={css`
143-
font-family: ${agateSans.xxsmall()};
143+
${agateSans.xxsmall()};
144144
`}
145145
>
146146
Last checked{" "}

client/src/itemInputBox.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const LoadingSuggestions = () => (
3232
gap: ${space["2"]}px;
3333
background: ${palette.neutral["100"]};
3434
padding: ${space["2"]}px;
35-
font-family: ${agateSans.small({ lineHeight: "tight" })};
35+
${agateSans.small({ lineHeight: "tight" })};
3636
`}
3737
>
3838
<SvgSpinner size="xsmall" />
@@ -50,7 +50,7 @@ const Suggestion = ({
5050
cursor: default;
5151
padding: ${space[1]}px;
5252
background: ${palette.neutral["93"]};
53-
font-family: ${agateSans.xxsmall({ fontWeight: "bold" })};
53+
${agateSans.xxsmall({ fontWeight: "bold" })};
5454
color: ${palette.neutral["46"]};
5555
user-select: none;
5656
`}

0 commit comments

Comments
 (0)