Update layout and some sass files

diff --git a/app/static/src/sass/config/_colors.scss b/app/static/src/sass/config/_colors.scss
index 9e0e0e546898fd2c1c429b8e8b9c493456abab43..595005b444480e421cee52fc12fac7f9852f5982 100755 (executable)
--- 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 590a75ca0a0703df986579598267beddbe151d5d..055f833d047bbd2750a9816eb91d4fbc1b708930 100755 (executable)
--- 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 7c8d8a5eacdf3292c9749011277ea45d1850e4c3..a6432d10f30dfd5250f47bc889ded9bc4a2adcf6 100755 (executable)
--- 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 7d1a88f7aa0cdc32215257376955e2bb448af6ff..b6d885d50666754d83366675534261645c0937df 100755 (executable)
--- 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 <http://www.gnu.org/licenses/>.
 
 .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 364c6eabd394025c4c5cb1f3fba0e63206c61c80..c332d87e41f043fe7df2c7171710dc0a0bfd8fdc 100755 (executable)
--- 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 074a99b4dc1c38da803c6001e1edfe34a89bb2e1..41f6e32c0e24cb57e657e1b9b4f8ce2ef773bf44 100644 (file)
--- 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 b05045636778820319349068533804ecd5f97793..6699e29201f28aed1e1cfb263e75966a08b5c271 100644 (file)
--- 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 7e0bc2b2fe7b1b6144c02ee67e07211dfce8ae06..a465b3f37394f53bff74c5488c39a2e85dad60d1 100644 (file)
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -47,39 +47,20 @@
     </div>
 
     <div class="header push">
-        <div class="header__pre">
-            <div class="container">
-                <div class="row">
-                    <div class="col-md-10 col-md-push-1 tac">
-                        {% page_menu "pages/menus/action.html" %}
-                    </div>
-                    <div class="col-md-1 col-md-push-1 tar">
-                        {% include "includes/languages.html" %}
-                    </div>
-                </div>
-            </div>
-        </div>
 
         <div class="container">
             <div class="row header__nav">
-                <div class="col-md-12 tac">
+                <div class="col-md-10 tac">
                     <div id="navHeader">
                         {% page_menu "pages/menus/header.html" %}
                     </div>
                 </div>
-            </div>
-            {% if not on_home %}
-                <div class="row white-bg">
-                    <div class="col-md-8 col-md-push-2">
-                        <ul class="breadcrumb">
-                            {% spaceless %}
-                                {% block breadcrumb_menu %}{% page_menu "pages/menus/breadcrumb.html" %}{% endblock %}
-                            {% endspaceless %}
-                        </ul>
-                    </div>
+                <div class="col-md-6 tac">
+                    {% include "includes/languages.html" %}
                 </div>
-            {% endif %}
+            </div>
         </div>
+
     </div>
 
     <div id="container">
@@ -93,6 +74,7 @@
             {% include "includes/footer.html" %}
         </footer>
     </div>
+
     {% 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 bd7fd283e1fe488eafa0c32291310c4d46e6c86e..078d45d1f4d17b2018d3368319fc1f6ad68a8253 100644 (file)
--- a/app/templates/home/inc/bio.html
+++ b/app/templates/home/inc/bio.html
@@ -1,9 +1,13 @@
 {% load i18n %}
-<div class="page__block page__block--yellow">
+<div class="page__block page__block--accent">
     <div class="container">
         <div class="row">
-            <div class="col-xs-12 col-md-12 col-lg-10 col-lg-push-1 ffss fsxl fwl lh2 fsl-until-sm ">
+            <div class="col-xs-16 col-md-16 col-lg-14 col-lg-push-1">
                 {{ host_organization.bio|safe }}
+                <h2>hello</h2>
+                <p>
+                    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!
+                </p>
             </div>
         </div>
     </div>

diff --git a/app/templates/includes/footer.html b/app/templates/includes/footer.html
index 9bc854a020c0817045520182b451fd4da149d45b..f93ef06870087e0753be7c14fa577b3bad5d11a3 100644 (file)
--- 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 %}
-<div class="footer__pre">
-    <div class="container">
-        <div class="row">
-            <div class="col-sm-11 tar-sm tal-xs">
-                {% if newsletter_subscribing_url %}
-                    <a class="button button--small button--white mr3" href="{{ newsletter_subscribing_url }}">
-                        {% trans "Subscribe to our newsletter" %}
-                    </a>
-                {% endif %}
-                {% for link in host_organization.links.all %}
-                    <a class="footer__follow-link {{ link.link_type.slug }}" href="{{ link.url }}" target="_blank" title="{% trans 'Follow us on' %} {{ link.title }}"><i class="fa fa-{{ link.link_type.slug }}{% if link.link_type.fa_option %}-{{ link.link_type.fa_option }}{% endif %}"></i></a>
-                {% endfor %}
-            </div>
-        </div>
-    </div>
-</div>
 
 <div class="footer__content">
     <div class="container">
+
         <div class="row">
-            <div class="col-xs-3 col-sm-4 col-sm-push-1 tal">
+
+            <div class="col-xxs-16 col-sm-push-1 col-sm-4">
+
                 <a href="{% url "home" %}" title="{% trans 'Home' %}">
                     {% with host_organization.images|get_type:"logo_footer" as images %}
                       {% if images %}
@@ -29,64 +16,61 @@
                       {% endif %}
                     {% endwith %}
                 </a>
