Merge branch 'develop' of github.com:tracim/tracim_v2 into develop

Author: Skylsmoi

frontend/src/container/Dashboard.jsx

@@ -29,7 +29,7 @@ import UserStatus from '../component/Dashboard/UserStatus.jsx'
 import ContentTypeBtn from '../component/Dashboard/ContentTypeBtn.jsx'
 import RecentActivity from '../component/Dashboard/RecentActivity.jsx'
 import MemberList from '../component/Dashboard/MemberList.jsx'
-import MoreInfo from '../component/Dashboard/MoreInfo.jsx'
+// import MoreInfo from '../component/Dashboard/MoreInfo.jsx'
 
 class Dashboard extends React.Component {
   constructor (props) {
@@ -319,13 +319,18 @@ class Dashboard extends React.Component {
               />
             </div>
 
-            <MoreInfo
-              onClickToggleWebdav={this.handleToggleWebdavBtn}
-              displayWebdavBtn={state.displayWebdavBtn}
-              onClickToggleCalendar={this.handleToggleCalendarBtn}
-              displayCalendarBtn={state.displayCalendarBtn}
-              t={props.t}
-            />
+            { /*
+              AC - 11/09/2018 - not included in v2.0 roadmap
+
+              <MoreInfo
+                onClickToggleWebdav={this.handleToggleWebdavBtn}
+                displayWebdavBtn={state.displayWebdavBtn}
+                onClickToggleCalendar={this.handleToggleCalendarBtn}
+                displayCalendarBtn={state.displayCalendarBtn}
+                t={props.t}
+              />
+            */ }
+
           </PageContent>
         </PageWrapper>
       </div>

frontend/src/container/Login.jsx

@@ -2,8 +2,8 @@ import React from 'react'
 import { connect } from 'react-redux'
 import { withRouter, Redirect } from 'react-router'
 import { translate } from 'react-i18next'
-import LoginLogo from '../component/Login/LoginLogo.jsx'
-import LoginLogoImg from '../img/logoTracimWhite.svg'
+// import LoginLogo from '../component/Login/LoginLogo.jsx'
+// import LoginLogoImg from '../img/logoTracimWhite.svg'
 import Card from '../component/common/Card/Card.jsx'
 import CardHeader from '../component/common/Card/CardHeader.jsx'
 import CardBody from '../component/common/Card/CardBody.jsx'
@@ -113,7 +113,13 @@ class Login extends React.Component {
         <section className='loginpage primaryColorBg'>
           <div className='container-fluid'>
 
-            <LoginLogo customClass='loginpage__logo' logoSrc={LoginLogoImg} />
+            { /*
+              AC - 11/09/2018 - disable the logo to leave more space for the login form
+              <LoginLogo
+                customClass='loginpage__logo'
+                logoSrc={LoginLogoImg}
+              />
+            */ }
 
             <div className='row justify-content-center'>
               <div className='col-12 col-sm-11 col-md-8 col-lg-6 col-xl-4'>

frontend/src/css/Login.styl

@@ -11,7 +11,6 @@
     padding 50px 0
     width 170px
   &__connection
-    margin-bottom 50px
     border none
     box-shadow shadow-right
     border-radius 7px 7px 5px 5px