From d578d4a8007789334c45bb7b5805df193ba2eafe Mon Sep 17 00:00:00 2001 From: Matthew Taylor Date: Mon, 11 Jan 2016 09:11:13 -0500 Subject: [PATCH 1/2] Allow white space to wrap in welcome text It's in an href, so override the default and include wrapping. Fixes #289. --- src/components/welcome/welcome.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/welcome/welcome.scss b/src/components/welcome/welcome.scss index a0e3437a5..7577b9b9e 100644 --- a/src/components/welcome/welcome.scss +++ b/src/components/welcome/welcome.scss @@ -14,6 +14,10 @@ margin-top: 12px; padding: 0; font-weight: 200; + + a { + white-space: normal; + } } > a { From c88fc6f27d7176d9fa49a1a582350460cace0b3c Mon Sep 17 00:00:00 2001 From: Matthew Taylor Date: Mon, 11 Jan 2016 14:58:55 -0500 Subject: [PATCH 2/2] Make general `nowrap` more specific to paragraphs And remove the overrides that were already there. ht @rschamp and @carljbowman! --- src/components/news/news.scss | 1 - src/components/welcome/welcome.scss | 4 ---- src/main.scss | 6 ++++-- src/views/hoc/hoc.scss | 12 ------------ 4 files changed, 4 insertions(+), 19 deletions(-) diff --git a/src/components/news/news.scss b/src/components/news/news.scss index ff43bfe7b..e58bee698 100644 --- a/src/components/news/news.scss +++ b/src/components/news/news.scss @@ -19,7 +19,6 @@ a { display: block; text-decoration: none; - white-space: normal; &:hover { text-decoration: none; diff --git a/src/components/welcome/welcome.scss b/src/components/welcome/welcome.scss index 7577b9b9e..a0e3437a5 100644 --- a/src/components/welcome/welcome.scss +++ b/src/components/welcome/welcome.scss @@ -14,10 +14,6 @@ margin-top: 12px; padding: 0; font-weight: 200; - - a { - white-space: normal; - } } > a { diff --git a/src/main.scss b/src/main.scss index b65a6fbee..768545b5c 100644 --- a/src/main.scss +++ b/src/main.scss @@ -40,8 +40,10 @@ p.legal { } /* Links */ -a { - white-space: nowrap; +p { + a { + white-space: nowrap; + } } a:link, diff --git a/src/views/hoc/hoc.scss b/src/views/hoc/hoc.scss index 8d5e977c7..d2c9ffe84 100644 --- a/src/views/hoc/hoc.scss +++ b/src/views/hoc/hoc.scss @@ -77,10 +77,6 @@ $base-bg: $ui-white; min-width: 200px; max-width: 230px; - a { - white-space: normal; - } - .card-info { border-radius: 5px; background-color: $base-bg; @@ -203,10 +199,6 @@ $base-bg: $ui-white; .studio { width: 50%; - a { - white-space: normal; - } - h5 { width: 200px; } @@ -239,10 +231,6 @@ $base-bg: $ui-white; margin: 20px 0; width: 100%; - a { - white-space: normal; - } - img { margin: 20px; max-width: 150px;