From fe70dd0f9ef752a63075ad25e8400b0382e3c2c9 Mon Sep 17 00:00:00 2001 From: Matthew Taylor Date: Wed, 16 Nov 2016 08:50:00 -0500 Subject: [PATCH 01/16] trello-ize title banner h1,p styling we need it to be different for the hoc banner, so make it need a class name in order to be styled correctly --- .../informationpage/informationpage.jsx | 4 +++- .../teacher-banner/teacher-banner.jsx | 5 +++- src/components/title-banner/title-banner.scss | 24 +++++++++---------- src/views/developers/developers.jsx | 6 +++-- src/views/explore/explore.jsx | 2 +- src/views/hoc/hoc.jsx | 4 ++-- src/views/search/search.jsx | 2 +- src/views/teachers/landing/landing.jsx | 6 +++-- src/views/thingstotry/thingstotry.jsx | 4 ++-- 9 files changed, 33 insertions(+), 24 deletions(-) diff --git a/src/components/informationpage/informationpage.jsx b/src/components/informationpage/informationpage.jsx index da9585343..acc68da77 100644 --- a/src/components/informationpage/informationpage.jsx +++ b/src/components/informationpage/informationpage.jsx @@ -23,7 +23,9 @@ var InformationPage = React.createClass({
-

{this.props.title}

+

+ {this.props.title} +

diff --git a/src/components/teacher-banner/teacher-banner.jsx b/src/components/teacher-banner/teacher-banner.jsx index 91b76e23d..b24cebcc0 100644 --- a/src/components/teacher-banner/teacher-banner.jsx +++ b/src/components/teacher-banner/teacher-banner.jsx @@ -39,7 +39,10 @@ var TeacherBanner = React.createClass({ {this.props.messages['teacherbanner.greeting']},{' '} {this.props.session.session.user.username} , -

+

{this.props.messages['teacherbanner.subgreeting']}

] : [] diff --git a/src/components/title-banner/title-banner.scss b/src/components/title-banner/title-banner.scss index 908d58195..f0ce9e96b 100644 --- a/src/components/title-banner/title-banner.scss +++ b/src/components/title-banner/title-banner.scss @@ -9,16 +9,16 @@ background-size: cover; padding: 20px 0; width: 100%; - - h1, - p { - margin: 0 auto; - padding: 5px 0; - text-align: center; - color: $type-white; - } - - p { - max-width: 500px; - } +} + +.title-banner-h1, +.title-banner-p { + margin: 0 auto; + padding: 5px 0; + text-align: center; + color: $type-white; +} + +.title-banner-p { + max-width: 500px; } diff --git a/src/views/developers/developers.jsx b/src/views/developers/developers.jsx index a29805a2c..e562013c1 100644 --- a/src/views/developers/developers.jsx +++ b/src/views/developers/developers.jsx @@ -18,8 +18,10 @@ var Developers = React.createClass({
-

-

+

+ +

+

diff --git a/src/views/explore/explore.jsx b/src/views/explore/explore.jsx index c1c0e00df..53db2be74 100644 --- a/src/views/explore/explore.jsx +++ b/src/views/explore/explore.jsx @@ -137,7 +137,7 @@ var Explore = injectIntl(React.createClass({
-

Explore

+

Explore

diff --git a/src/views/hoc/hoc.jsx b/src/views/hoc/hoc.jsx index 1d3a72df9..af72198a9 100644 --- a/src/views/hoc/hoc.jsx +++ b/src/views/hoc/hoc.jsx @@ -29,10 +29,10 @@ var Hoc = React.createClass({ return (
-

+

-

+

diff --git a/src/views/search/search.jsx b/src/views/search/search.jsx index b861c1d6c..997aaeb08 100644 --- a/src/views/search/search.jsx +++ b/src/views/search/search.jsx @@ -103,7 +103,7 @@ var Search = injectIntl(React.createClass({
-

Search

+

Search

+ +
+

+ +

+ + + +
+
+