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

Commit

Permalink
Merge 10a009e into b60222a
Browse files Browse the repository at this point in the history
  • Loading branch information
@philli-m
philli-m authored Aug 7, 2019
2 parents b60222a + 10a009e commit 318ed74
Show file tree
Hide file tree
Showing 12 changed files with 61 additions and 37 deletions.
4 changes: 4 additions & 0 deletions liqd_product/assets/scss/_base.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,3 +149,7 @@ button,
text-align: left;
cursor: pointer;
}

.content__wrapper {
min-height: 100vh;
}
2 changes: 1 addition & 1 deletion liqd_product/assets/scss/_shame.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ input[type="search"] {
}

//follow dropdown overwrite so it drops on left side so doesn't go off screen
@media screen and (max-width: $breakpoint-lg-down) {
@media screen and (max-width: $breakpoint-xl-down) {
.btngroup-gray {
.dropdown-menu {
right: 0 !important;
Expand Down
26 changes: 18 additions & 8 deletions liqd_product/assets/scss/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,17 +73,27 @@ $padding: 1rem !default;

$wrapper-width: 79rem !default;

$grid-breakpoints: (
xs: 0,
sm: 576px,
md: 768px,
lg: 992px,
xl: 1200px
) !default;

// use for min-width media-queries
$breakpoint-xs: 32rem !default;
$breakpoint: 50rem !default;
$breakpoint-md: 64rem !default;
$breakpoint-lg: 90rem !default;
$breakpoint-xs: $grid-breakpoints(xs) !default;
$breakpoint: $grid-breakpoints(sm) !default;
$breakpoint-md: $grid-breakpoints(lg) !default;
$breakpoint-lg: $grid-breakpoints(xl) !default;
$breakpoint-xl: 1440px !default;

// use for max-width media queries
$breakpoint-xs-down: $breakpoint-xs - 0.1rem !default;
$breakpoint-down: $breakpoint - 0.1rem !default; // sm
$breakpoint-md-down: $breakpoint-md - 0.1rem !default;
$breakpoint-lg-down: $breakpoint-lg - 0.1rem !default;
$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-xl - 0.1px !default;
$breakpoint-xl-down: $breakpoint-xl - 0.1px !default;

$hero-height: 25.5rem !default;
$hero-height-secondary: 20rem !default;
Expand Down
27 changes: 13 additions & 14 deletions liqd_product/assets/scss/components/_blocks.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ $block-padding-md: 7.5*$padding;
@extend .col-md-4;
padding: $padding;

@media screen and (min-width: $breakpoint-lg) {
@media screen and (min-width: $breakpoint-xl) {
padding: $padding $block-padding-md 0 $block-padding-md;
}
}
Expand Down Expand Up @@ -115,18 +115,17 @@ $block-padding-md: 7.5*$padding;
padding: 0 $block-padding-md $block-padding-md 5*$r-spacer;
}
}
}

.block-img-col__image {
max-height: 400px;
width: auto;
position: relative;
right: 2*-$r-spacer;
margin-top: $r-spacer;
.block-img-col__image {
width: 100%;
position: relative;
right: 2*-$r-spacer;
margin-top: $r-spacer;

@media screen and (min-width: $breakpoint-lg) {
margin-top: 2*$r-spacer;
right: 4.5*-$r-spacer;
@media screen and (min-width: $breakpoint-xl) {
margin-top: 2*$r-spacer;
right: 3*-$r-spacer;
}
}
}

Expand Down Expand Up @@ -206,15 +205,15 @@ $block-padding-md: 7.5*$padding;

//linked for specificty
.btn--transparent.block-bg_btn-2 {
color: $body-bg;
border-color: $body-bg;
color: $text-color-inverted;
border-color: $text-color-inverted;
}

.block-background_cta_block {
margin-left: -$r-spacer;
margin-right: -$r-spacer;

@media screen and (min-width: $breakpoint-lg) {
@media screen and (min-width: $breakpoint-xl) {
margin-left: 2*-$r-spacer;
margin-right: 2*-$r-spacer;
}
Expand Down
2 changes: 1 addition & 1 deletion liqd_product/assets/scss/components/_contact_form.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ $block-padding-md: 7.5*$padding;
bottom: 0;
left: 10%;

@media screen and (min-width: $breakpoint-lg) {
@media screen and (min-width: $breakpoint-xl) {
left: 20%;
}
}
2 changes: 1 addition & 1 deletion liqd_product/assets/scss/components/_footer.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
margin: $r-spacer;
background-color: $bg-light;

@media screen and (min-width: $breakpoint-lg) {
@media screen and (min-width: $breakpoint-xl) {
margin: 2*$r-spacer;
}
}
Expand Down
10 changes: 5 additions & 5 deletions liqd_product/assets/scss/components/_homepage.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ $spacer-xl: 7.5rem;
background-color: $body-bg;
margin: $r-spacer;

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

Expand Down Expand Up @@ -34,16 +34,16 @@ $spacer-xl: 7.5rem;
height: 100%;
object-fit: cover;

@media screen and (min-width: $breakpoint-md) {
right: 2.5*-$r-spacer;
@media screen and (min-width: $breakpoint-xl) {
right: 3*-$r-spacer;
}
}

.homepage-header__btn {
margin: 2*$r-spacer 0 0 2*$r-spacer;

@media screen and (min-width: $breakpoint-md) {
margin-left: 2.5*$r-spacer;
@media screen and (min-width: $breakpoint-xl) {
margin-left: 3*$r-spacer;
}
}

Expand Down
7 changes: 7 additions & 0 deletions liqd_product/assets/scss/components/_language_switch.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,10 @@
padding-right: 0.4*$padding;
border-right: 2px solid $black;
}

a {
.lang__btn--right,
.lang__btn--left {
color: $primary;
}
}
2 changes: 1 addition & 1 deletion liqd_product/assets/scss/components/_participation-tile.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
max-width: calc(100% * (1 / 3) - 2rem - 1px);
}

@media screen and (min-width: $breakpoint-lg) {
@media screen and (min-width: $breakpoint-xl) {
max-width: calc(100% * (1 / 4) - 2rem - 1px);
}
}
Expand Down
6 changes: 5 additions & 1 deletion liqd_product/assets/scss/components/_timeline-carousel.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ $timeline-carousel__top-space: 11px;
}
}

.slick-track {
padding-bottom: $padding;
}

.timeline-carousel {
position: relative;
color: $brand-secondary;
Expand Down Expand Up @@ -106,7 +110,7 @@ $timeline-carousel__top-space: 11px;
}

//mobile slick overwrites
@media screen and (max-width: $breakpoint-lg-down) {
@media screen and (max-width: $breakpoint-xl-down) {
.slick-next {
right: 0 !important;
}
Expand Down
4 changes: 2 additions & 2 deletions liqd_product/templates/base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@
</head>
<body>
{% wagtailuserbar %}
<div>
<div class="content__wrapper d-flex flex-column">
<a href="#main" class="sr-only sr-only-focusable">{% trans "Skip to content "%}</a>

{% block header %}
{% include 'header.html' %}
{% endblock %}

<main id="main">
<main id="main" class="flex-fill">

{% if messages %}
<ul class="messages">
Expand Down
6 changes: 3 additions & 3 deletions liqd_product/templates/footer.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
<div class="col-lg-5">
<div class="row">
<div class="col-sm-6 d-flex flex-column">
<a class="btn btn--transparent footer__btn" href="https://creativecommons.org/licenses/by-sa/4.0/">Open Content CC-BY-SA</a>
<a class="btn btn--transparent footer__info-btn" href="https://creativecommons.org/licenses/by-sa/4.0/">Open Content CC-BY-SA</a>
</div>
<div class="col-sm-6 d-flex flex-column mt-4 mt-sm-0">
<a class="btn btn--transparent footer__btn" href="https://github.com/liqd/a4-product">Open Source AGPLv3</a>
<a class="btn btn--transparent footer__info-btn" href="https://github.com/liqd/a4-product">Open Source AGPLv3</a>
</div>
</div>
</div>
Expand Down Expand Up @@ -51,7 +51,7 @@
</div>
{% if pages.donate_link %}
<div class="col-12 col-sm-6 offset-sm-6 offset-lg-0 d-flex flex-column px-0 pl-sm-3">
<a href="{{ pages.donate_link.url }}" class="btn btn--full btn--secondary-filled mb-0 mr-0">{% trans 'Support the further development of the platform' %}<br><b>{% trans 'Donate now' %}</b></a>
<a href="{{ pages.donate_link.url }}" class="btn btn--full btn--secondary-filled mb-0 mr-0 mt-auto">{% trans 'Support the further development of the platform' %}<br><b>{% trans 'Donate now' %}</b></a>
</div>
{% endif %}
{% endwith %}
Expand Down

0 comments on commit 318ed74

Please sign in to comment.