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

frontend/src/component/common/Input/SubDropdownCreateButton.jsx

@@ -10,7 +10,10 @@ const SubDropdownCreateButton = props => {
         <div className='subdropdown__link dropdown-item' onClick={e => props.onClickCreateContent(e, props.idFolder, app.slug)} key={app.slug}>
           <div className={`subdropdown__link__${app.slug} d-flex align-items-center`}>
             <div className={`subdropdown__link__${app.slug}__icon mr-3`}>
-              <i className={`fa fa-fw fa-${app.faIcon}`} />
+              <i
+                className={`fa fa-fw fa-${app.faIcon}`}
+                style={{color: app.hexcolor}}
+              />
             </div>
             <div className='subdropdown__link__folder__text'>
               {app.creationLabel}

frontend/src/css/Dashboard.styl

@@ -256,19 +256,19 @@ coloricon()
     justify-content space-between
     flexwrap wrap
     &__webdav
-      margin-bottom 40px
+      margin 0 15px 40px 0
       &__btn
         width 300px
       &__information
-        width 550px
+        width 300px
     &__calendar
       margin-bottom 100px
       &__wrapperBtn
-        margin-right 300px
+        margin-right 290px
       &__btn
         width 300px
       &__information
-        width 550px
+        width 300px
 
 /**** MEDIAQUERIES *****/