Fix for Links (#30)

* Make fix to link to be black and no underline * Fix the opacity again thanks to Summer
MinhLu12 · Aug 18, 2020 · a475b46 · a475b46
1 parent b0a3367
commit a475b46
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 59 deletions.
diff --git a/src/App.js b/src/App.js
@@ -9,22 +9,20 @@ import ScrollIntoView from "components/ScrollIntoView/ScrollIntoView";
 export default function App() {
     return (
         <Router>
-            <div>
-                <ScrollIntoView>
-                    <Navigation></Navigation>
+            <ScrollIntoView>
+                <Navigation></Navigation>
 
-                    <Switch>
-                        <Route path="/contact">Contact Page</Route>
-                        <Route path="/meetdrbergin" component={Meetdrbergin} />
+                <Switch>
+                    <Route path="/contact">Contact Page</Route>
+                    <Route path="/meetdrbergin" component={Meetdrbergin} />
 
-                        <Route path="/">
-                            <Home></Home>
-                        </Route>
-                    </Switch>
+                    <Route path="/">
+                        <Home></Home>
+                    </Route>
+                </Switch>
 
-                    <ContactInfo></ContactInfo>
-                </ScrollIntoView>
-            </div>
+                <ContactInfo></ContactInfo>
+            </ScrollIntoView>
         </Router>
     );
 }
diff --git a/src/components/Navigation/TabDropdown/TabDropdown.module.scss b/src/components/Navigation/TabDropdown/TabDropdown.module.scss
@@ -12,4 +12,5 @@
     font-family: Raleway-Bold !important;
     font-size: $primary-font-size;
     color: $primary-text;
-}
+    opacity: 1 !important;
+}
diff --git a/src/global.scss b/src/global.scss
@@ -5,7 +5,7 @@ $darkgray-background-color: #3b4040 !important;
 $white-background-color: white !important;
 
 // Texts
-$primary-text: #3b4040 !important; //#3B4040
+$primary-text: #3b4040 !important;
 $secondary-text: white !important;
 $teriary-text: black !important;
 
@@ -16,8 +16,10 @@ $caption-font-size: 27px !important;
 $paragraph-font-size: 23px !important;
 $primary-font-size: 18px !important;
 
+// Links
 a {
     text-decoration: none !important;
+    color: $teriary-text;
 }
 
 body {

diff --git a/src/pages/meetdrbergin/Meetdrbergin.js b/src/pages/meetdrbergin/Meetdrbergin.js
@@ -6,54 +6,42 @@ import SKCS from "assets/meetdrbergin/SKCS.png";
 import ADA from "assets/meetdrbergin/ADA.png";
 import WSDA from "assets/meetdrbergin/WSDA.png";
 import SeattleProstho from "assets/meetdrbergin/SeattleProsthodontics.png";
-import { withRouter } from "react-router-dom";
 
-class Meetdrbergin extends React.Component {
-    componentDidUpdate(prevProps) {
-        if (this.props.location !== prevProps.location) {
-            window.scrollTo(0, 0);
-        }
-    }
+export default function Meetdrbergin() {
+    return (
+        <div className={cn.Meet_Dr_Bergin}>
+            <div className={cn.Bergin_Image}>
+                <img src={DrBergin}></img>
+            </div>
 
-    render() {
-        return (
-            <div className={cn.Meet_Dr_Bergin}>
-                <div className={cn.Bergin_Image}>
-                    <img src={DrBergin}></img>
+            <div className={cn.Welcome_Text}>
+                <div className={cn.Title_Text}>
+                    <span>Meet</span>
+                    <span>Dr. Bergin</span>
                 </div>
-
-                <div className={cn.Welcome_Text}>
-                    <div className={cn.Title_Text}>
-                        <span>Meet</span>
-                        <span>Dr. Bergin</span>
-                    </div>
-                    <hr className={cn.Break}></hr>
-                    <div className={cn.Paragraph}>
-                        <p>
-                            Lorem ipsum dolor sit amet, consectetur adipiscing
-                            elit. Praesent at congue purus, quis sagittis
-                            mauris. Pellentesque bibendum nisl quis gravida
-                            scelerisque. Nulla viverra, nunc et tempor lacinia,
-                            lectus ligula lacinia magna, aliquet faucibus sapien
-                            nulla nec orci. Maecenas viverra velit ac nulla
-                            ultricies, in consectetur sapien suscipit. Morbi
-                            feugiat sapien nec tortor congue malesuada et ut
-                            eros. Praesent ipsum risus, ornare quis pulvinar
-                            sed, scelerisque quis risus. Nulla iaculis mi
-                            laoreet libero placerat pulvinar.
-                        </p>
-                        <div className={cn.Logos}>
-                            <img src={BoardofProstho}></img>
-                            <img src={SKCS}></img>
-                            <img src={ADA}></img>
-                            <img src={WSDA}></img>
-                            <img src={SeattleProstho}></img>
-                        </div>
+                <hr className={cn.Break}></hr>
+                <div className={cn.Paragraph}>
+                    <p>
+                        Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+                        Praesent at congue purus, quis sagittis mauris.
+                        Pellentesque bibendum nisl quis gravida scelerisque.
+                        Nulla viverra, nunc et tempor lacinia, lectus ligula
+                        lacinia magna, aliquet faucibus sapien nulla nec orci.
+                        Maecenas viverra velit ac nulla ultricies, in
+                        consectetur sapien suscipit. Morbi feugiat sapien nec
+                        tortor congue malesuada et ut eros. Praesent ipsum
+                        risus, ornare quis pulvinar sed, scelerisque quis risus.
+                        Nulla iaculis mi laoreet libero placerat pulvinar.
+                    </p>
+                    <div className={cn.Logos}>
+                        <img src={BoardofProstho}></img>
+                        <img src={SKCS}></img>
+                        <img src={ADA}></img>
+                        <img src={WSDA}></img>
+                        <img src={SeattleProstho}></img>
                     </div>
                 </div>
             </div>
-        );
-    }
+        </div>
+    );
 }
-
-export default withRouter(Meetdrbergin);