From 2a41cca527fab99444be950161d2c82c52e40a25 Mon Sep 17 00:00:00 2001 From: dereksmart Date: Mon, 11 Jul 2016 13:51:43 -0400 Subject: [PATCH 1/2] Fix scss @extend errors on compile @extend cannot be used within a media breakpoint without causing errors. --- client/components/notice/style.scss | 2 +- client/scss/calypso-form.scss | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/client/components/notice/style.scss b/client/components/notice/style.scss index aa0af6e..2424ead 100644 --- a/client/components/notice/style.scss +++ b/client/components/notice/style.scss @@ -14,6 +14,7 @@ font-size: 14px; line-height: 1.4285; animation: appear .3s ease-in-out; + @extend %dashicon; .dops-notice__text { flex-grow: 1; @@ -31,7 +32,6 @@ font-size: inherit; &::before { - @extend %dashicon; content: '\f534'; position: absolute; top: 23px; diff --git a/client/scss/calypso-form.scss b/client/scss/calypso-form.scss index 2454e96..1a79d8c 100644 --- a/client/scss/calypso-form.scss +++ b/client/scss/calypso-form.scss @@ -1,5 +1,6 @@ // Below, you can choose from either using global form styles or class-driven // form styles. By default, the global styles are on. +@import 'extends'; %form { ul { From 40d2cf93a49c8a80a68ae9ae829108b1f09f2c44 Mon Sep 17 00:00:00 2001 From: dereksmart Date: Mon, 11 Jul 2016 14:11:49 -0400 Subject: [PATCH 2/2] Notices: Make sure to not override the actual text font --- client/components/notice/style.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/client/components/notice/style.scss b/client/components/notice/style.scss index 2424ead..aaf091e 100644 --- a/client/components/notice/style.scss +++ b/client/components/notice/style.scss @@ -14,7 +14,10 @@ font-size: 14px; line-height: 1.4285; animation: appear .3s ease-in-out; - @extend %dashicon; + + &::before{ + @extend %dashicon; + } .dops-notice__text { flex-grow: 1;