Browse Source

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

Skylsmoi 6 years ago
parent
commit
75f651d866

+ 1 - 1
src/component/Header/MenuActionListItem/DropdownLang.jsx View File

8
       <div className='header__menu__rightside__itemlanguage__languagedropdown dropdown'>
8
       <div className='header__menu__rightside__itemlanguage__languagedropdown dropdown'>
9
         <button
9
         <button
10
           type='button'
10
           type='button'
11
-          className='languagedropdown__btnlanguage btnnavbar btn btn-secondary dropdown-toggle'
11
+          className='languagedropdown__btnlanguage btnnavbar btn btn-outline-primary dropdown-toggle'
12
           id='headerDropdownMenuButton'
12
           id='headerDropdownMenuButton'
13
           data-toggle='dropdown'
13
           data-toggle='dropdown'
14
           aria-haspopup='true'
14
           aria-haspopup='true'

+ 1 - 1
src/component/Header/MenuActionListItem/Help.jsx View File

6
     <li className='header__menu__rightside__itemquestion'>
6
     <li className='header__menu__rightside__itemquestion'>
7
       <button
7
       <button
8
         type='button'
8
         type='button'
9
-        className='header__menu__rightside__itemquestion__btnquestion btnnavbar btn btn-primary'
9
+        className='header__menu__rightside__itemquestion__btnquestion btnnavbar btn btn-outline-primary'
10
         onClick={props.onClickHelp}
10
         onClick={props.onClickHelp}
11
       >
11
       >
12
         <i className='btnquestion__icon fa fa-question' />
12
         <i className='btnquestion__icon fa fa-question' />

+ 1 - 1
src/component/Header/MenuActionListItem/MenuProfil.jsx View File

