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

src/component/Account/MenuSubComponent.jsx

@@ -6,7 +6,11 @@ export const Navbar = props => {
     <nav className='account__userpreference__menu navbar d-flex align-items-start'>
 
       <div className='account__userpreference__menu__responsive d-lg-none'>
-        <i className='fa fa-bars' />
+        <button className='hamburger hamburger--spring account__userpreference__menu__responsive__hamburger' type='button'>
+          <span className='hamburger-box account__userpreference__menu__responsive__hamburger__box'>
+            <span className='hamburger-inner account__userpreference__menu__responsive__hamburger__box__icon'></span>
+          </span>
+        </button>
       </div>
 
       <ul className='account__userpreference__menu__list nav flex-column'>

src/container/Dashboard.jsx

@@ -294,7 +294,9 @@ class Dashboard extends Component {
                   <div className='dashboard__memberlist__btnadd'>
                     <div className='dashboard__memberlist__btnadd__button'>
                       <div className='dashboard__memberlist__btnadd__button__avatar'>
-                        <img src={listMemberBtn} alt='avatar' />
+                        <div className='dashboard__memberlist__btnadd__button__avatar__icon'>
+                          <i className='fa fa-plus' />
+                        </div>
                       </div>
                       <div className='dashboard__memberlist__btnadd__button__text'>
                          Ajouter un membre
@@ -303,7 +305,8 @@ class Dashboard extends Component {
                   </div>
 
                   <form className='dashboard__memberlist__addmember'>
-                    <input type='text' className='dashboard__memberlist__addmember__name form-control' placeholder='Name' />
+                    <label className='dashboard__memberlist__addmember__label' for='addmember'>Indiqué le nom de l'utilisateur</label>
+                    <input type='text' id='addmember' 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 btn-primary dropdown-toggle' type='button' id='dropdownMenuButton' data-toggle='dropdown' aria-haspopup='true' aria-expanded='false'>

src/css/AccountPage.styl

@@ -161,11 +161,18 @@ settingText()
       &__menu
         justify-content center
         margin-bottom 25px
-        border-radius 30px
+        border-radius 50%
         width 60px
         min-height 60px
         &__responsive
-          align-self center
+          &__hamburger
+            margin 18px 0 0 10px
+            padding 0
+            &__box
+              &:focus
+                outline none
+              &__icon, &__icon::before, &__icon::after
+                width 30px
         &__list
           display none
       &__setting

src/css/Dashboard.styl

@@ -160,11 +160,18 @@ bgandcolor()
         display flex
         align-items center
         &__avatar
+          display flex
+          justify-content center
+          align-items center
           margin-right 20px
+          border 2px dashed grey
+          border-radius 50%
+          width 50px
+          height 50px
           cursor pointer
-          img
-            width 50px
-            height 50px
+          &__icon
+            color grey
+            font-size 25px
         &__text
           font-size 18px
           color blue
@@ -186,7 +193,7 @@ bgandcolor()
         padding 10px 25px
         width auto
       &__role
-        margin-bottom 20px
+        margin-bottom 90px
         &__dropdown
           &__button
             border 1px solid blue
@@ -309,7 +316,7 @@ bgandcolor()
     &__calltoaction
       justify-content center
       &__button
-        margin-right 0
+        margin 10px
     &__activity
       margin 25px 0
       width 100%
@@ -329,6 +336,8 @@ bgandcolor()
       &__list
         height auto
         overflow-Y visible
+        &__item:nth-last-child(1)
+          border-bottom 1px solid grey
       &__btnadd
         border-top 0
     &__webdav

src/css/Generic.styl

@@ -61,6 +61,7 @@
   height 100%
 
 .dropdownCreateBtn
+  margin-left 10px
   &__label
     padding 10px 65px
     background-color green

src/css/Timeline.styl

@@ -1,143 +0,0 @@
-.timeline
-  display flex
-  flex-direction column
-  margin 10px
-  border-radius 10px
-  height 100%
-  &__header
-    border-radius 10px 10px 0 0
-    padding 15px
-    text-align center
-    font-size 20px
-    color darkGrey
-    background-color grey-hover
-  &__messagelist
-    flex 1 1 0
-    margin-bottom 0
-    padding-left 0
-    border-bottom 1px solid grey
-    background-color off-white
-    overflow-Y auto
-    list-style none
-    &__item
-      padding 0 25px 20px 35px
-      &__avatar
-        position relative
-        top 43px
-        left -25px
-        width 45px
-        height 45px
-      &__createhour
-        margin-left 30px
-        opacity 0.7
-        font-size 14px
-      &__content
-        border 1px solid grey
-        border-radius 5px
-        padding 15px
-        background-color off-white
-        font-size 15px
-        z-index -1
-    &__version
-      display flex
-      justify-content space-between
-      margin-top 40px
-      padding 10px 15px
-      width 100%
-      background-color lightGrey
-      &__btn
-        padding 5px 25px
-        border-radius 5px
-        width 145px
-        color white
-        font-size 17px
-        & > i
-          margin-right 10px
-          color darkGrey
-          font-size 22px
-      &__date
-        color fontColor
-        font-size 17px
-        margin auto 0
-  &__texteditor
-    padding 2px
-    &__simpletext
-      display none
-      width 70%
-      margin-right 35px
-      &__icon
-        cursor pointer
-    &__wysiwyg
-      display block
-      & > textarea
-        width 100%
-        height 130px
-    &__submit
-      margin 10px 0
-      &__btn
-        display flex
-        cursor pointer
-        &:hover , &:focus
-          box-shadow shadow-all-btn
-        &__icon
-          margin-left 10px
-
-.sended
-  .timeline__messagelist__item__content
-    margin-right 25%
-
-.received
-  .timeline__messagelist__item
-    &__avatar
-      left 93%
-    &__createhour
-      text-align right
-      margin-right 50px
-    &__content
-      margin-left 25%
-      color white
-
-/**** MEDIA 992px & 1199px ****/
-
-@media (min-width: min-lg) and (max-width: max-lg)
-
-  .timeline__messagelist__item
-    margin-right 55px
-
-  .received
-    .timeline__messagelist__item
-      &__avatar
-        left 96%
-
-/**** MEDIA 768px & 991px ****/
-
-@media (min-width: min-md) and (max-width: max-md)
-
-  .timeline__messagelist__item
-    margin-right 55px
-
-  .received
-    .timeline__messagelist__item
-      &__avatar
-        left 96%
-
-/**** MEDIA 576px & 767px ****/
-
-@media (min-width: min-sm) and (max-width: max-sm)
-
-  .timeline__messagelist__item
-    margin-right 35px
-
-  .received
-    .timeline__messagelist__item
-      &__avatar
-        left 94%
-
-/**** MEDIA 575px ****/
-
-@media (max-width: max-xs)
-
-  .received
-    .timeline__messagelist__item
-      &__avatar
-        left 90%

src/css/index.styl

@@ -1,4 +1,4 @@
-body
+>body
   font-family 'Quicksand', sans-serif
 html, body, #content
   height 100%