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

src/component/Header/MenuActionListItem/DropdownLang.jsx

@@ -8,7 +8,7 @@ const DropdownLang = props => {
       <div className='header__menu__rightside__itemlanguage__languagedropdown dropdown'>
         <button
           type='button'
-          className='languagedropdown__btnlanguage btnnavbar btn btn-secondary dropdown-toggle'
+          className='languagedropdown__btnlanguage btnnavbar btn btn-outline-primary dropdown-toggle'
           id='headerDropdownMenuButton'
           data-toggle='dropdown'
           aria-haspopup='true'

src/component/Header/MenuActionListItem/Help.jsx

@@ -6,7 +6,7 @@ const Help = props => {
     <li className='header__menu__rightside__itemquestion'>
       <button
         type='button'
-        className='header__menu__rightside__itemquestion__btnquestion btnnavbar btn btn-primary'
+        className='header__menu__rightside__itemquestion__btnquestion btnnavbar btn btn-outline-primary'
         onClick={props.onClickHelp}
       >
         <i className='btnquestion__icon fa fa-question' />

src/component/Header/MenuActionListItem/MenuProfil.jsx

@@ -8,7 +8,7 @@ const MenuProfil = props => {
     ? (
       <li className='header__menu__rightside__itemprofil'>
         <div className='profilgroup dropdown'>
-          <button className='profilgroup__name btn btn-secondary dropdown-toggle' type='button' id='dropdownMenuButton' data-toggle='dropdown' aria-haspopup='true' aria-expanded='false'>
+          <button className='profilgroup__name btn btn-outline-primary dropdown-toggle' type='button' id='dropdownMenuButton' data-toggle='dropdown' aria-haspopup='true' aria-expanded='false'>
             <img className='profilgroup__name__imgprofil' src={props.user.avatar_url} />
             <div className='profilgroup__name__text'>
               {props.user.name}

src/component/Header/MenuActionListItem/Notification.jsx

@@ -7,7 +7,7 @@ const Notification = props => {
       <div className='header__menu__rightside__itemnotification__timeline dropdown'>
         <button
           type='button'
-          className='timeline__btnnotif btnnavbar btn btn-secondary dropdown-toggle'
+          className='timeline__btnnotif btnnavbar btn btn-outline-primary dropdown-toggle'
           id='headerNotificationBtn'
           data-toggle='dropdown'
           aria-haspopup='true'

src/component/Workspace/ContentItem.jsx

@@ -8,7 +8,7 @@ const ContentItem = props => {
   return (
     <div className={classnames('content', 'align-items-center', {'item-last': props.isLast}, props.customClass)} onClick={props.onClickItem}>
       <div className='content__type' style={{color: props.contentType.hexcolor}}>
-        <i className={`fa fa-${props.faIcon}`} />
+        <i className={`fa fa-fw fa-${props.faIcon}`} />
       </div>
 
       <div className='content__name'>
@@ -23,7 +23,7 @@ const ContentItem = props => {
 
       <div className={classnames('content__status d-flex align-items-center justify-content-start')} style={{color: status.hexcolor}}>
         <div className='content__status__icon d-block '>
-          <i className={`fa fa-${status.faIcon}`} />
+          <i className={`fa fa-fw fa-${status.fa_icon}`} />
         </div>
         <div className='content__status__text d-none d-xl-block'>
           {status.label}

src/container/Dashboard.jsx

@@ -538,7 +538,7 @@ class Dashboard extends React.Component {
                   <div>
                     <div className='dashboard__moreinfo__webdav__information genericBtnInfoDashboard__info'>
                       <div className='dashboard__moreinfo__webdav__information__text genericBtnInfoDashboard__info__text'>
-                        Lorem ipsum dolore dolore laborum exercitation et deserunt ad ullamco nostrud dolore magna in proident elit amet do eu ut officia anim magna dolore adipisicing aliqua qui reprehenderit laborum labore tempor consectetur ut pariatur deserunt nostrud.
+                        Retrouvez tous vos documents déposés en ligne directement sur votre ordinateur. Chaque fois qu'un document est déposé, celui-ci sera copié sur votre ordinateur. Consulter tous les documents d'un espace de travail sans passer par le logiciel.
                       </div>
 
                       <div className='dashboard__moreinfo__webdav__information__link genericBtnInfoDashboard__info__link'>
@@ -568,7 +568,7 @@ class Dashboard extends React.Component {
                     <div>
                       <div className='dashboard__moreinfo__calendar__information genericBtnInfoDashboard__info'>
                         <div className='dashboard__moreinfo__calendar__information__text genericBtnInfoDashboard__info__text'>
-                          Lorem ipsum dolore dolore laborum exercitation et deserunt ad ullamco nostrud dolore magna in proident elit amet do eu ut officia anim magna dolore adipisicing aliqua qui reprehenderit laborum labore tempor consectetur ut pariatur deserunt nostrud.
+                          Chaque espace de travail possède son propre calendrier indépendant des autres. Les groupes peuvent s’organiser avec ses propres deadlines, l’information est simplifiée et centralisée dans chaque espace de travail.
                         </div>
 
                         <div className='dashboard__moreinfo__calendar__information__link genericBtnInfoDashboard__info__link'>

src/css/ExtandedAction.styl

@@ -6,6 +6,3 @@
     .subdropdown
       &__item
         padding 10px
-        &__icon
-          .fa-pencil
-            color fontColor

src/css/Folder.styl

@@ -108,14 +108,6 @@ folderopen()
           &__text
             margin-right 40px
             font-size 17px
-            color fontColor
-            border-color secondColor
-            &:hover, &:focus, &:active
-              color off-white
-              border-color thirdColor
-              background-color thirdColor
-              box-shadow 0 0 1px 2px fifthColor
-              outline fifthColor
             &::after
               margin-left 20px
           &__subdropdown

src/css/Generic.styl

@@ -16,7 +16,8 @@ a
   &:hover, &:focus, &:active, &:visited, &:focus-within
     background-color hover-button
     border-color hover-button
-    box-shadow 0 0 1px 2px secondColor
+    box-shadow none
+    outline none
 
 .btn-outline-primary
   color fontColor
@@ -25,22 +26,29 @@ a
   &:hover, &:focus, &:active, &:visited, &:focus-within
     background-color hover-button
     border-color hover-button
-    box-shadow 0 0 1px 2px secondColor
+    box-shadow none
+    outline none
 
 .btn-primary.active, .btn-primary:active, .show>.btn-primary.dropdown-toggle
   background-color hover-button
   border-color hover-button
-  box-shadow 0 0 1px 2px secondColor
+  box-shadow none
 
 .btn-outline-primary.active, .btn-outline-primary:active, .show>.btn-outline-primary.dropdown-toggle
   background-color hover-button
   border-color hover-button
-  box-shadow 0 0 1px 2px secondColor
+  box-shadow none
+  outline none
 
 .dropdown-item
-  &:hover, &:focus, &:visited, &:focus-within
+  &:hover, &:focus
     background-color thirdColor
     color off-white
+    box-shadow none
+    outline none
+
+.btn.disabled, .btn:disabled
+  cursor not-allowed
 
 .sidebarpagecontainer
   display flex

src/css/Header.styl

@@ -75,11 +75,6 @@
             padding 0 5px
             background-color transparent
             cursor pointer
-            &:hover
-              background-color lightGrey
-            &:focus
-              box-shadow shadow-all-side-blue
-              background-color lightGrey
             &::after //bootstrap overrides
               vertical-align middle
               color darkGrey
@@ -105,7 +100,7 @@
             cursor pointer
             .setting__link
               padding 10px
-              color fontColor
+          //     // color fontColor
       &__itemnotification
         &__timeline
           margin-right 30px