From 459ea70464b8d6ed75060febd457b47452a6b009 Mon Sep 17 00:00:00 2001 From: Alex Wolfe Date: Wed, 22 Apr 2015 07:06:59 -0700 Subject: [PATCH] intro styles update --- public/_includes/_banner.jade | 6 ++++-- public/_includes/_intro.jade | 7 ------- public/docs/js/latest/guide/_layout.jade | 5 +---- public/resources/css/module/_banner.scss | 2 +- 4 files changed, 6 insertions(+), 14 deletions(-) delete mode 100644 public/_includes/_intro.jade diff --git a/public/_includes/_banner.jade b/public/_includes/_banner.jade index f906e023b3..61de75cac2 100644 --- a/public/_includes/_banner.jade +++ b/public/_includes/_banner.jade @@ -1,2 +1,4 @@ -.banner.is-centered - p.text-body !{banner} \ No newline at end of file +content = banner ? banner : intro + +.banner + p.text-body !{content} \ No newline at end of file diff --git a/public/_includes/_intro.jade b/public/_includes/_intro.jade deleted file mode 100644 index 166f64bf0a..0000000000 --- a/public/_includes/_intro.jade +++ /dev/null @@ -1,7 +0,0 @@ -.intro(style='\ - background: #E6E7EC;\ - padding: 40px;\ - font-size: 22px;\ - line-height: 32px;\ - ') - | #{ intro } diff --git a/public/docs/js/latest/guide/_layout.jade b/public/docs/js/latest/guide/_layout.jade index ac6b62af47..9be604fcb3 100644 --- a/public/docs/js/latest/guide/_layout.jade +++ b/public/docs/js/latest/guide/_layout.jade @@ -7,10 +7,7 @@ html(lang="en" ng-app="angularIOApp") != partial("../../../../_includes/_main-nav") != partial("../../../../_includes/_docs-nav") != partial("../../../../_includes/_hero") - if intro - != partial("../../../../_includes/_intro") - - if banner + if intro || banner != partial("../../../../_includes/_banner") article.l-content-small.grid-fluid.docs-content(ng-non-bindable) diff --git a/public/resources/css/module/_banner.scss b/public/resources/css/module/_banner.scss index d460dbb291..3c71a33ad4 100644 --- a/public/resources/css/module/_banner.scss +++ b/public/resources/css/module/_banner.scss @@ -6,7 +6,7 @@ .banner { background: $mist; - padding: $unit * 4; + padding: ($unit * 4) ($unit * 4) ($unit * 4) ($unit * 12); min-height: $unit * 12; @media handheld and (max-width: $phone-breakpoint),