8
     ? (
8
     ? (
9
       <li className='header__menu__rightside__itemprofil'>
9
       <li className='header__menu__rightside__itemprofil'>
10
         <div className='profilgroup dropdown'>
10
         <div className='profilgroup dropdown'>
11
-          <button className='profilgroup__name btn btn-secondary dropdown-toggle' type='button' id='dropdownMenuButton' data-toggle='dropdown' aria-haspopup='true' aria-expanded='false'>
11
+          <button className='profilgroup__name btn btn-outline-primary dropdown-toggle' type='button' id='dropdownMenuButton' data-toggle='dropdown' aria-haspopup='true' aria-expanded='false'>
12
             <img className='profilgroup__name__imgprofil' src={props.user.avatar_url} />
12
             <img className='profilgroup__name__imgprofil' src={props.user.avatar_url} />
13
             <div className='profilgroup__name__text'>
13
             <div className='profilgroup__name__text'>
14
               {props.user.name}
14
               {props.user.name}

+ 1 - 1
src/component/Header/MenuActionListItem/Notification.jsx View File

7
       <div className='header__menu__rightside__itemnotification__timeline dropdown'>
7
       <div className='header__menu__rightside__itemnotification__timeline dropdown'>
8
         <button
8
         <button
9
           type='button'
9
           type='button'
10
-          className='timeline__btnnotif btnnavbar btn btn-secondary dropdown-toggle'
10
+          className='timeline__btnnotif btnnavbar btn btn-outline-primary dropdown-toggle'
11
           id='headerNotificationBtn'
11
           id='headerNotificationBtn'
12
           data-toggle='dropdown'
12
           data-toggle='dropdown'
13
           aria-haspopup='true'
13
           aria-haspopup='true'

+ 2 - 2
src/component/Workspace/ContentItem.jsx View File

8
   return (
8
   return (
9
     <div className={classnames('content', 'align-items-center', {'item-last': props.isLast}, props.customClass)} onClick={props.onClickItem}>
9
     <div className={classnames('content', 'align-items-center', {'item-last': props.isLast}, props.customClass)} onClick={props.onClickItem}>
10
       <div className='content__type' style={{color: props.contentType.hexcolor}}>
10
       <div className='content__type' style={{color: props.contentType.hexcolor}}>
11
-        <i className={`fa fa-${props.faIcon}`} />
11
+        <i className={`fa fa-fw fa-${props.faIcon}`} />
12
       </div>
12
       </div>
13
 
13
 
14
       <div className='content__name'>
14
       <div className='content__name'>
23
 
23
 
24
       <div className={classnames('content__status d-flex align-items-center justify-content-start')} style={{color: status.hexcolor}}>
24
       <div className={classnames('content__status d-flex align-items-center justify-content-start')} style={{color: status.hexcolor}}>
25
         <div className='content__status__icon d-block '>
25
         <div className='content__status__icon d-block '>
26
-          <i className={`fa fa-${status.faIcon}`} />
26
+          <i className={`fa fa-fw fa-${status.fa_icon}`} />
27
         </div>
27
         </div>
28
         <div className='content__status__text d-none d-xl-block'>
28
         <div className='content__status__text d-none d-xl-block'>
29
           {status.label}
29
           {status.label}

+ 2 - 2
src/container/Dashboard.jsx View File

538
                   <div>
538
                   <div>
539
                     <div className='dashboard__moreinfo__webdav__information genericBtnInfoDashboard__info'>
539
                     <div className='dashboard__moreinfo__webdav__information genericBtnInfoDashboard__info'>
540
                       <div className='dashboard__moreinfo__webdav__information__text genericBtnInfoDashboard__info__text'>
540
                       <div className='dashboard__moreinfo__webdav__information__text genericBtnInfoDashboard__info__text'>
541
-                        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.
541
+                        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.
542
                       </div>
542
                       </div>
543
 
543
 
544
                       <div className='dashboard__moreinfo__webdav__information__link genericBtnInfoDashboard__info__link'>
544
                       <div className='dashboard__moreinfo__webdav__information__link genericBtnInfoDashboard__info__link'>
568
                     <div>
568
                     <div>
569
                       <div className='dashboard__moreinfo__calendar__information genericBtnInfoDashboard__info'>
569
                       <div className='dashboard__moreinfo__calendar__information genericBtnInfoDashboard__info'>
570
                         <div className='dashboard__moreinfo__calendar__information__text genericBtnInfoDashboard__info__text'>
570
                         <div className='dashboard__moreinfo__calendar__information__text genericBtnInfoDashboard__info__text'>
571
-                          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.
571
+                          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.
572
                         </div>
572
                         </div>
573
 
573
 
574
                         <div className='dashboard__moreinfo__calendar__information__link genericBtnInfoDashboard__info__link'>
574
                         <div className='dashboard__moreinfo__calendar__information__link genericBtnInfoDashboard__info__link'>

+ 0 - 3
src/css/ExtandedAction.styl View File

6
     .subdropdown
6
     .subdropdown
7
       &__item
7
       &__item
8
         padding 10px
8
         padding 10px
9
-        &__icon
10
-          .fa-pencil
11
-            color fontColor

+ 0 - 8
src/css/Folder.styl View File

108
           &__text
108
           &__text
109
             margin-right 40px
109
             margin-right 40px
110
             font-size 17px
110
             font-size 17px
111
-            color fontColor
112
-            border-color secondColor
113
-            &:hover, &:focus, &:active
114
-              color off-white
115
-              border-color thirdColor
116
-              background-color thirdColor
117
-              box-shadow 0 0 1px 2px fifthColor
118
-              outline fifthColor
119
             &::after
111
             &::after
120
               margin-left 20px
112
               margin-left 20px
121
           &__subdropdown
113
           &__subdropdown

+ 13 - 5
src/css/Generic.styl View File

16
   &:hover, &:focus, &:active, &:visited, &:focus-within
16
   &:hover, &:focus, &:active, &:visited, &:focus-within
17
     background-color hover-button
17
     background-color hover-button
18
     border-color hover-button
18
     border-color hover-button
19
-    box-shadow 0 0 1px 2px secondColor
19
+    box-shadow none
20
+    outline none
20
 
21
 
21
 .btn-outline-primary
22
 .btn-outline-primary
22
   color fontColor
23
   color fontColor
25
   &:hover, &:focus, &:active, &:visited, &:focus-within
26
   &:hover, &:focus, &:active, &:visited, &:focus-within
26
     background-color hover-button
27
     background-color hover-button
27
     border-color hover-button
28
     border-color hover-button
28
-    box-shadow 0 0 1px 2px secondColor
29
+    box-shadow none
30
+    outline none
29
 
31
 
30
 .btn-primary.active, .btn-primary:active, .show>.btn-primary.dropdown-toggle
32
 .btn-primary.active, .btn-primary:active, .show>.btn-primary.dropdown-toggle
31
   background-color hover-button
33
   background-color hover-button
32
   border-color hover-button
34
   border-color hover-button
33
-  box-shadow 0 0 1px 2px secondColor
35
+  box-shadow none
34
 
36
 
35
 .btn-outline-primary.active, .btn-outline-primary:active, .show>.btn-outline-primary.dropdown-toggle
37
 .btn-outline-primary.active, .btn-outline-primary:active, .show>.btn-outline-primary.dropdown-toggle
36
   background-color hover-button
38
   background-color hover-button
37
   border-color hover-button
39
   border-color hover-button
38
-  box-shadow 0 0 1px 2px secondColor
40
+  box-shadow none
41
+  outline none
39
 
42
 
40
 .dropdown-item
43
 .dropdown-item
41
-  &:hover, &:focus, &:visited, &:focus-within
44
+  &:hover, &:focus
42
     background-color thirdColor
45
     background-color thirdColor
43
     color off-white
46
     color off-white
47
+    box-shadow none
48
+    outline none
49
+
50
+.btn.disabled, .btn:disabled
51
+  cursor not-allowed
44
 
52
 
45
 .sidebarpagecontainer
53
 .sidebarpagecontainer
46
   display flex
54
   display flex

+ 1 - 6
src/css/Header.styl View File

75
             padding 0 5px
75
             padding 0 5px
76
             background-color transparent
76
             background-color transparent
77
             cursor pointer
77
             cursor pointer
78
-            &:hover
79
-              background-color lightGrey
80
-            &:focus
81
-              box-shadow shadow-all-side-blue
82
-              background-color lightGrey
83
             &::after //bootstrap overrides
78
             &::after //bootstrap overrides
84
               vertical-align middle
79
               vertical-align middle
85
               color darkGrey
80
               color darkGrey
105
             cursor pointer
100
             cursor pointer
106
             .setting__link
101
             .setting__link
107
               padding 10px
102
               padding 10px
108
-              color fontColor
103
+          //     // color fontColor
109
       &__itemnotification
104
       &__itemnotification
110
         &__timeline
105
         &__timeline
111
           margin-right 30px
106
           margin-right 30px