Skip to content

Commit

Permalink
fix: bad rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
abtx committed Aug 23, 2023
1 parent aa0feb3 commit bac2d2e
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
8 changes: 6 additions & 2 deletions src/components/GlossaryTermPage/GlossaryTermPage.css
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,14 @@
.glossary-term__aside {
order: -1;
margin: 0;
}
.glossary-term__aside-def{
margin-left: .625rem;
}
.glossary-term__aside-content {
padding-left: 1.5rem;
}
.glossary-term__content,
.glossary-term__aside {
.glossary-term__content{
margin-top: 1.5rem;
}
}
5 changes: 3 additions & 2 deletions src/components/GlossaryTermPage/GlossaryTermPageAside.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@ import React from 'react';
import { GlossaryTermType } from '../GlossarySearch';
import OpenBookIcon from '../icons/OpenBookIcon';

const imgUrlPrefix = '/img/glossary/';
const glossaryPrefix = '/img/glossary/';
const vendorPrefix = '/img/services/';

const GlossaryTermPageAside = ({ term }: { term: GlossaryTermType }) => (
<aside className="glossary-term__aside">
<div className="glossary-term__aside-img-container">
<img
className="glossary-term__aside-img"
src={term.imgUrl ? `${imgUrlPrefix}/${term.imgUrl}` : `${imgUrlPrefix}/generic.png`}
src={term.imgUrl ? `${vendorPrefix}/${term.imgUrl}` : `${glossaryPrefix}/infra.svg`}
alt=""
/>
<div className="glossary-term__aside-def">
Expand Down
Binary file removed static/img/glossary/aws.png
Binary file not shown.
Binary file removed static/img/glossary/generic.png
Binary file not shown.

0 comments on commit bac2d2e

Please sign in to comment.