Merge branch 'master' into 'master'

User Documentation Update

See merge request flectra-hq/flectra!41

doc/_extensions/flectra_ext/layout.html

@@ -22,7 +22,8 @@
 {%- block htmltitle -%}
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link href="https://fonts.googleapis.com/css?family=Work+Sans:500,600" rel="stylesheet">
+<link href="https://fonts.googleapis.com/css?family=Work+Sans:500,600"
+      rel="stylesheet">
 {{ super() }}
 {%- endblock -%}
 
@@ -41,6 +42,7 @@
 
     ga('create', '{{ google_analytics_key }}', 'auto');
     ga('send','pageview');
+
 </script>
 {%- endif -%}
 {%- endblock -%}
@@ -57,7 +59,10 @@
     <nav class="navbar o_sub_nav">
         <div class="container">
             <div class="navbar-header visible-xs">
-            <button type="button" class="navbar-toggle collapsed text-left btn-block" data-toggle="collapse" data-target="#o_sub-menu" aria-expanded="false">
+                <button type="button"
+                        class="navbar-toggle collapsed text-left btn-block"
+                        data-toggle="collapse" data-target="#o_sub-menu"
+                        aria-expanded="false">
                     Navigate
                     <span class="mdi-hardware-keyboard-arrow-down pull-right"></span>
                 </button>
@@ -102,7 +107,9 @@
     {% set has_banner = 'has_banner' %}
     {% endif %}
     <figure class="card top {{ has_banner }}">
-      <span class="card-img" {% if meta['banner'] %}style="background-image: url('{{ pathto('_static/' + meta['banner'], True) }}');"{% endif %}></span>
+        <span class="card-img" {% if meta['banner'] %}style="background-image:
+        url('{{ pathto('_static/' + meta['banner'], True) }}');"{% endif
+        %}></span>
         <div class="container text-center">
             <h1> {{ meta.get('main-title', title) }} </h1>
         </div>
@@ -120,17 +127,21 @@
                 <div class="navbar-aside text-center">
                     {{ toc }}
                     {% if github_link %}
-              <p class="gith-container"><a href="{{ github_link(mode='edit') }}" class="gith-link">
+                    <p class="gith-container"><a
+                            href="{{ github_link(mode='edit') }}"
+                            class="gith-link">
                         Edit on GitLab
                     </a></p>
                     {% endif %}
                 </div>
             </aside>
             {% endif %}
-          <article class="doc-body {% if 'has-toc' in meta %}doc-toc{% endif %}{% if pagename in toc%}index-category{% endif %}">
+            <article
+                    class="doc-body {% if 'has-toc' in meta %}doc-toc{% endif %}{% if pagename in toc%}index-category{% endif %}">
                 {% endif %}
                 {% block body %} {% endblock %}
-          {% if pagename != master_doc %}</article>
+                {% if pagename != master_doc %}
+            </article>
         </div>
         {% endif %}
         <div id="mask"></div>
@@ -145,54 +156,201 @@
         <span class="bubble"></span>
         <ul class="list-group content">
             <li class="list-group-item ripple"><a>Cras justo odio</a></li>
-        <li class="list-group-item ripple"><a>Dapibus ac facilisis in</a></li>
+            <li class="list-group-item ripple"><a>Dapibus ac facilisis in</a>
+            </li>
             <li class="list-group-item ripple"><a>Morbi leo risus</a></li>
-        <li class="list-group-item ripple"><a>Porta ac consectetur ac</a></li>
+            <li class="list-group-item ripple"><a>Porta ac consectetur ac</a>
+            </li>
             <li class="list-group-item ripple"><a>Vestibulum at eros</a></li>
         </ul>
     </div>
 </div>
 <footer>
     <div id="footer" class="container">
