Merge pull request #3 from Rushilwiz/development

Nice!
2025-04-18 02:50:18 -04:00 · 2020-04-08 19:29:07 -04:00 · 2020-04-08 19:29:07 -04:00 · 205d66721b
commit 205d66721b
parent 4f76de51f2 e5fe711e12
7 changed files with 119 additions and 127 deletions
--- a/.gitignore
+++ b/.gitignore
@ -46,3 +46,7 @@ fixtures/*.sql
 # NPM-related ignores
 node_modules/
 package-lock.json
+
+# Sass related ignores
+*.map
+.sass-cache/
--- a/css/fonts/Coves
+++ b/css/fonts/Coves
--- a/css/res/black_on_white.svg
+++ b/css/res/black_on_white.svg
@ -17,8 +17,14 @@
   id="svg3729"
   sodipodi:docname="black_on_white.svg"
   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
-  <defs
-     id="defs3723" />
+  <defs id="defs3723">
+    <style type="text/css">
+      @font-face {
+        font-family: Coves;
+        src: url('/css/res/fonts/Coves Light.otf');
+      }
+    </style>
+  </defs>
  <sodipodi:namedview
     id="base"
     pagecolor="#ffffff"
--- a/css/styles.css
+++ b/css/styles.css
@ -1,15 +1,13 @@
+@import url("https://fonts.googleapis.com/css2?family=Cardo&family=Montserrat:wght@500;600&display=swap");
@font-face {
  font-family: "Gotham-Bold";
-  src: url("fonts/Gotham-Bold.otf");
-}
+  src: url("fonts/Gotham-Bold.otf"); }
@font-face {
  font-family: "Sans-Thin";
-  src: url("fonts/Sans-Thin.otf");
-}
+  src: url("fonts/Sans-Thin.otf"); }
@font-face {
  font-family: "Futura";
-  src: url("fonts/futura-pt-light.otf");
-}
+  src: url("fonts/futura-pt-light.otf"); }
 .main_h {
  position: fixed;
  max-height: 70px;
@ -21,74 +19,62 @@
  -webkit-transition: all 0.3s;
  transition: all 0.3s;
  padding-bottom: 6px;
-  font-family: "Montserrat", sans-serif;
-}
-@media only screen and (max-width: 766px) {
-  .main_h {
-    padding-top: 25px;
-  }
-}
+  font-family: "Montserrat", sans-serif; }
+  @media only screen and (max-width: 766px) {
+    .main_h {
+      padding-top: 25px; } }

 .open-nav {
-  max-height: 400px !important;
-}
-.open-nav .mobile-toggle {
-  transform: rotate(-90deg);
-  -webkit-transform: rotate(-90deg);
-}
+  max-height: 400px !important; }
+  .open-nav .mobile-toggle {
+    transform: rotate(-90deg);
+    -webkit-transform: rotate(-90deg); }

 .logo {
  height: 40px;
  float: left;
-  margin-top: -15px;
-}
-@media only screen and (max-width: 766px) {
-  .logo {
-    float: none;
-  }
-}
+  margin-top: -15px; }
+  @media only screen and (max-width: 766px) {
+    .logo {
+      float: none; } }

 nav {
  float: right;
-  width: 60%;
-}
-@media only screen and (max-width: 766px) {
-  nav {
-    width: 100%;
-  }
-}
-nav ul {
-  list-style: none;
-  overflow: hidden;
-  text-align: right;
-  float: right;
-}
-@media only screen and (max-width: 766px) {
+  width: 60%; }
+  @media only screen and (max-width: 766px) {
+    nav {
+      width: 100%; } }
  nav ul {
-    padding-top: 10px;
-    margin-bottom: 22px;
-    float: left;
-    text-align: center;
-    width: 100%;
-  }
-}
-nav ul li {
-  display: inline-block;
-  margin-left: 35px;
-  line-height: 1.5;
-}
-@media only screen and (max-width: 766px) {
-  nav ul li {
-    width: 100%;
-    padding: 7px 0;
-    margin: 0;
-  }
-}
-nav ul a {
-  color: #888888;
-  text-transform: uppercase;
-  font-size: 12px;
-}
+    list-style: none;
+    overflow: hidden;
+    text-align: right;
+    float: right; }
+    @media only screen and (max-width: 766px) {
+      nav ul {
+        padding-top: 10px;
+        margin-bottom: 22px;
+        float: left;
+        text-align: center;
+        width: 100%; } }
+    nav ul li {
+      display: inline-block;
+      margin-left: 35px;
+      line-height: 1.5; }
+      @media only screen and (max-width: 766px) {
+        nav ul li {
+          width: 100%;
+          padding: 7px 0;
+          margin: 0; } }
+    nav ul a {
+      color: #ddd;
+      text-transform: uppercase;
+      font-size: 14px;
+      font-weight: 500;
+      transition: .3s; }
+      nav ul a:hover {
+        color: #ffd1dc;
+        font-size: 15px;
+        text-decoration: none; }

 .mobile-toggle {
  display: none;
@ -100,62 +86,51 @@ nav ul a {
  width: 30px;
  -webkit-transition: all 200ms ease-in;
  -moz-transition: all 200ms ease-in;
-  transition: all 200ms ease-in;
-}
-@media only screen and (max-width: 766px) {
-  .mobile-toggle {
-    display: block;
-  }
-}
-.mobile-toggle span {
-  width: 30px;
-  height: 4px;
-  margin-bottom: 6px;
-  border-radius: 1000px;
-  background: #8f8f8f;
-  display: block;
-}
+  transition: all 200ms ease-in; }
+  @media only screen and (max-width: 766px) {
+    .mobile-toggle {
+      display: block; } }
+  .mobile-toggle span {
+    width: 30px;
+    height: 4px;
+    margin-bottom: 6px;
+    border-radius: 1000px;
+    background: #8f8f8f;
+    display: block; }

 .row {
  width: 100%;
  max-width: 940px;
  margin: 0 auto;
  position: relative;
-  padding: 0 2%;
-}
+  padding: 0 2%; }

 * {
-  box-sizing: border-box;
-}
+  box-sizing: border-box; }

 body {
  color: #8f8f8f;
  background: white;
  font-family: "Cardo", serif;
  font-weight: 300;
-  -webkit-font-smoothing: antialiased;
-}
+  -webkit-font-smoothing: antialiased; }

 a {
-  text-decoration: none;
-}
+  text-decoration: none; }

 h1 {
  font-size: 30px;
  line-height: 1.8;
  text-transform: uppercase;
-  font-family: "Montserrat", sans-serif;
-}
+  font-family: "Montserrat", sans-serif; }

 p {
  margin-bottom: 20px;
  font-size: 17px;
-  line-height: 2;
-}
+  line-height: 2; }

 .content {
-  padding: 50px 2% 250px;
-}
+  padding: 50px 2% 250px; }

 .hero {
  position: relative;
@ -168,43 +143,38 @@ p {
  padding-top: 70px;
  min-height: 100vh;
  letter-spacing: 2px;
-  font-family: "Montserrat", sans-serif;
-}
-.hero h2 {
-  font-family: "Gotham-Bold", "Montserrat", sans-serif;
-}
-.hero #bottomRight {
-  bottom: 0;
-  right: 0;
-  text-align: right;
-  position: absolute;
-}
+  font-family: "Montserrat", sans-serif; }
+  .hero h2 {
+    font-family: "Gotham-Bold", "Montserrat", sans-serif; }
+  .hero #bottomRight {
+    bottom: 0;
+    right: 0;
+    text-align: right;
+    position: absolute; }
+
+.scroll-text {
+  height: 76.8px;
+  overflow: hidden; }

@-webkit-keyframes scroll {
  0% {
    opacity: 1;
    -webkit-transform: translateY(0);
-    transform: translateY(0);
-  }
+    transform: translateY(0); }
  100% {
    opacity: 0;
    -webkit-transform: translateY(20px);
-    transform: translateY(20px);
-  }
-}
+    transform: translateY(20px); } }
@keyframes scroll {
  0% {
    opacity: 1;
    -webkit-transform: translateY(0);
    -ms-transform: translateY(0);
-    transform: translateY(0);
-  }
+    transform: translateY(0); }
  100% {
    opacity: 0;
    -webkit-transform: translateY(20px);
    -ms-transform: translateY(20px);
-    transform: translateY(20px);
-  }
-}
+    transform: translateY(20px); } }

 /*# sourceMappingURL=styles.css.map */