-            </div>
-            <div class="col-xs-3 col-sm-2 col-sm-push-1 tar-sm tal fsm">
-                <strong>{{ host_organization.name }}</strong><br />
-                <br />
-                {{ host_organization.address }}<br />
-                {{ host_organization.postal_code }} {{ host_organization.city }}<br />
-                {% if host_organization.telephone %}T. {{ host_organization.telephone }}{% endif %}
-            </div>
-            <div class="col-xs-3 col-sm-2 col-sm-push-1 tar-sm tal fsm">
-                <strong>{% trans 'Opening times' %}</strong><br />
-                <br />
-                {{ host_organization.opening_times|safe }}
-            </div>
-            <div class="col-xs-3 col-sm-2 col-sm-push-1 tar-sm tal fsm">
-                <strong>{% trans 'Subway access' %}</strong><br />
-                <br />
-                {{ host_organization.subway_access|safe }}
-            </div>
-        </div>
-
-        <div class="row">
-            <div class="col-sm-10 col-sm-push-1">
-                <div class="footer__separator"></div>
-            </div>
-        </div>
-
-        <div class="row">
-            <div class="col-xs-4 col-sm-3 col-sm-push-1 tal">
-                {% page_menu "pages/menus/footer_vertical.html" %}
-            </div>
 
-            <div class="col-xs-4 col-sm-5 col-sm-push-1 tal">
-                <strong>{{ host_organization.description }}</strong><br/ >{% trans 'under the tutelage of' %} :<br />
-                <br />
                 {% if linked_organization_footer %}
                     {% include 'pages/page/includes/linked_organization_footer.html' %}
                 {% endif %}
+
             </div>
 
-            <div class="col-xs-4 col-sm-2 col-sm-push-1 tal">
-                {% trans 'go to' %} :
-                {% if linked_organization_footer_2 %}
-                    {% include 'pages/page/includes/linked_organization_footer_2.html' %}
-                {% endif %}
+            <div class="col-xxs-16 col-sm-push-1 col-sm-10">
+
+                <div class="row">
+
+                    <div class="col-xxs-16">
+
+                        {% include 'pages/page/includes/linked_organization_footer.html' %}
+
+                    </div>
+
+                </div>
+
+                <div class="row">
+
+                    <div class="col-xxs-16 col-sm-8">
+
+                        {% page_menu "pages/menus/footer_vertical.html" %}
+
+                    </div>
+
+                    <div class="col-xxs-16 col-sm-8">
+
+                        {% for link in host_organization.links.all %}
+                            <a class="footer__follow-link {{ link.link_type.slug }}" href="{{ link.url }}" target="_blank" title="{% trans 'Follow us on' %} {{ link.title }}"><i class="fa fa-{{ link.link_type.slug }}{% if link.link_type.fa_option %}-{{ link.link_type.fa_option }}{% endif %}"></i></a>
+                        {% endfor %}
+
+                    </div>
+
+                </div>
+
             </div>
+
         </div>
 
+        {% comment %}
+            Additional menu
+        {% endcomment %}
         <div class="row">
-            <div class="col-sm-10 col-sm-push-1">
-                <div class="footer__separator footer__seprator--small"></div>
+            <div class="col-xxs-16 col-sm-12 col-sm-push-1 tac">
+                {% page_menu "pages/menus/footer_horizontal.html" %}
             </div>
         </div>
 
+        {% comment %}
+            Copyright
+        {% endcomment %}
         <div class="row">
-            <div class="col-xxs-12 col-xs-8 col-sm-7 col-sm-push-1">
-                {% page_menu "pages/menus/footer_horizontal.html" %}
-            </div>
-            <div class="col-xxs-12 col-xs-4 col-sm-3 col-sm-push-1 tar-xs tal-xxs">
+            <div class="col-xxs-16 col-sm-12 col-sm-push-1 tac">
                 Copyright &copy; {% current_year %} {{ host_organization.name }}. {% trans "All rights reserved" %}.
             </div>
         </div>

diff --git a/app/templates/index.html b/app/templates/index.html
index 121ce8cde2f24220e3812046ce92543de2da4b18..38313b9c11773dba928ff850b470de24ce8ae99b 100644 (file)
--- a/app/templates/index.html
+++ b/app/templates/index.html
@@ -11,12 +11,6 @@
 {% endblock %}
 {% endspaceless %}
 
-{% block breadcrumb_menu %}
-    <li class="active">{% trans "Home" %}</li>
-{% endblock %}
-
-{% block content_header %}{% endblock %}
-
 {% block main %}
 
     <div class="home-mobile-nav">
@@ -25,42 +19,6 @@
 
     {% include "home/inc/slider.html" %}
 
-    <ul class="home__menu">
-      <li class="home__menu-item">
-          <a class="active" href="#" title="{% trans "News Headlines" %}">{% trans "News Headlines" %}</a>
-      </li>
-      <li class="home__menu-item">
-          <a href="#" title="{% trans "Magazine" %}">{% trans "Magazine" %}</a>
-          <div class="home__shutter">
-              <div class="home__shutter-content">
-                  <div class="container-fluid tal">
-                      {% page_menu "pages/menus/magazine.html" %}
-                  </div>
-              </div>
-          </div>
-      </li>
-      <li class="home__menu-item">
-          <a href="#" title="{% trans "Brief" %}">{% trans "Briefs" %}</a>
-          <div class="home__shutter">
-              <div class="home__shutter-content">
-                  <div class="container-fluid tal">
-                      {% include "magazine/brief/brief_list.html" %}
-                  </div>
-              </div>
-          </div>
-      </li>
-      <li class="home__menu-item">
-          <a href="{% url 'organization-playlist-list' %}" title="{% trans "Media" %}">{% trans "Medias" %}</a>
-          <div class="home__shutter">
-              <div class="home__shutter-content">
-                  <div class="container-fluid tal">
-                      {% include "media/inc/playlist_shutter.html" %}
-                  </div>
-              </div>
-          </div>
-      </li>
-    </ul>
-
     {% include "home/inc/body.html" %}
 
     <div class="home-mobile-subnav">