Merge branch 'alexicauvin' of github.com:tracim/tracim_front

src/container/Dashboard.jsx

@@ -49,7 +49,7 @@ class Dashboard extends Component {
                 </div>
 
                 <div className='dashboard__userstatut__notification__subscribe dropdown'>
-                  <button className='dashboard__userstatut__notification__subscribe__btn btn btn-secondary dropdown-toggle' type='button' id='dropdownMenuButton' data-toggle='dropdown' aria-haspopup='true' aria-expanded='false'>
+                  <button className='dashboard__userstatut__notification__subscribe__btn btn btn-primary dropdown-toggle' type='button' id='dropdownMenuButton' data-toggle='dropdown' aria-haspopup='true' aria-expanded='false'>
                     Abonné(e)
                   </button>
                   <div className='dashboard__userstatut__notification__subscribe__submenu dropdown-menu'>
@@ -127,7 +127,7 @@ class Dashboard extends Component {
                   Activité récente
                 </div>
 
-                <div className='dashboard__activity__header__allread btn'>
+                <div className='dashboard__activity__header__allread btn btn-primary'>
                   Tout marquer comme lu
                 </div>
               </div>
@@ -187,7 +187,7 @@ class Dashboard extends Component {
                 </div>
 
                 <div className='dashboard__activity__more d-flex flex-row-reverse'>
-                  <div className='dashboard__activity__more__btn btn'>
+                  <div className='dashboard__activity__more__btn btn btn-primary'>
                     Voir plus
                   </div>
                 </div>
@@ -302,7 +302,7 @@ class Dashboard extends Component {
                   <input type='text' className='dashboard__memberlist__addmember__name form-control' placeholder='Name' />
                   <div className='dashboard__memberlist__addmember__role'>
                     <div className='dashboard__memberlist__addmember__role__dropdown dropdown'>
-                      <button className='dashboard__memberlist__addmember__role__dropdown__button btn dropdown-toggle' type='button' id='dropdownMenuButton' data-toggle='dropdown' aria-haspopup='true' aria-expanded='false'>
+                      <button className='dashboard__memberlist__addmember__role__dropdown__button btn btn-primary dropdown-toggle' type='button' id='dropdownMenuButton' data-toggle='dropdown' aria-haspopup='true' aria-expanded='false'>
                         Rôle du membre
                       </button>
                       <div className='dashboard__memberlist__addmember__role__dropdown__submenu dropdown-menu'>

src/css/Dashboard.styl

@@ -49,23 +49,15 @@ bgandcolor()
       font-size 18px
       &__btn
         btnNotification()
-        bgandcolor()
         cursor pointer
-        &:hover , focus
-          hoverfocus()
       &__subscribe
         display none
         &__btn
           btnNotification()
-          bgandcolor()
-          &:hover,&:focus
-            hoverfocus()
         &__submenu
           padding 0
           &__item
             padding 10px
-            &:hover,&:focus
-              hoverfocus()
   &__calltoaction
     flexwrap()
     margin 50px 0
@@ -102,13 +94,9 @@ bgandcolor()
       margin-bottom 20px
       height 44px
       &__allread
-        border 1px solid blue
         padding 10px 25px
-        color blue
         font-size 18px
         cursor pointer
-        &:hover, &:focus
-          hoverfocus()
     &__wrapper
       border 1px solid grey
       height 480px
@@ -131,12 +119,8 @@ bgandcolor()
     &__more
       &__btn
         margin 15px
-        border 1px solid blue
         padding 10px 25px
-        color blue
         cursor pointer
-        &:hover, &:focus
-          hoverfocus()
   &__memberlist
     margin 0 0 50px 0
     width 35%
@@ -208,11 +192,8 @@ bgandcolor()
             border 1px solid blue
             border-radius 10px
             padding 10px 25px
-            bgandcolor()
             &::after
               margin 10px 0 0 20px
-            &:hover,&:focus
-              hoverfocus()
           &__submenu
             padding 0
             &__item

src/css/Folder.styl

@@ -88,9 +88,6 @@ folderopen()
         &:hover > .folder__header__name__addbtn__text
           color white
         &__text
-          border 1px solid darkBlue
-          background-color transparent
-          color darkBlue
           font-size 17px
     &__contenttype
       display flex