-      <span class="o_logo o_logo_inverse center-block o_footer_logo"></span>
-      <div class="row">
-        <div class="col-sm-7 col-md-7 col-lg-6">
-          <div class="row">
-            <div class="col-xs-6 col-sm-4">
-              <span class="menu_title">Community</span>
-              <ul>
-                <li><a href="https://gitlab.com/flectra-hq/flectra">GitLab
-                </a></li>
-                <li><a href="https://flectrahq.com/download">Download</a></li>
-                <li class="divider"></li>
+        <div class="row mt48 mb48">
+            <div class="col-md-12 mb32">
+                <div class="col-md-3 col-sm-6">
+                    <h3 class="">
+                        Features
+                    </h3>
+                    <div class="">
+                        <ul class="pad0">
+                            <li>
+                                <a href="https://flectrahq.com/crm">
+                                    CRM
+                                </a>
+                            </li>
+                            <li>
+                                <a href="https://flectrahq.com/sales">
+                                    Sales
+                                </a>
+                            </li>
+                            <li>
+                                <a href="https://flectrahq.com/accounting">
+                                    Accounting
+                                </a>
+                            </li>
+                            <li>
+                                <a href="https://flectrahq.com/purchase">
+                                    Purchase
+                                </a>
+                            </li>
+                            <li>
+                                <a href="https://flectrahq.com/inventory">
+                                    Inventory
+                                </a>
+                            </li>
                         </ul>
                     </div>
-            <div class="col-xs-6 col-sm-4">
-              <span class="menu_title">About us</span>
-              <ul>
-                <li><a href="https://flectrahq.com/contactus">Contact</a></li>
-                <li class="divider" />
+                </div>
+                <div class="col-md-3 col-sm-6">
+                    <h3 class="">
+                        &nbsp;
+                    </h3>
+                    <div class="">
+                        <ul class="pad0">
+                            <li>
+                                <a href="https://flectrahq.com/human-resource">
+                                    Human Resource
+                                </a>
+                            </li>
+                            <li>
+                                <a href="https://flectrahq.com/cms">
+                                    CMS
+                                </a>
+                            </li>
+                            <li>
+                                <a href="https://flectrahq.com/point-of-sale">
+                                    Point Of Sale
+                                </a>
+                            </li>
+                            <li>
+                                <a href="https://flectrahq.com/manufacturing">
+                                    Manufacturing
+                                </a>
+                            </li>
+                            <li>
+                                <a href="https://flectrahq.com/project-management">
+                                    Project Management
+                                </a>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+                <div class="col-md-3 col-sm-6">
+                    <h3 class="">
+                        Services
+                    </h3>
+                    <div class="">
+                        <ul class="pad0">
+                            <li>
+                                <a href="https://flectrahq.com/flectra-erp-implementation">
+                                    Implementation
+                                </a>
+                            </li>
+                            <li>
+                                <a href="https://flectrahq.com/flectra-erp-development">
+                                    Development
+                                </a>
+                            </li>
+                            <li>
+                                <a href="https://flectrahq.com/flectra-erp-support">
+                                    Support
+                                </a>
+                            </li>
+                            <li>
+                                <a href="https://flectrahq.com/flectra-erp-training">
+                                    Training
+                                </a>
+                            </li>
+                            <li>
+                                <a href="https://flectrahq.com/flectra-release-note-1-0">
+                                    Release Notes
+                                </a>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+                <div class="col-md-3 col-sm-6">
+                    <h3 class="">
+                        &nbsp;
+                    </h3>
+                    <div class="">
+                        <ul class="pad0">
+                            <li>
+                                <a href="https://doc.flectrahq.com/"
+                                   target="_blank">
+                                    Documentation
+                                </a>
+                            </li>
+                            <li>
+                                <a href="https://flectrahq.com/become-a-partner">
+                                    Become a partner
+                                </a>
+                            </li>
+                            <li>
+                                <a href="https://flectrahq.com/partners">
+                                    Partners
+                                </a>
+                            </li>
+                            <li>
+                                <a href="https://flectrahq.com/brand-assets">
+                                    Brand Assets
+                                </a>
+                            </li>
+                            <li>
+                                <a href="https://flectrahq.com/flectra-support-plan">
+                                    Support Plan
+                                </a>
+                            </li>
+                            <li>
+                                <a href="https://flectrahq.com/contactus">
+                                    Contact Us
+                                </a>
+                            </li>
                         </ul>
                     </div>
                 </div>
             </div>
