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

Issue 86 edit button #88

Merged
merged 10 commits into from
Aug 4, 2020
Merged

Issue 86 edit button #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b69dfe6
Merge pull request #7 from kalm42/development
kalm42 Jun 14, 2020
eee125c
Merge pull request #9 from kalm42/development
kalm42 Jun 15, 2020
7e3ee07
Merge pull request #11 from kalm42/development
kalm42 Jun 16, 2020
413c0b4
Merge pull request #12 from kalm42/development
kalm42 Jun 16, 2020
ea0b03f
Merge pull request #14 from kalm42/development
kalm42 Jun 17, 2020
12da612
v2.0.0 (#26)
kalm42 Jun 24, 2020
e954910
Merge branch 'master' into development
kalm42 Aug 1, 2020
aa17d19
Merge branch 'development' of https://github.com/kalm42/voiceyourstan…
kalm42 Aug 4, 2020
4ec8b25
feat: edit button
kalm42 Aug 4, 2020
3a41a3e
fix: z-index issue
kalm42 Aug 4, 2020
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
2 changes: 2 additions & 0 deletions src/components/Layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ const Nav = styled.nav`
height: 100vh;
background: white;
padding: 20px;
z-index: 100;
`
const Main = styled.main`
min-height: calc(100vh - 222px - 60px);
Expand Down Expand Up @@ -125,6 +126,7 @@ const AuthenticationMenu = styled.div`
background: var(--background);
border: 1px solid var(--accent);
transition: all 200ms ease;
z-index: 100;
`

const Layout: FunctionComponent = ({ children }) => {
Expand Down
1 change: 1 addition & 0 deletions src/components/elements.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export const PrimaryLink = styled(Link)`
text-transform: lowercase;
transition: all 200ms ease;
text-decoration: none;
text-align: center;
&:hover {
background: var(--mainDark);
}
Expand Down
5 changes: 2 additions & 3 deletions src/views/ListTemplateLetters/ListTemplateLetters.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@ import styled from "styled-components"
import { useMetaData } from "../../context/MetaData"
import { useTemplate } from "../../context/TemplateContext"
import ErrorMessage from "../../components/ErrorMessage"
import Layout from "../../components/Layout"
import SEO from "../../components/SEO"
import { format } from "date-fns"
import { PrimaryButton, SecondaryButton } from "../../components/elements"
import { SecondaryButton, PrimaryLink } from "../../components/elements"

const Wrapper = styled.div`
padding: 2rem;
Expand Down Expand Up @@ -108,7 +107,7 @@ const ListTemplateLetters = (props: RouteComponentProps) => {
</TemplateDate>
<TemplatePanel>
<TemplateControls>
<PrimaryButton>Edit</PrimaryButton>
<PrimaryLink to={`/registered-letters/${t.id}`}>Edit</PrimaryLink>
<SecondaryButton>Delete</SecondaryButton>
</TemplateControls>
<TemplateDetails>
Expand Down