Skip to content
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

Jump to bottom

Fix info button styling #4497

Merged
merged 2 commits into from
Apr 27, 2023
Merged

Fix info button styling #4497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9cd5a77
fix info button styling in search boxes
lcampbell2 Apr 26, 2023
1533172
add border to all searchbox components
lcampbell2 Apr 26, 2023
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
9 changes: 2 additions & 7 deletions frontend/src/components/InfoPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,7 @@ import { QuestionOutlineIcon } from '@chakra-ui/icons'
export function InfoPanel({ isOpen, onToggle, children }) {
const btnRef = React.useRef()
return (
<Drawer
isOpen={isOpen}
placement="bottom"
onClose={onToggle}
finalFocusRef={btnRef}
>
<Drawer isOpen={isOpen} placement="bottom" onClose={onToggle} finalFocusRef={btnRef}>
<DrawerOverlay />
<DrawerContent>
<DrawerCloseButton />
Expand Down Expand Up @@ -60,7 +55,7 @@ export function InfoButton({ onToggle, ...props }) {
{...props}
icon={<QuestionOutlineIcon />}
aria-label="Open glossary"
variant="outline"
variant="primaryOutline"
mx="2"
onClick={onToggle}
/>
Expand Down
1 change: 1 addition & 0 deletions frontend/src/components/RelayPaginationControls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ export function RelayPaginationControls({
aria-label="Items per page"
isDisabled={isLoadingMore}
value={selectedDisplayLimit}
borderColor="black"
onChange={(e) => {
setSelectedDisplayLimit(parseInt(e.target.value))
resetToFirstPage() // Make sure to provide this as a prop if !onlyPagination
Expand Down
49 changes: 11 additions & 38 deletions frontend/src/components/SearchBox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,35 +35,12 @@ export function SearchBox({
onToggle,
...props
}) {
const orderIconName =
orderDirection === 'ASC' ? <ArrowUpIcon /> : <ArrowDownIcon />
const orderIconName = orderDirection === 'ASC' ? <ArrowUpIcon /> : <ArrowDownIcon />
return (
<Box
{...props}
bg="gray.100"
p="2"
mb="4"
borderColor="gray.300"
borderWidth="1px"
>
<Flex
direction={{ base: 'column', md: 'row' }}
alignItems={{ base: 'stretch', md: 'center' }}
>
<Flex
direction="row"
minW={{ base: '100%', md: '50%' }}
alignItems="center"
flexGrow={1}
>
<Text
as="label"
htmlFor="Search-for-field"
fontSize="md"
fontWeight="bold"
textAlign="center"
mr={2}
>
<Box {...props} bg="gray.100" p="2" mb="4" borderColor="gray.300" borderWidth="1px">
<Flex direction={{ base: 'column', md: 'row' }} alignItems={{ base: 'stretch', md: 'center' }}>
<Flex direction="row" minW={{ base: '100%', md: '50%' }} alignItems="center" flexGrow={1}>
<Text as="label" htmlFor="Search-for-field" fontSize="md" fontWeight="bold" textAlign="center" mr={2}>
<Trans>Search: </Trans>
</Text>
<InputGroup flexGrow={1}>
Expand All @@ -83,21 +60,16 @@ export function SearchBox({
/>
</InputGroup>
</Flex>
<InfoButton onToggle={onToggle} />
<InfoButton bg="gray.50" onToggle={onToggle} />
<Stack isInline align="center" ml={{ md: '5%' }}>
<Text
as="label"
htmlFor="Sort-by-field"
fontSize="md"
fontWeight="bold"
textAlign="center"
>
<Text as="label" htmlFor="Sort-by-field" fontSize="md" fontWeight="bold" textAlign="center">
<Trans>Sort by: </Trans>
</Text>
<Select
id="Sort-by-field"
aria-label="Sort by field"
w="fit-content"
borderColor="black"
size="md"
onChange={(e) => {
setOrderField(e.target.value)
Expand All @@ -117,9 +89,10 @@ export function SearchBox({
icon={orderIconName}
color="primary"
bg="white"
borderColor="black"
borderWidth="1px"
onClick={() => {
const newOrderDirection =
orderDirection === 'ASC' ? 'DESC' : 'ASC'
const newOrderDirection = orderDirection === 'ASC' ? 'DESC' : 'ASC'
setOrderDirection(newOrderDirection)
resetToFirstPage()
}}
Expand Down
4 changes: 4 additions & 0 deletions frontend/src/theme/components/Button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ const Button = {
bg: 'transparent',
borderColor: 'primary',
borderWidth: '1px',
_hover: {
color: 'primary',
bg: 'gray.200',
},
},
primaryWhite: {
...commonProps,
Expand Down