Skip to content

Front end #13

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 2 commits into from
Mar 1, 2019
Merged

Front end #13

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
6f21226
styles are done until later functionality
murphybrandon Mar 1, 2019
7ee52c0
styles are done until later functionality
murphybrandon Mar 1, 2019
File filter

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/app/components/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import SplitPane from '../container/SplitPane.jsx';
import Events from '../container/Events.jsx';
import Details from '../container/Details.jsx';

// import from styled components to create global styles
const GlobalStyle = createGlobalStyle`
html {
box-sizing: border-box;
Expand All @@ -28,6 +29,7 @@ const GlobalStyle = createGlobalStyle`
line-height: 2;
height: 100%;
width: 100%;
background-color: #2A2E3A;
}
`;

Expand Down
21 changes: 11 additions & 10 deletions src/app/styles/Events.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,26 @@ export const EventCard = styled.div`
justify-content: space-between;
align-items: center;
height: 50px;
color: black;
color: white;
padding-left: 5%;
padding-right: 5%;
border-bottom: 1px solid black;
border-bottom: 1px solid #484C54;
cursor: pointer;

&:hover {
color: white;
border-bottom: 1px solid blue;
color: #4F5A65;
border-bottom: 1px solid #4F5A65;
}
`;

export const EventTimeDiv = styled.div`
height: 15px;
/* height: 15px; */
width: 25%;
text-align: center;
/* background-color: black; */
color: black;
padding: 1%;
border-radius: 25px;
border: 1px solid black;
background-color: #484C54;
/* margin-bottom: 2%; */
color: #BCBCBB;
/* padding: 1%; */
border-radius: 5px;
/* border: 1px solid black; */
`;
16 changes: 8 additions & 8 deletions src/app/styles/Nav.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@ import styled from "styled-components";

// events nav wrapper
export const EventsNavWrapper = styled.div`
background-color: #000;
background-color: #3C444F;
display: flex;
align-items: center;
justify-content: center;
width: 100%;
height: 17%;
border-bottom: 4px double blue;
height: 33px;
border-bottom: 1px solid #484C54;
color: white;
`;


// details nav wrapper
export const DetailsNavWrapper = styled.div`
background-color: #000;
background-color: #3C444F;
width: 100%;
height: 17%;
border-bottom: 4px double blue;
height: 33px;
border-bottom: 1px solid #484C54;
color: white;
`;

Expand All @@ -40,7 +40,7 @@ export const Buttons = styled.div`

&.active {
color: white;
background-color: blue;
background-color: #4F5A65;
/* border-bottom: 3px solid white; */
}
}
Expand All @@ -63,7 +63,7 @@ export const Button = styled.div`
}

:hover {
background: blue;
background: #4F5A65;
color: white;
/* border-bottom: 3px solid black; */
}
Expand Down
20 changes: 12 additions & 8 deletions src/app/styles/SplitPane.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,30 @@
import styled from 'styled-components';

export const FullBackground = styled.div`
height: 100%;
background-color: blue;
`;

export const PaneWrapper = styled.div`
font-family: "courier new";
font-weight: 400;
font-family: "arial";
font-size: .80em;
color: white;
background-color:#393939;
height: 350px;
color: #E8E8F4;
background-color: #2A2E3A;
height: 100vh;
display: flex;
justify-content: space-around;
`;

export const LeftPane = styled.div`
background-color: #393939;
border-right: 3px solid white;
background-color: #2A2E3A;
border-right: 3px double #484C54;
height: 100%;
width: 43%;
`;

export const RightPane = styled.div`
color: white;
background-color: #393939;
background-color: #2A2E3A;
height: 100%;
width: 57%;
`;
2 changes: 1 addition & 1 deletion src/app/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ module.exports = {
{ test: /\.css$/, use: [ 'style-loader', 'css-loader' ]}
]
}
}
}