Browse Source

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

Skylsmoi 5 years ago
parent
commit
04ae770eab

+ 4 - 1
frontend/src/component/common/Input/SubDropdownCreateButton.jsx View File

10
         <div className='subdropdown__link dropdown-item' onClick={e => props.onClickCreateContent(e, props.idFolder, app.slug)} key={app.slug}>
10
         <div className='subdropdown__link dropdown-item' onClick={e => props.onClickCreateContent(e, props.idFolder, app.slug)} key={app.slug}>
11
           <div className={`subdropdown__link__${app.slug} d-flex align-items-center`}>
11
           <div className={`subdropdown__link__${app.slug} d-flex align-items-center`}>
12
             <div className={`subdropdown__link__${app.slug}__icon mr-3`}>
12
             <div className={`subdropdown__link__${app.slug}__icon mr-3`}>
13
-              <i className={`fa fa-fw fa-${app.faIcon}`} />
13
+              <i
14
+                className={`fa fa-fw fa-${app.faIcon}`}
15
+                style={{color: app.hexcolor}}
16
+              />
14
             </div>
17
             </div>
15
             <div className='subdropdown__link__folder__text'>
18
             <div className='subdropdown__link__folder__text'>
16
               {app.creationLabel}
19
               {app.creationLabel}

+ 4 - 4
frontend/src/css/Dashboard.styl View File

256
     justify-content space-between
256
     justify-content space-between
257
     flexwrap wrap
257
     flexwrap wrap
258
     &__webdav
258
     &__webdav
259
-      margin-bottom 40px
259
+      margin 0 15px 40px 0
260
       &__btn
260
       &__btn
261
         width 300px
261
         width 300px
262
       &__information
262
       &__information
263
-        width 550px
263
+        width 300px
264
     &__calendar
264
     &__calendar
265
       margin-bottom 100px
265
       margin-bottom 100px
266
       &__wrapperBtn
266
       &__wrapperBtn
267
-        margin-right 300px
267
+        margin-right 290px
268
       &__btn
268
       &__btn
269
         width 300px
269
         width 300px
270
       &__information
270
       &__information
271
-        width 550px
271
+        width 300px
272
 
272
 
273
 /**** MEDIAQUERIES *****/
273
 /**** MEDIAQUERIES *****/
274
 
274