-        <div class="col-sm-5 col-md-4 col-md-offset-1 col-lg-5 col-lg-offset-1">
-          <p>
-            <small>
-              Flectra is a suite of open source business apps that cover all your company needs: CRM, eCommerce, accounting, inventory, point of sale, project management, etc.
-              <br/><br/>
-              Flectra's unique value proposition is to be at the same time very easy to use and fully integrated.
-            </small>
-          </p>
+            <div class="col-md-12">
+                <hr>
+                <div class="social-btns text-center">
+                    <div class="">
+                        <a class="do-btn-round-outline facebook-footer btn"
+                           href="https://www.facebook.com/flectrahq/"
+                           target="_blank">
+                                <span>Facebook</span>
+                        </a>
+                        <a class="do-btn-round-outline twitter-footer btn"
+                           href="https://twitter.com/flectrahq"
+                           target="_blank">
+                                <span>Twitter</span>
+                        </a>
+                    </div>
+                </div>
+                <div class="text-center mt16 mb16 font-14px ext_page">
+                    <a href="https://flectrahq.com/trademarks" class="ml8 mr8">
+                        Trademarks
+                    </a>
+                    <a href="https://flectrahq.com/privacy-policy" class="ml8 mr8">
+                        Privacy Policy
+                    </a>
+                    <a href="https://flectrahq.com/disclaimer" class="ml8 mr8">
+                        Disclaimer
+                    </a>
+                </div>
             </div>
         </div>
     </div>
     <div class="o_footer_bottom">
         <div class="container">
             <div class="social-links pull-right">
-          <a href="https://www.facebook.com/flectrahq"><i class="fa fa-facebook"></i></a>
-          <a href="https://twitter.com/flectrahq"><i class="fa fa-twitter"></i></a>
-          <a href="mailto:info@flectra.com"><i class="fa fa-envelope"></i></a>
+                <a href="https://www.facebook.com/flectrahq"><i
+                        class="fa fa-facebook"></i></a>
+                <a href="https://twitter.com/flectrahq"><i
+                        class="fa fa-twitter"></i></a>
+                <a href="mailto:info@flectra.com"><i
+                        class="fa fa-envelope"></i></a>
             </div>
         </div>
     </div>

doc/_extensions/flectra_ext/static/components.less

