Browse Source

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

Skylsmoi 6 years ago
parent
commit
5b4ca5c834
3 changed files with 4 additions and 26 deletions
  1. 4 4
      src/container/Dashboard.jsx
  2. 0 19
      src/css/Dashboard.styl
  3. 0 3
      src/css/Folder.styl

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

49
                 </div>
49
                 </div>
50
 
50
 
51
                 <div className='dashboard__userstatut__notification__subscribe dropdown'>
51
                 <div className='dashboard__userstatut__notification__subscribe dropdown'>
52
-                  <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'>
52
+                  <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'>
53
                     Abonné(e)
53
                     Abonné(e)
54
                   </button>
54
                   </button>
55
                   <div className='dashboard__userstatut__notification__subscribe__submenu dropdown-menu'>
55
                   <div className='dashboard__userstatut__notification__subscribe__submenu dropdown-menu'>
127
                   Activité récente
127
                   Activité récente
128
                 </div>
128
                 </div>
129
 
129
 
130
-                <div className='dashboard__activity__header__allread btn'>
130
+                <div className='dashboard__activity__header__allread btn btn-primary'>
131
                   Tout marquer comme lu
131
                   Tout marquer comme lu
132
                 </div>
132
                 </div>
133
               </div>
133
               </div>
187
                 </div>
187
                 </div>
188
 
188
 
189
                 <div className='dashboard__activity__more d-flex flex-row-reverse'>
189
                 <div className='dashboard__activity__more d-flex flex-row-reverse'>
190
-                  <div className='dashboard__activity__more__btn btn'>
190
+                  <div className='dashboard__activity__more__btn btn btn-primary'>
191
                     Voir plus
191
                     Voir plus
192
                   </div>
192
                   </div>
193
                 </div>
193
                 </div>
302
                   <input type='text' className='dashboard__memberlist__addmember__name form-control' placeholder='Name' />
302
                   <input type='text' className='dashboard__memberlist__addmember__name form-control' placeholder='Name' />
303
                   <div className='dashboard__memberlist__addmember__role'>
303
                   <div className='dashboard__memberlist__addmember__role'>
304
                     <div className='dashboard__memberlist__addmember__role__dropdown dropdown'>
304
                     <div className='dashboard__memberlist__addmember__role__dropdown dropdown'>
305
-                      <button className='dashboard__memberlist__addmember__role__dropdown__button btn dropdown-toggle' type='button' id='dropdownMenuButton' data-toggle='dropdown' aria-haspopup='true' aria-expanded='false'>
305
+                      <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'>
306
                         Rôle du membre
306
                         Rôle du membre
307
                       </button>
307
                       </button>
308
                       <div className='dashboard__memberlist__addmember__role__dropdown__submenu dropdown-menu'>
308
                       <div className='dashboard__memberlist__addmember__role__dropdown__submenu dropdown-menu'>

+ 0 - 19
src/css/Dashboard.styl View File

49
       font-size 18px
49
       font-size 18px
50
       &__btn
50
       &__btn
51
         btnNotification()
51
         btnNotification()
52
-        bgandcolor()
53
         cursor pointer
52
         cursor pointer
54
-        &:hover , focus
55
-          hoverfocus()
56
       &__subscribe
53
       &__subscribe
57
         display none
54
         display none
58
         &__btn
55
         &__btn
59
           btnNotification()
56
           btnNotification()
60
-          bgandcolor()
61
-          &:hover,&:focus
62
-            hoverfocus()
63
         &__submenu
57
         &__submenu
64
           padding 0
58
           padding 0
65
           &__item
59
           &__item
66
             padding 10px
60
             padding 10px
67
-            &:hover,&:focus
68
-              hoverfocus()
69
   &__calltoaction
61
   &__calltoaction
70
     flexwrap()
62
     flexwrap()
71
     margin 50px 0
63
     margin 50px 0
102
       margin-bottom 20px
94
       margin-bottom 20px
103
       height 44px
95
       height 44px
104
       &__allread
96
       &__allread
105
-        border 1px solid blue
106
         padding 10px 25px
97
         padding 10px 25px
107
-        color blue
108
         font-size 18px
98
         font-size 18px
109
         cursor pointer
99
         cursor pointer
110
-        &:hover, &:focus
111
-          hoverfocus()
112
     &__wrapper
100
     &__wrapper
113
       border 1px solid grey
101
       border 1px solid grey
114
       height 480px
102
       height 480px
131
     &__more
119
     &__more
132
       &__btn
120
       &__btn
133
         margin 15px
121
         margin 15px
134
-        border 1px solid blue
135
         padding 10px 25px
122
         padding 10px 25px
136
-        color blue
137
         cursor pointer
123
         cursor pointer
138
-        &:hover, &:focus
139
-          hoverfocus()
140
   &__memberlist
124
   &__memberlist
141
     margin 0 0 50px 0
125
     margin 0 0 50px 0
142
     width 35%
126
     width 35%
208
             border 1px solid blue
192
             border 1px solid blue
209
             border-radius 10px
193
             border-radius 10px
210
             padding 10px 25px
194
             padding 10px 25px
211
-            bgandcolor()
212
             &::after
195
             &::after
213
               margin 10px 0 0 20px
196
               margin 10px 0 0 20px
214
-            &:hover,&:focus
215
-              hoverfocus()
216
           &__submenu
197
           &__submenu
217
             padding 0
198
             padding 0
218
             &__item
199
             &__item

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

88
         &:hover > .folder__header__name__addbtn__text
88
         &:hover > .folder__header__name__addbtn__text
89
           color white
89
           color white
90
         &__text
90
         &__text
91
-          border 1px solid darkBlue
92
-          background-color transparent
93
-          color darkBlue
94
           font-size 17px
91
           font-size 17px
95
     &__contenttype
92
     &__contenttype
96
       display flex
93
       display flex