From 77260b17c4dee06e6adcdd29b7f745f0d1ab3092 Mon Sep 17 00:00:00 2001 From: Francisco Pena Date: Wed, 11 Jul 2018 23:24:09 -0500 Subject: [PATCH] change some layout things and update a dependency --- .gitignore | 2 +- package.json | 2 +- src/components/Tabs/Tabs.scss | 8 +++----- src/routes/Home/HomeView.js | 2 +- src/styles/_variables.scss | 4 ++-- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index b8a6cd4..36c7ada 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,6 @@ *.log node_modules - +yarn.lock dist coverage diff --git a/package.json b/package.json index d315256..0dd3d12 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,7 @@ "koa-convert": "^1.2.0", "koa-proxy": "^0.6.0", "koa-static": "^2.0.0", - "node-sass": "^3.7.0", + "node-sass": "^4.9.2", "normalize.css": "^4.1.1", "postcss-loader": "^0.9.0", "react": "^15.0.0", diff --git a/src/components/Tabs/Tabs.scss b/src/components/Tabs/Tabs.scss index 52b5c1d..afbb4fc 100644 --- a/src/components/Tabs/Tabs.scss +++ b/src/components/Tabs/Tabs.scss @@ -4,7 +4,6 @@ .wrap { background: $white; - border-radius: $border-radius; box-shadow: 10px 10px 30px $black; position: relative; max-width: $max-content-width; @@ -13,8 +12,8 @@ } .content { - border-radius: $border-radius; padding: $padding-wrapper; + height: auto; } .home { @@ -113,9 +112,8 @@ .ul { list-style-type: none; - position: relative; - left: -22px; padding: 0; + margin: 0; } .link { @@ -125,7 +123,7 @@ font-size: 1.8rem; width: 3.5rem; height: 3.5rem; - padding: .3rem; + padding: 8px; text-align: center; display: inline-block; color: inherit; diff --git a/src/routes/Home/HomeView.js b/src/routes/Home/HomeView.js index 53638db..ab0f6a1 100644 --- a/src/routes/Home/HomeView.js +++ b/src/routes/Home/HomeView.js @@ -29,7 +29,7 @@ const HomeView = () => (

Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo.

-

Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis

+

Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis Aenean massa. Cum sociis natoque penatibus et magnis dis

diff --git a/src/styles/_variables.scss b/src/styles/_variables.scss index 2955de9..6558b5f 100644 --- a/src/styles/_variables.scss +++ b/src/styles/_variables.scss @@ -21,11 +21,11 @@ $font-family-base: 'Open Sans', 'HelveticaNeue-Light', sans-serif; * ======================================================================== */ $max-content-width: 1000px; -$padding-wrapper: 1rem 0 4rem 7.5rem; +$padding-wrapper: 4rem 0 7rem 7.5rem; $padding-wrapper-tablet: 2rem; $border-radius: 0.5rem; $padding-wrapper-xs: 0.5rem 2rem; -$max-content-width: 1000px; \ No newline at end of file +$max-content-width: 1000px;