From 9635af21f287f343ff842add638bd4816c90e7cd Mon Sep 17 00:00:00 2001 From: rushilwiz Date: Wed, 15 Apr 2020 12:13:21 -0400 Subject: [PATCH] Working --- css/styles.css | 10 +++++++--- css/styles.css.map | 2 +- css/styles.scss | 11 ++++++++--- index.html | 7 +++---- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/css/styles.css b/css/styles.css index eda02f6..c012183 100644 --- a/css/styles.css +++ b/css/styles.css @@ -32,15 +32,18 @@ .logo { height: 40px; + display: inline; float: left; - margin-top: -15px; } + margin-top: -5px; } @media only screen and (max-width: 766px) { .logo { float: none; } } nav { float: right; - width: 60%; } + width: 80%; + display: inline; + padding-right: 30px; } @media only screen and (max-width: 766px) { nav { width: 100%; } } @@ -80,7 +83,7 @@ nav { display: none; cursor: pointer; font-size: 20px; - position: absolute; + float: right; right: 22px; top: 0; width: 30px; @@ -99,6 +102,7 @@ nav { display: block; } .row { + display: inline; width: 100%; max-width: 940px; margin: 0 auto; diff --git a/css/styles.css.map b/css/styles.css.map index aca2511..f517d4a 100644 --- a/css/styles.css.map +++ b/css/styles.css.map @@ -1,6 +1,6 @@ { "version": 3, -"mappings": "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", +"mappings": "AAeQ,yGAAiG;AAfzG,UAGC;EAFI,WAAW,EAAE,aAAa;EAC1B,GAAG,EAAE,4BAA4B;AAGtC,UAGC;EAFI,WAAW,EAAE,WAAW;EACxB,GAAG,EAAE,0BAA0B;AAGpC,UAGC;EAFI,WAAW,EAAE,QAAQ;EACrB,GAAG,EAAE,gCAAgC;AAiB1C,OAAQ;EACN,QAAQ,EAAE,KAAK;EACf,UAAU,EAAE,IAAI;EAChB,OAAO,EAAE,GAAG;EACZ,KAAK,EAAE,IAAI;EACX,WAAW,EAAE,IAAI;EACjB,UAAU,EAAE,IAAI;EAChB,QAAQ,EAAE,MAAM;EAChB,kBAAkB,EAAE,QAAQ;EAC5B,UAAU,EAAE,QAAQ;EACpB,cAAc,EAAE,GAAG;EACnB,WAAW,EAAE,wBAAwB;EArBrC,yCAA0C;IAU5C,OAAQ;MAaJ,WAAW,EAAE,IAAI;;AAIrB,SAAU;EACR,UAAU,EAAE,gBAAgB;EAC5B,wBAAe;IACb,SAAS,EAAE,cAAc;IACzB,iBAAiB,EAAE,cAAc;;AAIrC,KAAM;EACJ,MAAM,EAAE,IAAI;EACZ,OAAO,EAAE,MAAM;EACf,KAAK,EAAE,IAAI;EACX,UAAU,EAAE,IAAI;EAvChB,yCAA0C;IAmC5C,KAAM;MAMF,KAAK,EAAE,IAAI;;AAIf,GAAI;EACF,KAAK,EAAE,KAAK;EACZ,KAAK,EAAE,GAAG;EACV,OAAO,EAAE,MAAM;EACf,aAAa,EAAE,IAAI;EAjDnB,yCAA0C;IA6C5C,GAAI;MAMA,KAAK,EAAE,IAAI;EAGb,MAAG;IACD,UAAU,EAAE,IAAI;IAChB,QAAQ,EAAE,MAAM;IAChB,UAAU,EAAE,KAAK;IACjB,KAAK,EAAE,KAAK;IA1Dd,yCAA0C;MAsD1C,MAAG;QAMC,WAAW,EAAE,IAAI;QACjB,aAAa,EAAE,IAAI;QACnB,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,MAAM;QAClB,KAAK,EAAE,IAAI;IAGb,SAAG;MACD,OAAO,EAAE,YAAY;MACrB,WAAW,EAAE,IAAI;MACjB,WAAW,EAAE,GAAG;MAtEpB,yCAA0C;QAmExC,SAAG;UAKC,KAAK,EAAE,IAAI;UACX,OAAO,EAAE,KAAK;UACd,MAAM,EAAE,CAAC;IAGb,QAAE;MACA,KAAK,EAAE,IAAI;MACX,cAAc,EAAE,SAAS;MACzB,SAAS,EAAE,IAAI;MACf,WAAW,EAAE,GAAG;MAChB,UAAU,EAAE,GAAG;MACf,cAAQ;QACN,KAAK,EAAE,OAAO;QACd,SAAS,EAAE,IAAI;QACf,eAAe,EAAE,IAAI;;AAM7B,cAAe;EACb,OAAO,EAAE,IAAI;EACb,MAAM,EAAE,OAAO;EACf,SAAS,EAAE,IAAI;EAEf,KAAK,EAAE,KAAK;EACZ,KAAK,EAAE,IAAI;EACX,GAAG,EAAE,CAAC;EACN,KAAK,EAAE,IAAI;EACX,kBAAkB,EAAE,iBAAiB;EACrC,eAAe,EAAE,iBAAiB;EAClC,UAAU,EAAE,iBAAiB;EAvG7B,yCAA0C;IA4F5C,cAAe;MAaX,OAAO,EAAE,KAAK;EAGhB,mBAAK;IACH,KAAK,EAAE,IAAI;IACX,MAAM,EAAE,GAAG;IACX,aAAa,EAAE,GAAG;IAClB,aAAa,EAAE,MAAM;IACrB,UAAU,EA3GN,OAAO;IA4GX,OAAO,EAAE,KAAK;;AAIlB,IAAK;EACH,OAAO,EAAE,MAAM;EACf,KAAK,EAAE,IAAI;EACX,SAAS,EAAE,KAAK;EAChB,MAAM,EAAE,MAAM;EACd,QAAQ,EAAE,QAAQ;EAClB,OAAO,EAAE,IAAI;;AAKf,CAAE;EACA,UAAU,EAAE,UAAU;;AAGxB,IAAK;EACH,KAAK,EAhIC,OAAO;EAiIb,UAAU,EAAE,KAAK;EACjB,WAAW,EAAE,cAAc;EAC3B,WAAW,EAAE,GAAG;EAChB,sBAAsB,EAAE,WAAW;;AAGrC,CAAE;EACA,eAAe,EAAE,IAAI;;AAGvB,EAAG;EACD,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,GAAG;EAChB,cAAc,EAAE,SAAS;EACzB,WAAW,EAAE,wBAAwB;;AAGvC,CAAE;EACA,aAAa,EAAE,IAAI;EACnB,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,CAAC;;AAGhB,QAAS;EACP,OAAO,EAAE,aAAa;;AAGxB,KAAM;EACJ,QAAQ,EAAE,QAAQ;EAClB,UAAU,EAAE,0DAA0D;EACtE,uBAAuB,EAAE,KAAK;EAC9B,oBAAoB,EAAE,KAAK;EAC3B,eAAe,EAAE,KAAK;EACtB,qBAAqB,EAAE,KAAK;EAC5B,KAAK,EAAE,IAAI;EACX,WAAW,EAAE,IAAI;EACjB,UAAU,EAAE,KAAK;EACjB,cAAc,EAAE,GAAG;EACnB,WAAW,EAAE,wBAAwB;EAErC,QAAG;IACD,WAAW,EAAE,uCAAuC;EAGtD,kBAAa;IACX,MAAM,EAAE,CAAC;IACT,KAAK,EAAE,CAAC;IACR,UAAU,EAAE,KAAK;IACjB,QAAQ,EAAE,QAAQ;;AAItB,YAAa;EACX,MAAM,EAAE,MAAM;EACd,QAAQ,EAAE,MAAM;;AAGlB,yBAWC;EAVC,EAAG;IACD,OAAO,EAAE,CAAC;IACV,iBAAiB,EAAE,aAAa;IAChC,SAAS,EAAE,aAAa;EAE1B,IAAK;IACH,OAAO,EAAE,CAAC;IACV,iBAAiB,EAAE,gBAAgB;IACnC,SAAS,EAAE,gBAAgB;AAK/B,iBAaC;EAZC,EAAG;IACD,OAAO,EAAE,CAAC;IACV,iBAAiB,EAAE,aAAa;IAChC,aAAa,EAAE,aAAa;IAC5B,SAAS,EAAE,aAAa;EAE1B,IAAK;IACH,OAAO,EAAE,CAAC;IACV,iBAAiB,EAAE,gBAAgB;IACnC,aAAa,EAAE,gBAAgB;IAC/B,SAAS,EAAE,gBAAgB", "sources": ["styles.scss"], "names": [], "file": "styles.css" diff --git a/css/styles.scss b/css/styles.scss index 36b2f5c..74a81e7 100644 --- a/css/styles.scss +++ b/css/styles.scss @@ -54,8 +54,9 @@ $color2: #e8f380; .logo { height: 40px; + display: inline; float: left; - margin-top: -15px; + margin-top: -5px; @include small { float: none; } @@ -63,7 +64,9 @@ $color2: #e8f380; nav { float: right; - width: 60%; + width: 80%; + display: inline; + padding-right: 30px; @include small { width: 100%; } @@ -110,7 +113,8 @@ nav { display: none; cursor: pointer; font-size: 20px; - position: absolute; + //position: absolute; + float: right; right: 22px; top: 0; width: 30px; @@ -132,6 +136,7 @@ nav { } .row { + display: inline; width: 100%; max-width: 940px; margin: 0 auto; diff --git a/index.html b/index.html index e16a498..3943b8f 100644 --- a/index.html +++ b/index.html @@ -18,7 +18,8 @@
- + + @@ -41,9 +42,7 @@
-

You're an

-

You're a
brand

- +



  You're a
brand