--- a/css/styles.css.map
+++ b/css/styles.css.map
@ -1 +1,7 @@
-{"version":3,"sourceRoot":"","sources":["styles.scss"],"names":[],"mappings":"AAAA;EACK;EACA;;AAGL;EACK;EACA;;AAGL;EACK;EACA;;AAgBL;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AArBA;EAUF;IAaI;;;;AAIJ;EACE;;AACA;EACE;EACA;;;AAIJ;EACE;EACA;EACA;;AAtCA;EAmCF;IAKI;;;;AAIJ;EACE;EACA;;AA9CA;EA4CF;IAII;;;AAGF;EACE;EACA;EACA;EACA;;AAvDF;EAmDA;IAMI;IACA;IACA;IACA;IACA;;;AAGF;EACE;EACA;EACA;;AAnEJ;EAgEE;IAKI;IACA;IACA;;;AAGJ;EACE;EACA;EACA;;;AAKN;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AA5FA;EAkFF;IAYI;;;AAGF;EACE;EACA;EACA;EACA;EACA,YAhGI;EAiGJ;;;AAIJ;EACE;EACA;EACA;EACA;EACA;;;AAKF;EACE;;;AAGF;EACE,OApHM;EAqHN;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAGF;EACE;EACA;EACA;EACA;;;AAMJ;EACE;IACE;IACA;IACA;;EAEF;IACE;IACA;IACA;;;AAKJ;EACE;IACE;IACA;IACA;IACA;;EAEF;IACE;IACA;IACA;IACA","file":"styles.css"}
+{
+"version": 3,
+"mappings": "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",
+"sources": ["styles.scss"],
+"names": [],
+"file": "styles.css"
+}
--- a/css/styles.scss
+++ b/css/styles.scss
@ -13,6 +13,7 @@
     src: url("fonts/futura-pt-light.otf");
 }

