From bcc7b97c1c7d9eaaa83bf06e0ae6cd7ab5b8dabe Mon Sep 17 00:00:00 2001 From: =?utf8?q?Je=CC=81re=CC=81my=20Fabre?= Date: Mon, 6 Feb 2017 10:04:00 +0100 Subject: [PATCH] Update layout and some sass files --- app/static/src/sass/config/_colors.scss | 4 +- app/static/src/sass/config/_variables.scss | 4 +- app/static/src/sass/layout/_footer.scss | 6 +- app/static/src/sass/layout/_global.scss | 8 +- app/static/src/sass/layout/_header.scss | 12 --- app/static/src/sass/modules/_page.scss | 20 +++- app/static/src/sass/pages/_home.scss | 2 +- app/templates/base.html | 30 ++---- app/templates/home/inc/bio.html | 8 +- app/templates/includes/footer.html | 106 +++++++++------------ app/templates/index.html | 42 -------- 11 files changed, 90 insertions(+), 152 deletions(-) diff --git a/app/static/src/sass/config/_colors.scss b/app/static/src/sass/config/_colors.scss index 9e0e0e54..595005b4 100755 --- a/app/static/src/sass/config/_colors.scss +++ b/app/static/src/sass/config/_colors.scss @@ -31,7 +31,9 @@ $color-vimeo: #4bf; $color-youtube: #bb0000; $color-white: #FFFFFF; -$color-main: #F8E71C; +$color-main: #50E3C2; $color-gray: #C3C3C3; $color-black: #1D1D1B; $color-black-light: #343432; + +$color-background: #000F24; diff --git a/app/static/src/sass/config/_variables.scss b/app/static/src/sass/config/_variables.scss index 590a75ca..055f833d 100755 --- a/app/static/src/sass/config/_variables.scss +++ b/app/static/src/sass/config/_variables.scss @@ -34,8 +34,8 @@ $breakpoints: ( lg: 1372px ); -$grid-columns: 12; -$grid-gutter: 30px; +$grid-columns: 16; +$grid-gutter: 20px; $grid-container-prefix: 'container'; $grid-row-prefix: 'row'; $grid-col-prefix: 'col'; diff --git a/app/static/src/sass/layout/_footer.scss b/app/static/src/sass/layout/_footer.scss index 7c8d8a5e..a6432d10 100755 --- a/app/static/src/sass/layout/_footer.scss +++ b/app/static/src/sass/layout/_footer.scss @@ -22,6 +22,9 @@ $module: ".footer"; #{$module} { + /* Rectangle 2: */ + background-image: linear-gradient(-180deg, #000F24 0%, #FF203C 100%); + @include mq($until: xs) { div[class^="col-"] { @include margin(.5 0); @@ -30,7 +33,6 @@ $module: ".footer"; &__pre { - background: $color-black; border-bottom: 3px solid white; color: white; @@ -45,8 +47,6 @@ $module: ".footer"; &__content { - background: #6b6b6b; - @include padding(1 0); @include font-size(s); diff --git a/app/static/src/sass/layout/_global.scss b/app/static/src/sass/layout/_global.scss index 7d1a88f7..b6d885d5 100755 --- a/app/static/src/sass/layout/_global.scss +++ b/app/static/src/sass/layout/_global.scss @@ -19,12 +19,12 @@ // along with this program. If not, see . .main { - @include margin(3 0 0 0); - @include padding(1 0 0 0); + @include margin(0 0 0 0); + @include padding(0 0 0 0); @media screen and (max-height: 900px) { - @include margin(.5 0 0 0); + @include margin(0 0 0 0); } } @@ -40,6 +40,8 @@ html, body { + background: $color-background; + @include mq($until: sm) { overflow-x: hidden; diff --git a/app/static/src/sass/layout/_header.scss b/app/static/src/sass/layout/_header.scss index 364c6eab..c332d87e 100755 --- a/app/static/src/sass/layout/_header.scss +++ b/app/static/src/sass/layout/_header.scss @@ -38,18 +38,6 @@ $module: ".header"; } } - &__pre { - - background: $color-black; - height: $header-pre-height; - color: white; - - @include mq($until: sm) { - display: none; - } - - } - &__nav { background: $color-white; diff --git a/app/static/src/sass/modules/_page.scss b/app/static/src/sass/modules/_page.scss index 074a99b4..41f6e32c 100644 --- a/app/static/src/sass/modules/_page.scss +++ b/app/static/src/sass/modules/_page.scss @@ -23,7 +23,7 @@ $module: ".page"; #{$module} { min-height: 500px; - + @include mq($until: sm) { min-height: 0; } @@ -224,6 +224,24 @@ $module: ".page"; } + &--accent { + + background-color: white; + color: $color-background; + text-align: center; + font-family: $serif; + + @include padding(2 0); + + h2 { + font-family: $serif; + font-weight: weight(bold); + @include margin-bottom(1); + @include margin-top(0); + } + + } + p:last-child { margin-bottom: 0; diff --git a/app/static/src/sass/pages/_home.scss b/app/static/src/sass/pages/_home.scss index b0504563..6699e292 100644 --- a/app/static/src/sass/pages/_home.scss +++ b/app/static/src/sass/pages/_home.scss @@ -25,7 +25,7 @@ $module: ".home"; // Overrides .main style .main { - margin-top: -($header-height + $header-pre-height); + margin-top: 0; padding-top: 0; @include mq($until: sm) { diff --git a/app/templates/base.html b/app/templates/base.html index 7e0bc2b2..a465b3f3 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -47,39 +47,20 @@
-
-
-
-
- {% page_menu "pages/menus/action.html" %} -
-
- {% include "includes/languages.html" %} -
-
-
-
-
+
-
- {% if not on_home %} -
-
-
    - {% spaceless %} - {% block breadcrumb_menu %}{% page_menu "pages/menus/breadcrumb.html" %}{% endblock %} - {% endspaceless %} -