@@ -395,7 +395,7 @@ blockquote {
     font-size: 0.8em;
     font-weight: @fw_semibold;
     color: darken(@brand-primary, 30%);
-    background-color: lighten(@brand-primary, 50%);
+    background-color: #bfe2ff;
 }
 
 .btn {

doc/_extensions/flectra_ext/static/doc.js

@@ -129,8 +129,9 @@
                 var half_cols_selector = '.tutorials,.api';
 
                 $main.find("#index .index-tree").find(half_cols_selector)
-                    .wrap('<div class="o_half_col col-sm-6"/>')
-                    .find('.col-md-3').removeClass('col-md-3 col-sm-6').addClass('col-sm-12 col-md-6');
+                    .wrap('<div class="o_half_col col-sm-12"/>')
+                    .find('.col-md-3').removeClass('col-md-3 col-sm-6')
+                    .addClass('col-sm-12 col-md-3');
 
                 var half_cols_els = $main.find(".o_half_col");
                 for(var i = 0; i < half_cols_els.length; i+=2) {

doc/_extensions/flectra_ext/static/fonts/Rubik/OFL.txt

@@ -0,0 +1,93 @@
+Copyright 2015 The Rubik Project Authors,
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

doc/_extensions/flectra_ext/static/style.css

@@ -5,7 +5,7 @@
  */
 /*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
 html {
-  font-family: sans-serif;
+  font-family:'Rubik', sans-serif;
   -ms-text-size-adjust: 100%;
   -webkit-text-size-adjust: 100%;
 }
@@ -253,15 +253,19 @@ th {
   }
 }
 @font-face {
-  font-family: 'Glyphicons Halflings';
+  font-family: 'Rubik';
   src: url('../fonts/glyphicons-halflings-regular.eot');
   src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
 }
+@font-face {
+  font-family: 'Rubik';
+  src: url('../fonts/Rubik/Rubik-Medium.ttf') format('truetype');
+}
 .glyphicon {
   position: relative;
   top: 1px;
   display: inline-block;
-  font-family: 'Glyphicons Halflings';
+  font-family:'Rubik', sans-serif;
   font-style: normal;
   font-weight: normal;
   line-height: 1;
@@ -1071,7 +1075,7 @@ html {
   -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
 }
 body {
-  font-family: -apple-system, system-ui, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+  font-family:'Rubik', sans-serif;
   font-size: 16px;
   line-height: 1.42857143;
   color: #373e42;
@@ -1091,7 +1095,7 @@ a {
 }
 a:hover,
 a:focus {
-  color: #926485;
+  color: #c2e2fc;
   text-decoration: none;
 }
 a:focus {
@@ -1174,7 +1178,7 @@ h6,
 .h4,
 .h5,
 .h6 {
-  font-family: -apple-system, system-ui, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+  font-family:'Rubik', sans-serif;
   font-weight: 400;
   line-height: 1.1;
   color: #21313a;
@@ -3410,7 +3414,7 @@ fieldset[disabled] .btn-link {
 }
 .btn-link:hover,
 .btn-link:focus {
-  color: #926485;
+  color: #c2e2fc;
   text-decoration: none;
   background-color: transparent;
 }
@@ -4728,7 +4732,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
 .pagination > li > a:focus,
 .pagination > li > span:focus {
   z-index: 2;
-  color: #926485;
+  color: #c2e2fc;
   background-color: #F2F2F2;
   border-color: #ddd;
 }
@@ -5964,7 +5968,7 @@ button.close {
   position: absolute;
   z-index: 1070;
   display: block;
-  font-family: -apple-system, system-ui, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+  font-family:'Rubik', sans-serif;
   font-style: normal;
   font-weight: normal;
   letter-spacing: normal;
@@ -6082,7 +6086,7 @@ button.close {
   display: none;
   max-width: 276px;
   padding: 1px;
-  font-family: -apple-system, system-ui, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+  font-family:'Rubik', sans-serif;
   font-style: normal;
   font-weight: normal;
   letter-spacing: normal;
@@ -6350,7 +6354,7 @@ button.close {
   width: 20px;
   height: 20px;
   line-height: 1;
-  font-family: serif;
+  font-family:'Rubik', sans-serif;
 }
 .carousel-control .icon-prev:before {
   content: '\2039';
@@ -9117,8 +9121,8 @@ button.close {
   background-position: 0 0;
   background-repeat: no-repeat;
   display: inline-block;
-  width: 94.05px;
-  height: 30px;
+  width: 200px;
+  height: 90px;
   background-size: auto 30px;
 }
 .o_logo.center-block,
@@ -9546,12 +9550,12 @@ article.doc-body .code-fields ul em {
   font-weight: 600;
 }
 .card-img {
-  background: #75526b;
-  background: -webkit-linear-gradient(99deg, #875A7B 10%, #62495B 90%);
-  background: -moz-linear-gradient(99deg, #875A7B 10%, #62495B 90%);
-  background: -ms-linear-gradient(99deg, #875A7B 10%, #62495B 90%);
-  background: -o-linear-gradient(99deg, #875A7B 10%, #62495B 90%);
-  background: linear-gradient(99deg, #875A7B 10%, #62495B 90%);
+    background: #2396f5;
+    background: -webkit-linear-gradient(99deg, #2396f5 10%, #0a599a 90%);
+    background: -moz-linear-gradient(99deg, #2396f5 10%, #0a599a 90%);
+    background: -ms-linear-gradient(99deg, #2396f5 10%, #0a599a 90%);
+    background: -o-linear-gradient(99deg, #2396f5 10%, #0a599a 90%);
+    background: linear-gradient(99deg, #2396f5 10%, #0a599a 90%);
     position: absolute;
     top: 0;
     left: auto;
@@ -9629,7 +9633,7 @@ article.doc-body .code-fields ul em {
   font-weight: 300;
   font-size: 1em;
   color: white;
-  line-height: 0.9;
+  line-height: 4;
 }
 .card.top.has_banner {
   background: #282F33;
@@ -9670,7 +9674,7 @@ main .alert h3.alert-title {
   line-height: 1em;
   margin: 0 0 5px;
   font-weight: bold;
-  font-family: -apple-system, system-ui, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+  font-family:'Rubik', sans-serif;
   color: #438fa5;
 }
 main .alert h3.alert-title:before {
@@ -9794,12 +9798,12 @@ span.menuselection {
   background: transparent;
 }
 blockquote {
-  font-family: Georgia, "Times New Roman", Times, serif;
+  font-family:'Rubik', sans-serif;
   font-weight: 600;
   font-style: italic;
 }
 blockquote footer {
-  font-family: -apple-system, system-ui, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+  font-family:'Rubik', sans-serif;
   background: transparent;
   text-align: left;
   color: #373e42;
@@ -9819,7 +9823,7 @@ code {
   font-size: 0.8em;
   font-weight: 600;
   color: #0a352d;
-  background-color: #def9f4;
+  background-color: #bfe2ff;
 }
 .btn {
   border-radius: 0;
@@ -10124,6 +10128,7 @@ article.doc-toc .toctree-wrapper > ul > li > span {
 @media screen and (min-width: 992px) {
   #wrap.index > .card.top {
     padding: 10% 0 2%;
+    min-height: 350px;
   }
 }
 #wrap.index > main.index {
@@ -10135,13 +10140,13 @@ article.doc-toc .toctree-wrapper > ul > li > span {
 }
 main.index .toc-section h2 {
   padding: 0 0 4px;
-  border-bottom: 1px solid #F2F2F2;
+  border-bottom: 1px solid #cecece;
   margin: 1.4em 0 0.8em;
-  font-size: 16px;
-  font-family: -apple-system, system-ui, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+  font-size: 20px;
+  font-family:'Rubik', sans-serif;
   letter-spacing: 0;
   font-weight: bold;
-  color: #888888;
+  color: #333;
 }
 main.index .card {
   border-radius: 4px;
@@ -10219,11 +10224,11 @@ main.index .card figcaption {
 .o_main_header {
   position: fixed;
   width: 100%;
-  height: 50px;
+  height: 100px;
   z-index: 2;
   background-color: rgba(255, 255, 255, 0.6);
   color: #2b3134;
-  font-family: "Work Sans", sans-serif;
+  font-family:'Rubik', sans-serif;
   font-size: 12px;
   -webkit-transition: all 0.2s ease;
   -o-transition: all 0.2s ease;
@@ -10286,12 +10291,7 @@ main.index .card figcaption {
   color: #273239;
 }
 .o_main_header > .o_main_header_main .o_logo {
-  //margin: 15px 0;
- // width: 63px;
-  //height: 20px;
   margin: 5px 0;
-    width: 7%;
-    height: 75%;
   background-size: cover;
 }
 .o_main_header > .o_main_header_main > .o_primary_nav {
@@ -10375,13 +10375,13 @@ main.index .card figcaption {
   transform: rotate(-45deg);
 }
 .o_main_header > .o_main_header_main > .o_primary_nav .dropdown.open > a {
-  color: #9E588B !important;
+  color: #bfe2ff !important;
   font-weight: 600;
 }
 .o_main_header > .o_main_header_main > .o_primary_nav .dropdown.open > a::before,
 .o_main_header > .o_main_header_main > .o_primary_nav .dropdown.open > a::after {
-  background-color: #9E588B !important;
-  box-shadow: 0 1px 1px rgba(158, 88, 139, 0.1);
+  background-color: #bfe2ff !important;
+  box-shadow: 0 1px 1px rgba(191, 226, 255, 0.1);
   right: 3.53553391px;
 }
 .o_main_header > .o_main_header_main > .o_primary_nav .dropdown.open > a::before {
@@ -10881,7 +10881,7 @@ main.index .card figcaption {
   -webkit-transition: 0.3s background-color;
   -o-transition: 0.3s background-color;
   transition: 0.3s background-color;
-  background-color: rgba(255, 255, 255, 0.05);
+  background-color: rgba(255, 255, 255, 0.3);
   border-color: rgba(255, 255, 255, 0.1);
 }
 .o_main_header.o_inverted:not(.o_scrolled) > .o_sub_nav .nav > li > a,
@@ -10900,7 +10900,7 @@ main.index .card figcaption {
   }
   .o_main_header.o_has_sub_nav.o_scrolled {
     position: fixed;
-    top: -51px;
+    top: -104px;
   }
   .o_main_header.o_inverted {
     background-color: transparent;
@@ -11235,7 +11235,6 @@ body > footer .o_footer_bottom {
   background-color: #21272b;
   color: #dcddde;
   padding: 1em 0;
-  margin-top: 3em;
 }
 body > footer .o_footer_bottom a {
   opacity: 0.6;
@@ -11248,6 +11247,63 @@ body > footer .o_footer_bottom a:hover {
 body > footer .o_footer_bottom .social-links .fa {
   margin-left: 20px;
 }
+
+body > footer a{
+    font-family:'Rubik', sans-serif;
+}
+body > footer h1,
+body > footer h2,
+body > footer h3,
+body > footer h4,
+body > footer h5,
+body > footer h6{
+    color:#fff;
+}
+body > footer ul li {
+    font-size: 14px;
+    list-style-type: none;
+    line-height: 2;
+}
+.mb16 {
+    margin-bottom: 16px;
+}
+.mt16 {
+    margin-top: 16px;
+}
+.mb32 {
+    margin-bottom: 32px;
+}
+.mb48 {
+    margin-bottom: 48px;
+}
+.mt48 {
+    margin-top: 48px;
+}
+.social-btns .facebook-footer {
+    background: #3b5998;
+    color: #fff;
+    font-size: 14px;
+    padding: 0 25px;
+    height: 40px;
+    width: 126px;
+    line-height: 38px;
+}
+.social-btns .twitter-footer {
+    background: #00aced;
+    color: #fff;
+    font-size: 14px;
+    padding: 0 25px;
+    height: 40px;
+    width: 126px;
+    line-height: 38px;
+}
+.mr8 {
+    margin-right: 8px;
+}
+.ml8 {
+    margin-left: 8px;
+}
+
 aside {
   position: relative;
   min-height: 1px;
@@ -11269,7 +11325,7 @@ aside {
 .navbar-aside {
   position: relative;
   overflow: hidden;
-  font-family: -apple-system, system-ui, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+  font-family:'Rubik', sans-serif;
   font-size: 0.85em;
   line-height: 1.5;
   overflow-y: auto;
@@ -11314,7 +11370,7 @@ aside {
   display: inline-block;
   position: relative;
   margin: 10px 0;
-  font-family: -apple-system, system-ui, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+  font-family:'Rubik', sans-serif;
 }
 .navbar-aside .gith-container .gith-link:hover {
   color: #21313a;
@@ -11433,7 +11489,7 @@ aside {
 .navbar-aside > ul > li.active > a,
 .navbar-aside > ul > li.active:focus > a,
 .navbar-aside > ul > li.active:hover > a {
-  border-left: 3px solid #21b799;
+  border-left: 3px solid #2fa2dc;
 }
 .navbar-aside > ul > li.active.parent + li {
   box-shadow: 0 -3px 5px -4px rgba(40, 47, 51, 0.4);
@@ -11678,7 +11734,7 @@ aside {
   .o_main_header > .o_sub_nav #o_sub-menu .o_breadcrumb {
     background-color: transparent;
     padding: 0;
-    margin: 0 0 0 -15px;
+    margin: 0px;
     height: 38px;
     line-height: 38px;
   }

doc/_extensions/flectra_ext/static/variables.less

@@ -10,7 +10,7 @@
 // ==============================================
 
 @flectra-brand-optional     : #21b799;
-@flectra-brand-primary      : #9E588B;
+@flectra-brand-primary      : #bfe2ff;
 
 //== Flectra Colours
 @o-violet-dark           : #875A7B;

doc/_extensions/gitlab_link.py

@@ -7,7 +7,7 @@ from werkzeug import urls
 from flectra.tools import pycompat
 
 """
-* adds github_link(mode) context variable: provides URL (in relevant mode) of
+* adds gitlab_link(mode) context variable: provides URL (in relevant mode) of
   current document on github
 * if sphinx.ext.linkcode is enabled, automatically generates github linkcode
   links (by setting config.linkcode_resolve)
@@ -15,30 +15,30 @@ from flectra.tools import pycompat
 Settings
 ========
 
-* ``github_user``, username/organisation under which the project lives
-* ``github_project``, name of the project on github
-* (optional) ``version``, github branch to link to (default: master)
+* ``gitlab_user``, username/organisation under which the project lives
+* ``gitlab_project``, name of the project on gitlab
+* (optional) ``version``, gitlab branch to link to (default: master)
 
 Notes
 =====
 
 * provided ``linkcode_resolve`` only supports Python domain
-* generates https github links
+* generates https gitlab links
 * explicitly imports ``flectra``, so useless for anyone else
 """
 
 def setup(app):
-    app.add_config_value('github_user', None, 'env')
-    app.add_config_value('github_project', None, 'env')
+    app.add_config_value('gitlab_user', None, 'env')
+    app.add_config_value('gitlab_project', None, 'env')
     app.connect('html-page-context', add_doc_link)
 
     def linkcode_resolve(domain, info):
-        """ Resolves provided object to corresponding github URL
+        """ Resolves provided object to corresponding gitlab URL
         """
         # TODO: js?
         if domain != 'py':
             return None
-        if not (app.config.github_user and app.config.github_project):
+        if not (app.config.gitlab_user and app.config.gitlab_project):
             return None
 
         module, fullname = info['module'], info['fullname']
@@ -68,18 +68,18 @@ def setup(app):
         import flectra
         # FIXME: make finding project root project-independent
         project_root = os.path.join(os.path.dirname(flectra.__file__), '..')
-        return make_github_link(
+        return make_gitlab_link(
             app,
             os.path.relpath(obj_source_path, project_root),
             line)
     app.config.linkcode_resolve = linkcode_resolve
 
-def make_github_link(app, path, line=None, mode="blob"):
+def make_gitlab_link(app, path, line=None, mode="blob"):
     config = app.config
 
     urlpath = "/{user}/{project}/{mode}/{branch}/{path}".format(
-        user=config.github_user,
-        project=config.github_project,
+        user=config.gitlab_user,
+        project=config.gitlab_project,
         branch=config.version or 'master',
         path=path,
         mode=mode,
@@ -93,8 +93,8 @@ def make_github_link(app, path, line=None, mode="blob"):
     ))
 
 def add_doc_link(app, pagename, templatename, context, doctree):
-    """ Add github_link function linking to the current page on github """
-    if not app.config.github_user and app.config.github_project:
+    """ Add gitlab_link function linking to the current page on gitlab """
+    if not app.config.gitlab_user and app.config.gitlab_project:
         return
 
     # FIXME: find other way to recover current document's source suffix
@@ -103,5 +103,5 @@ def add_doc_link(app, pagename, templatename, context, doctree):
     source_suffix = app.config.source_suffix
     source_suffix = source_suffix if isinstance(source_suffix, pycompat.string_types) else source_suffix[0]
     # can't use functools.partial because 3rd positional is line not mode
-    context['github_link'] = lambda mode='edit': make_github_link(
+    context['github_link'] = lambda mode='edit': make_gitlab_link(
         app, 'doc/%s%s' % (pagename, source_suffix), mode=mode)

doc/conf.py

@@ -26,7 +26,7 @@ extensions = [
     'sphinx.ext.intersphinx',
     'sphinx.ext.linkcode',
     'autojsdoc.ext',
-    'github_link',
+    'gitlab_link',
     'flectra_ext',
     'html_domain',
     'exercise_admonition',
@@ -95,7 +95,7 @@ pygments_style = 'flectra'
 # a list of builtin themes.
 html_theme = 'flectra_ext'
 
-flectra_cover_default = 'banners/installing_flectra.jpg'
+flectra_cover_default = 'banners/flectra_modules.jpg'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -184,8 +184,8 @@ intersphinx_mapping = {
     'django': ('https://django.readthedocs.org/en/latest/', None),
 }
 
-github_user = 'flectra'
-github_project = 'flectra'
+gitlab_user = 'flectra-hq'
+gitlab_project = 'flectra'
 
 # monkeypatch PHP lexer to not require <?php
 from sphinx.highlighting import lexers