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

v2.1.3 #90

Merged
merged 8 commits into from
Aug 4, 2020
Merged

v2.1.3 #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
211567e
Master (#84)
kalm42 Aug 2, 2020
aa17d19
Merge branch 'development' of https://github.com/kalm42/voiceyourstan…
kalm42 Aug 4, 2020
505cdcf
Issue 86 edit button (#88)
kalm42 Aug 4, 2020
dd47f41
Merge branch 'development' of https://github.com/kalm42/voiceyourstan…
kalm42 Aug 4, 2020
83a9541
fix: remove delete button
kalm42 Aug 4, 2020
b603fc7
Merge pull request #89 from kalm42/issue-85-delete
kalm42 Aug 4, 2020
9d1dc30
Merge branch 'development' into v2.1.3
kalm42 Aug 4, 2020
ca56430
increment version
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: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "voiceyourstance.com",
"version": "2.1.2",
"version": "2.1.3",
"author": "Kyle Melton <me@kylemelton.dev>",
"private": true,
"dependencies": {
Expand Down
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
6 changes: 2 additions & 4 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,8 +107,7 @@ const ListTemplateLetters = (props: RouteComponentProps) => {
</TemplateDate>
<TemplatePanel>
<TemplateControls>
<PrimaryButton>Edit</PrimaryButton>
<SecondaryButton>Delete</SecondaryButton>
<PrimaryLink to={`/registered-letters/${t.id}`}>Edit</PrimaryLink>
</TemplateControls>
<TemplateDetails>
<h3>{t.title}</h3>
Expand Down