Setup-grid-system#76

nickllerandi · May 1, 2019 · 7d33953 · 7d33953
1 parent 11d6394
commit 7d33953
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 17 deletions.
diff --git a/client/src/App.js b/client/src/App.js
@@ -55,10 +55,10 @@ class App extends Component {
                                 <Route exact path="/users/:id/:name/edit" component={ProfileEdit}/>
                             </div>
                             <div className='sidebar'>
-                                <div className='ad'>
+                                <div className='ad ad--1'>
                                     I'm an ad
                                 </div>
-                                <div className='ad'>
+                                <div className='ad ad--2'>
                                     I'm also an ad
                                 </div>
                             </div>

diff --git a/client/src/Global.js b/client/src/Global.js
@@ -4,23 +4,28 @@ import {elevation} from './utils'
 
 const GlobalStyle = createGlobalStyle`
     ${normalize()}
-    html {
-        box-sizing: border-box;
+
+    * {
+        margin: 0;
+        padding: 0;
     }
 
     *, *:before, *:after {
         box-sizing: inherit;
     }
 
+    html {
+        box-sizing: border-box;
+    }
+
     body {
-        margin: 0;
         padding: 90px 0 0;
         font-family: Arial, Helvetica, sans-serif;
         -webkit-font-smoothing: antialiased;
         -moz-osx-font-smoothing: grayscale;
     }
 
-    main {
+    .App {
         max-width: 1264px;
         width: 90%;
         height: 100%;
@@ -33,18 +38,18 @@ const GlobalStyle = createGlobalStyle`
 
         .sidebar {
             width: 25%;
-            height: 50rem;
             float: right;
-
-            .ad {
-                padding: 1rem;
-                margin: 1rem;
-                height: 11rem;
-                border: 1px solid #d6d9dc; 
-                ${elevation[1]};
-            }
         }
     }
+
+    .ad {
+        padding: 1rem;
+        margin: 1rem;
+        height: 11rem;
+        width: 15rem;
+        border: 1px solid #d6d9dc; 
+        ${elevation[1]};
+    }
 `;
 
 export default GlobalStyle
diff --git a/client/src/components/homepage/Homepage.js b/client/src/components/homepage/Homepage.js
@@ -21,7 +21,7 @@ class Homepage extends Component {
 
         return (
             <div className="RecentQuestions">
-                <Heading>Recent Questions TEST</Heading>
+                <Heading>Recent Questions</Heading>
                 <Link to="/ask">
                     <Button>Ask a Question</Button>
                 </Link>

diff --git a/client/src/utils/Colors.js b/client/src/utils/Colors.js
@@ -1,4 +1,4 @@
-export const green = '#92EEC4'
+export const green = '#5EC5B6'
 export const blue = '#85DAEF'
 export const lightblue = '#8EEEEF'
 export const black = '#242729'