Skip to content
This repository has been archived by the owner on Nov 7, 2019. It is now read-only.

clean up styling landing page: fix wrapper width #1042

Merged
merged 2 commits into from
Oct 14, 2019
Merged

clean up styling landing page: fix wrapper width #1042

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
5348f93
landing page/styling: move the elements out of the container again
fuzzylogic2000 Oct 4, 2019
fa9f0ec
cms/styling: use max width and cnter homepage column for screens > 20…
fuzzylogic2000 Oct 14, 2019
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: 0 additions & 2 deletions apps/cms/pages/templates/a4_candy_cms_pages/blocks/img_cta_block.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{% load wagtailcore_tags wagtailimages_tags %}

<div class="container">
<div class="block block__background">
<div class="container">
<div class="block mb-5 pb-2 pt-4 text-center text-light">
Expand All @@ -9,4 +8,3 @@
</div>
</div>
</div>
</div>
6 changes: 3 additions & 3 deletions apps/cms/pages/templates/a4_candy_cms_pages/home_page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

{% block content %}
<div class="homepage__wrapper p-3">
<div class="homepage-header container">
<div class="homepage-header">
<div class="row">
<div class="col-lg-6">
<h1 class="homepage-header__teaser">{{ page.teaser|richtext }}</h1>
<h1 class="homepage-header__teaser ml-md-4">{{ page.teaser|richtext }}</h1>
</div>
<div class="col-lg-6">
{% image page.image width-800 as image %}
Expand All @@ -22,7 +22,7 @@ <h1 class="homepage-header__teaser">{{ page.teaser|richtext }}</h1>
{% endif %}
</div>

<div class="container">{{ page.body|richtext }}</div>
<div>{{ page.body|richtext }}</div>
<div>{{ page.body_streamfield }}</div>

{% if page.form_page %}
Expand Down
8 changes: 6 additions & 2 deletions liqd_product/assets/scss/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,22 +78,26 @@ $grid-breakpoints: (
sm: 576px,
md: 768px,
lg: 992px,
xl: 1200px
xl: 1200px,
xxl: 1440px,
xxxl: 2000px,
) !default;

// use for min-width media-queries
$breakpoint-xs: map-get($grid-breakpoints, "sm") !default;
$breakpoint: map-get($grid-breakpoints, "md") !default;
$breakpoint-md: map-get($grid-breakpoints, "lg") !default;
$breakpoint-lg: map-get($grid-breakpoints, "xl") !default;
$breakpoint-xl: 1440px !default;
$breakpoint-xl: map-get($grid-breakpoints, "xxl") !default;
$breakpoint-xxl: map-get($grid-breakpoints, "xxxl") !default;

// use for max-width media queries
$breakpoint-xs-down: $breakpoint-xs - 0.1px !default;
$breakpoint-down: $breakpoint - 0.1px !default; // sm
$breakpoint-md-down: $breakpoint-md - 0.1px !default;
$breakpoint-lg-down: $breakpoint-lg - 0.1px !default;
$breakpoint-xl-down: $breakpoint-xl - 0.1px !default;
$breakpoint-xxl-down: $breakpoint-xxl - 0.1px !default;

$hero-height: 25.5rem !default;
$hero-height-secondary: 20rem !default;
Expand Down
6 changes: 3 additions & 3 deletions liqd_product/assets/scss/components/_blocks.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,9 @@ $block-padding-md: 7.5*$padding;
margin-left: -$r-spacer;
margin-right: -$r-spacer;

@media screen and (min-width: $breakpoint-xl) {
margin-left: 2*-$r-spacer;
margin-right: 2*-$r-spacer;
@media screen and (min-width: $breakpoint-xxl) {
margin-left: 0;
margin-right: 0;
}

.block {
Expand Down
5 changes: 3 additions & 2 deletions liqd_product/assets/scss/components/_homepage.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ $spacer-xl: 7.5rem;
background-color: $bg-light;
margin: 0 $r-spacer 0 $r-spacer;

@media screen and (min-width: $breakpoint-xl) {
margin: 0 2*$r-spacer 0 2*$r-spacer;
@media screen and (min-width: $breakpoint-xxl) {
max-width: $breakpoint-xl;
margin: auto;
}

.block {
Expand Down