From 1d43422b7729fda5b43143b5a27738eb853b1b7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=9D=E3=83=BC=E3=83=AB=20=E3=82=A6=E3=82=A7=E3=83=83?= =?UTF-8?q?=E3=83=96?= Date: Fri, 12 Oct 2018 13:45:17 -0500 Subject: [PATCH] Updated colors and removed reference to deleted file --- app/sass/init/_colors.scss | 30 +++++++++++++++--------------- app/sass/type/_inter.scss | 12 ++++-------- 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/app/sass/init/_colors.scss b/app/sass/init/_colors.scss index 85587f6..c0f28b8 100644 --- a/app/sass/init/_colors.scss +++ b/app/sass/init/_colors.scss @@ -1,16 +1,16 @@ $white: #fff; -$silver: #e3e3e3; -$black: #222; // #3e3e42; -$gray: #96a1ae; -$teal: #27d27d; -$cyan: #27d2d2; -$blue: #277cd2; -$indigo: #2727d2; -$violet: #7c27d2; -$fuchsia: #d227d2; -$pink: #d2277d; -$red: #d22727; -$orange: #d27c27; -$yellow: #d2d227; -$lime: #7dd227; -$green: #27d227; +$silver: #f1f3f5; +$black: #212529; +$gray: #ced4da; +$teal: #38d9a9; +$cyan: #3bc9db; +$blue: #339af0; +$indigo: #748ffc; +$violet: #9775fa; +$fuchsia: #da77f2; +$pink: #f783ac; +$red: #e03131; +$orange: #ff922b; +$yellow: #ffe066; +$lime: #a9e34b; +$green: #51cf66; diff --git a/app/sass/type/_inter.scss b/app/sass/type/_inter.scss index 560539b..7f24258 100644 --- a/app/sass/type/_inter.scss +++ b/app/sass/type/_inter.scss @@ -5,8 +5,7 @@ font-family: "Inter UI"; font-style: normal; font-weight: 400; - src: url("../assets/type/inter/variable.woff2") format("woff2-variations"), - url("../assets/type/inter/400.woff2") format("woff2"), + src: url("../assets/type/inter/400.woff2") format("woff2"), url("../assets/type/inter/400.woff") format("woff"); } @@ -14,8 +13,7 @@ font-family: "Inter UI"; font-style: italic; font-weight: 400; - src: url("../assets/type/inter/variable.woff2") format("woff2-variations"), - url("../assets/type/inter/400i.woff2") format("woff2"), + src: url("../assets/type/inter/400i.woff2") format("woff2"), url("../assets/type/inter/400i.woff") format("woff"); } @@ -25,8 +23,7 @@ font-family: "Inter UI"; font-style: normal; font-weight: 700; - src: url("../assets/type/inter/variable.woff2") format("woff2-variations"), - url("../assets/type/inter/700.woff2") format("woff2"), + src: url("../assets/type/inter/700.woff2") format("woff2"), url("../assets/type/inter/700.woff") format("woff"); } @@ -34,7 +31,6 @@ font-family: "Inter UI"; font-style: italic; font-weight: 700; - src: url("../assets/type/inter/variable.woff2") format("woff2-variations"), - url("../assets/type/inter/700i.woff2") format("woff2"), + src: url("../assets/type/inter/700i.woff2") format("woff2"), url("../assets/type/inter/700i.woff") format("woff"); }