+@import url('https://fonts.googleapis.com/css2?family=Cardo&family=Montserrat:wght@500;600&display=swap');

 // MQ trigger
@mixin small {
@ -91,9 +92,16 @@ nav {
      }
    }
    a {
-      color: #888888;
+      color: #ddd;
      text-transform: uppercase;
-      font-size: 12px;
+      font-size: 14px;
+      font-weight: 500;
+      transition: .3s;
+      &:hover {
+        color: #ffd1dc;
+        font-size: 15px;
+        text-decoration: none;
+      }
    }
  }
 }
@ -191,7 +199,10 @@ p {
  }
 }

-
+.scroll-text {
+  height: 76.8px;
+  overflow: hidden;
+}

@-webkit-keyframes scroll {
  0% {
--- a/index.html
+++ b/index.html
@ -7,7 +7,6 @@
 <script type="text/javascript" src="js/main.js"></script>
 <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
 <link rel="stylesheet" type="text/css" href="css/styles.css">
-<link href='https://fonts.googleapis.com/css?family=Montserrat|Cardo' rel='stylesheet' type='text/css'>

 <head>
  <title>brancher</title>
@ -39,20 +38,16 @@
      </nav>

    </div>
-    <!-- / row -->
-
  </header>
-
  <div class="hero">
-    <h2>You're an <br>influencer</h2>
-
+    <h2>You're an</h2>
    <h2 id="bottomRight">You're a <br>brand</h2>

  </div>

  <div class="row content">
    <h1 class="sec01">Get Started</h1>
-    <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Nostrum, recusandae, at, labore velit eligendi amet nobis repellat natus sequi sint consectetur excepturi doloribus vero provident consequuntur accusamus quisquam nesciunt cupiditate soluta
+    <p>Lorem rushil dolor sit amet, consectetur adipisicing elit. Nostrum, recusandae, at, labore velit eligendi amet nobis repellat natus sequi sint consectetur excepturi doloribus vero provident consequuntur accusamus quisquam nesciunt cupiditate soluta
      alias illo et deleniti voluptates facilis repudiandae similique dolore quaerat architecto perspiciatis officiis dolor ullam expedita suscipit neque minima rem praesentium inventore ab officia quos dignissimos esse quam placeat iste porro eius! Minus,
      aspernatur nesciunt consectetur. Sit, eius, itaque, porro, beatae impedit officia tenetur reiciendis autem vitae a quae ipsam repudiandae odio dolorum quaerat asperiores possimus corporis optio animi quisquam laboriosam nihil quam voluptatum quidem
      veritatis iste culpa iure modi perspiciatis recusandae ipsa libero officiis aliquam doloremque similique id quasi atque distinctio enim sapiente ratione in quia eum perferendis earum blanditiis. Nobis, architecto, veniam molestias minus iste necessitatibus