Skip to content

Commit

Permalink
Merge pull request #5435 from guardian/container-spacing-pr-fixes
Browse files Browse the repository at this point in the history
Container spacing pr fixes - follow up with #5422
  • Loading branch information
kaelig committed Aug 7, 2014
2 parents dff759b + 9fc30be commit 20bcf16
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
13 changes: 5 additions & 8 deletions common/app/assets/stylesheets/module/facia/_items.scss
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
position: absolute;
@include rem((
min-height: gs-height(1),
min-width: gs-span(1),
min-width: gs-span(1)
));
top: 0;
right: 0;
Expand Down Expand Up @@ -156,7 +156,9 @@
}
}
@include mq(wide) {
left: gs-span(15) + $gs-gutter;
@include rem((
left: gs-span(15) + $gs-gutter
));
}
}
.facia-slice {
Expand Down Expand Up @@ -417,6 +419,7 @@
@include rem((
margin-top: $gs-baseline*2
));

.item--support-show & {
display: block;
}
Expand Down Expand Up @@ -579,13 +582,7 @@ $cta-icon-gap: 2px;
background: transparent;
color: $c-neutral1;
}


@include mq($to: tablet) {
&[data-link-name=top-stories] .container__header {
display: none;
}
}
@include mq(tablet) {
@include rem((
padding-top: $gs-baseline/2
Expand Down
4 changes: 3 additions & 1 deletion common/app/views/fragments/containers/news.scala.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@
data-component="@FaciaComponentName(config, collection)">
<div class="facia-container__inner">
<div class="container__border tone-@style.tone tone-accent-border"></div>
<div class="container__header">
<div class="@RenderClasses(Map(
("container__header", true),
("hide-on-mobile", (FaciaComponentName(config, collection) == "top-stories"))))">
<h2 class="container__title">
@fragments.containers.elements.dateOrTitle(collection, items)
</h2>
Expand Down

0 comments on commit 20bcf16

Please sign in to comment.