-
+
+ {% include "includes/languages.html" %}
- {% endif %} +
+
@@ -93,6 +74,7 @@ {% include "includes/footer.html" %}
+ {% search_form %} {% include "includes/footer_scripts.html" %} {% endspaceless %} diff --git a/app/templates/home/inc/bio.html b/app/templates/home/inc/bio.html index bd7fd283..078d45d1 100644 --- a/app/templates/home/inc/bio.html +++ b/app/templates/home/inc/bio.html @@ -1,9 +1,13 @@ {% load i18n %} -
+
-
+
{{ host_organization.bio|safe }} +

hello

+

+ Lorem ipsum dolor sit amet, consectetur adipisicing elit. Necessitatibus blanditiis ullam inventore nesciunt cumque rem. Nostrum debitis perferendis sed soluta molestiae. Commodi quis repudiandae voluptates delectus, laudantium libero corporis tenetur! +

diff --git a/app/templates/includes/footer.html b/app/templates/includes/footer.html index 9bc854a0..f93ef068 100644 --- a/app/templates/includes/footer.html +++ b/app/templates/includes/footer.html @@ -1,25 +1,12 @@ {% load i18n pages_tags mezzanine_tags staticfiles keyword_tags event_tags organization_tags %} -
-
-
-
- {% if newsletter_subscribing_url %} - - {% trans "Subscribe to our newsletter" %} - - {% endif %} - {% for link in host_organization.links.all %} - - {% endfor %} -
-
-
-
+
-
+ +
+ {% with host_organization.images|get_type:"logo_footer" as images %} {% if images %} @@ -29,64 +16,61 @@ {% endif %} {% endwith %} -
-
- {{ host_organization.name }}
-
- {{ host_organization.address }}
- {{ host_organization.postal_code }} {{ host_organization.city }}
- {% if host_organization.telephone %}T. {{ host_organization.telephone }}{% endif %} -
-
- {% trans 'Opening times' %}
-
- {{ host_organization.opening_times|safe }} -
-
- {% trans 'Subway access' %}
-
- {{ host_organization.subway_access|safe }} -
-
- -
-
-
-
-
- -
-
- {% page_menu "pages/menus/footer_vertical.html" %} -
-
- {{ host_organization.description }}
{% trans 'under the tutelage of' %} :
-
{% if linked_organization_footer %} {% include 'pages/page/includes/linked_organization_footer.html' %} {% endif %} +
-
- {% trans 'go to' %} : - {% if linked_organization_footer_2 %} - {% include 'pages/page/includes/linked_organization_footer_2.html' %} - {% endif %} +
+ +
+ +
+ + {% include 'pages/page/includes/linked_organization_footer.html' %} + +
+ +
+ +
+ +
+ + {% page_menu "pages/menus/footer_vertical.html" %} + +
+ +
+ + {% for link in host_organization.links.all %} + + {% endfor %} + +
+ +
+
+
+ {% comment %} + Additional menu + {% endcomment %}
-
-
+
+ {% page_menu "pages/menus/footer_horizontal.html" %}
+ {% comment %} + Copyright + {% endcomment %}
-
- {% page_menu "pages/menus/footer_horizontal.html" %} -
-
+
Copyright © {% current_year %} {{ host_organization.name }}. {% trans "All rights reserved" %}.
diff --git a/app/templates/index.html b/app/templates/index.html index 121ce8cd..38313b9c 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -11,12 +11,6 @@ {% endblock %} {% endspaceless %} -{% block breadcrumb_menu %} -
  • {% trans "Home" %}
    • -{% endblock %} - -{% block content_header %}{% endblock %} - {% block main %}
    @@ -25,42 +19,6 @@ {% include "home/inc/slider.html" %} - - {% include "home/inc/body.html" %}
    -- 2.39.5