Skip to content
This repository was archived by the owner on Oct 29, 2020. It is now read-only.

Static content misc #1549

Merged
weerd merged 2 commits into from
Mar 27, 2014
Merged

Static content misc #1549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
437af47
Updates to misc content items, and reworking the header to abstract o…
Mar 27, 2014
8fe0f09
Update to the fact page to implement reworking.
Mar 27, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/themes/dosomething/paraneue_dosomething/scss/app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
// Content styles by section
@import "content/auth";
@import "content/homepage";
@import "content/campaign";
@import "content/campaign"; // @NOTE - parent partial that imports sub-partials
@import "content/confirmation";
@import "content/modals";
@import "content/modal-reportback";
Expand Down
15 changes: 3 additions & 12 deletions lib/themes/dosomething/paraneue_dosomething/scss/content/_fact-page.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@

.header-wrapper {
@include header-gradient();
@include header-typography();
}

.facts-wrapper {
Expand All @@ -71,21 +72,11 @@
}
}

// @TODO: Default content page headers -- same as campaign template -- abstract this
.header {
.title {
color: #fff;
}

.subtitle {
color: #fff;
font-weight: $weight-normal;
margin-top: -25px;


text-align: center;
@include media($tablet) {
text-align: left;
font-size: $font-largest; // Slightly smaller font-size, since 11 Facts titles are title-case.
margin: 1.5rem 0;
}
}
}
Expand Down
46 changes: 2 additions & 44 deletions lib/themes/dosomething/paraneue_dosomething/scss/content/_static.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,9 @@
.static_content-wrapper {
background: #fff;

h2, h3, h4 {
color: $purple;
}

// @TODO: Abstract all of these base styles to ds-neue
a {
font-weight: 600;
text-decoration: none;
}

a:hover {
text-decoration: underline;
}

li {
list-style-type: disc;
margin: 0 0 0 20px;
}

.header-wrapper {
@include header-gradient();
@include header-typography();
padding: 7rem 1rem 0;
@include row;
@include media($tablet) {
Expand All @@ -56,31 +39,6 @@
}
}

.header-wrapper {
@include header-gradient();
}

// @TODO: Default content page headers -- same as campaign template -- abstract this
.header {
text-align: center;
@include media($tablet) {
text-align: left;
}

.title {
color: #fff;
@include media($tablet) {
font-size: $font-larger;
}
}

.subtitle {
color: #fff;
font-weight: $weight-normal;
margin-top: -25px;
}
}

.intro {
// @TODO: ಠ_ಠ
margin-top: 20px;
Expand Down
24 changes: 2 additions & 22 deletions lib/themes/dosomething/paraneue_dosomething/scss/content/campaign/_header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,34 +28,14 @@ header.header {
background-position: 50% 50%;
background-size: cover;
background-color: $purple;
@include header-typography();

@include media($tablet) {
min-height: 620px;
}

h1.title {
color: #fff;
font-size: 2rem;
line-height: 2rem;
text-align: center;
margin: 0 0 0.5rem;

@include media($tablet) {
font-size: $font-hero;
text-align: left;
margin: 0 0 1.5rem;
}
}

p.cta {
color: #fff !important;
font-size: $font-regular;
text-align: center;
margin: 0 0 0.5rem;

.subtitle {
@include media($tablet) {
font-size: $font-medium;
text-align: left;
margin: 0;
}
}
Expand Down
33 changes: 33 additions & 0 deletions lib/themes/dosomething/paraneue_dosomething/scss/helpers/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,36 @@
@mixin header-gradient() {
@include linear-gradient($purple 25%, #000 100%);
}

// Apply header typography as a mixin to style both static and campaign content.
@mixin header-typography() {
.title {
color: #fff;
font-size: 2rem;
line-height: 1;
text-align: center;
margin: 0 0 0.5rem;

@include media($tablet) {
font-size: $font-hero;
text-align: left;
margin: 0 0 0.5rem;
}
}

.subtitle {
color: #fff;
font-size: $font-regular;
font-weight: normal;
line-height: 1.5;
margin: 0 0 0.5rem;
text-align: center;


@include media($tablet) {
font-size: $font-medium;
margin-bottom: 1.5rem;
text-align: left;
}
}
}
2 changes: 1 addition & 1 deletion lib/themes/dosomething/paraneue_dosomething/templates/campaign/node--campaign--pitch.tpl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<header class="header <?php print $classes; ?>">
<div class="meta">
<h1 class="title"><?php print $title; ?></h1>
<p class="cta"><?php print $cta; ?></p>
<h2 class="subtitle"><?php print $cta; ?></h2>
Copy link
Copy Markdown
Contributor

@mmwtsn mmwtsn Mar 27, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Semantically, this makes sense but it brings the front-end terminology out of sync with the field/variable names.

Should we update this in the module as well?


<?php if (isset($end_date)): ?><p class="date"><?php print $end_date; ?></p><?php endif; ?>

Expand Down
2 changes: 1 addition & 1 deletion lib/themes/dosomething/paraneue_dosomething/templates/campaign/node--campaign.tpl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<header class="header <?php print $classes; ?>">
<div class="meta">
<h1 class="title"><?php print $title; ?></h1>
<p class="cta"><?php print $cta; ?></p>
<h2 class="subtitle"><?php print $cta; ?></h2>

<?php if (isset($end_date)): ?><p class="date"><?php print $end_date; ?></p><?php endif; ?>

Expand Down
2 changes: 1 addition & 1 deletion ...hemes/dosomething/paraneue_dosomething/templates/campaign/reportback-confirmation.tpl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<header class="header">
<h1 class="title">You Did It!</h1>
<?php if (isset($copy)): ?>
<h3 class="subtitle"><?php print $copy; ?></h3>
<h2 class="subtitle"><?php print $copy; ?></h2>
<?php endif; ?>
</header>
</div>
Expand Down
2 changes: 1 addition & 1 deletion lib/themes/dosomething/paraneue_dosomething/templates/node--fact_page.tpl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<header class="header">
<h1 class="title"><?php print $title; ?></h1>
<?php if (isset($subtitle)): ?>
<h3 class="subtitle"><?php print $subtitle; ?></h3>
<h2 class="subtitle"><?php print $subtitle; ?></h2>
<?php endif; ?>
</header>
</div>
Expand Down
2 changes: 1 addition & 1 deletion lib/themes/dosomething/paraneue_dosomething/templates/node--static_content.tpl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<header class="header">
<h1 class="title"><?php print $title; ?></h1>
<?php if (isset($subtitle)): ?>
<h3 class="subtitle"><?php print $subtitle; ?></h3>
<h2 class="subtitle"><?php print $subtitle; ?></h2>
Copy link
Copy Markdown
Contributor

@mmwtsn mmwtsn Mar 27, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🍍 Approved.

<?php endif; ?>
</header>
</div>
Expand Down