Skip to content

styling v.003 #11

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

Merged
merged 4 commits into from
Mar 1, 2019
Merged

styling v.003 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
71a1638
front-end v.002 styling
murphybrandon Mar 1, 2019
e6fa38e
front-end v.002 styling
murphybrandon Mar 1, 2019
78a7c8f
front-end v.002 styling
murphybrandon Mar 1, 2019
e564c21
front-end v.003 --- most recent updates to styling are shown
murphybrandon Mar 1, 2019
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 src/app/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
node_modules
dist
dist
53 changes: 39 additions & 14 deletions src/app/components/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { useContext, Component } from 'react';
import { createGlobalStyle } from 'styled-components';

// data
import data from '../data.jsx'
Expand All @@ -10,6 +11,27 @@ import SplitPane from '../container/SplitPane.jsx';
import Events from '../container/Events.jsx';
import Details from '../container/Details.jsx';

const GlobalStyle = createGlobalStyle`
html {
box-sizing: border-box;
font-size: 10px;
height: 100%;
width: 100%;
}
* *:before, *:after {
box-sizing: inherit;
}
body {
padding: 0;
margin: 0;
font-size: 1.5rem;
line-height: 2;
height: 100%;
width: 100%;
}
`;


class App extends Component {
constructor(props) {
super(props);
Expand Down Expand Up @@ -71,20 +93,23 @@ class App extends Component {
action, id, payload, state, data
} = this.state;
return (
<SplitPane
left={
<Events data={data} addAction={this.addActionToView} />
}
right={
(
<Details
action={action}
id={id}
payload={payload}
actionState={state}
/>
)}
/>
<>
<GlobalStyle />
<SplitPane
left={
<Events data={data} addAction={this.addActionToView} />
}
right={
(
<Details
action={action}
id={id}
payload={payload}
actionState={state}
/>
)}
/>
</>
);
}
}
Expand Down
14 changes: 9 additions & 5 deletions src/app/components/EventCards/EventCreator.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
import React from 'react';

import { EventCard, EventTimeDiv } from '../../styles/Events.jsx';

export default function EventCreator(props) {
// renders individual action
const { action, id, addAction } = props;

const { action, id, addAction, actionTime } = props;
console.log(EventCard);
return (
<div id={id} onClick={ addAction }>
{action}
</div>
<EventCard id={id} onClick={addAction}>
&#x2630; {action}
<EventTimeDiv>{actionTime || '00:00:01'}</EventTimeDiv>
</EventCard>

);
}
Loading