Skip to content

Commit

Permalink
AllQuestions-styling
Browse files Browse the repository at this point in the history
  • Loading branch information
nickllerandi committed Apr 30, 2019
1 parent 766e93f commit 31e728a
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 2 deletions.
7 changes: 6 additions & 1 deletion client/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,12 @@ class App extends Component {
<Route exact path="/users/:id/:name/edit" component={ProfileEdit}/>
</div>
<div className='sidebar'>
Here is the sidebar
<div className='ad'>
I'm an ad
</div>
<div className='ad'>
I'm also an ad
</div>
</div>
</main>
<Footer/>
Expand Down
10 changes: 9 additions & 1 deletion client/src/Global.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import {createGlobalStyle} from 'styled-components'
import {normalize} from 'polished'
import {elevation} from './utils'

const GlobalStyle = createGlobalStyle`
${normalize()}
Expand Down Expand Up @@ -33,8 +34,15 @@ const GlobalStyle = createGlobalStyle`
.sidebar {
width: 25%;
height: 50rem;
background: lightgrey;
float: right;
.ad {
padding: 1rem;
margin: 1rem;
height: 11rem;
border: 1px solid #d6d9dc;
${elevation[1]};
}
}
}
`;
Expand Down
4 changes: 4 additions & 0 deletions client/src/elements/Buttons.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ export const Button = styled.button`

const SignUpButton = styled(Button)`
background: ${green};
&:hover {
background: ${darken(0.2, green)};
}
`;

Button.SignUp = SignUpButton;

0 comments on commit 31e728a

Please sign in to comment.