Selaa lähdekoodia

fixed SelectStatus css

Côme Huguiès 7 vuotta sitten
vanhempi
commit
870858ee83

+ 14 - 12
src/component/Input/SelectStatus/SelectStatus.jsx Näytä tiedosto

2
 import { translate } from 'react-i18next'
2
 import { translate } from 'react-i18next'
3
 import i18n from '../../../i18n.js'
3
 import i18n from '../../../i18n.js'
4
 
4
 
5
+require('./SelectStatus.styl')
6
+
5
 export const SelectStatus = props => {
7
 export const SelectStatus = props => {
6
   translate.setI18n(props.i18n ? props.i18n : i18n) // mandatory to allow Apps to overrides trad
8
   translate.setI18n(props.i18n ? props.i18n : i18n) // mandatory to allow Apps to overrides trad
7
 
9
 
8
   return (
10
   return (
9
-    <div className='wsContentGeneric__option__menu__status dropdown'>
11
+    <div className='selectStatus dropdown'>
10
       <button
12
       <button
11
-        className='wsContentGeneric__option__menu__status__dropdownbtn check btn dropdown-toggle'
13
+        className='selectStatus__dropdownbtn check btn dropdown-toggle'
12
         type='button'
14
         type='button'
13
         id='dropdownMenu2'
15
         id='dropdownMenu2'
14
         data-toggle='dropdown'
16
         data-toggle='dropdown'
16
         aria-expanded='false'
18
         aria-expanded='false'
17
       >
19
       >
18
         {props.t('Input.SelectStatus.validated')}
20
         {props.t('Input.SelectStatus.validated')}
19
-        <div className='wsContentGeneric__option__menu__status__dropdownbtn__icon'>
21
+        <div className='selectStatus__dropdownbtn__icon'>
20
           <i className='fa fa-check' />
22
           <i className='fa fa-check' />
21
         </div>
23
         </div>
22
       </button>
24
       </button>
23
 
25
 
24
-      <div className='wsContentGeneric__option__menu__status__submenu dropdown-menu' aria-labelledby='dropdownMenu2'>
26
+      <div className='selectStatus__submenu dropdown-menu' aria-labelledby='dropdownMenu2'>
25
         <h6 className='dropdown-header'>{props.t('Input.SelectStatus.file_status')}</h6>
27
         <h6 className='dropdown-header'>{props.t('Input.SelectStatus.file_status')}</h6>
26
 
28
 
27
         <div className='dropdown-divider' />
29
         <div className='dropdown-divider' />
28
 
30
 
29
-        <button className='wsContentGeneric__option__menu__status__submenu__item current  dropdown-item' type='button'>
31
+        <button className='selectStatus__submenu__item current  dropdown-item' type='button'>
30
           {props.t('Input.SelectStatus.ongoing')}
32
           {props.t('Input.SelectStatus.ongoing')}
31
-          <div className='wsContentGeneric__option__menu__status__submenu__item__icon'>
33
+          <div className='selectStatus__submenu__item__icon'>
32
             <i className='fa fa-gears' />
34
             <i className='fa fa-gears' />
33
           </div>
35
           </div>
34
         </button>
36
         </button>
35
 
37
 
36
-        <button className='wsContentGeneric__option__menu__status__submenu__item check dropdown-item' type='button'>
38
+        <button className='selectStatus__submenu__item check dropdown-item' type='button'>
37
           {props.t('Input.SelectStatus.validated')}
39
           {props.t('Input.SelectStatus.validated')}
38
-          <div className='wsContentGeneric__option__menu__status__submenu__item__icon'>
40
+          <div className='selectStatus__submenu__item__icon'>
39
             <i className='fa fa-check' />
41
             <i className='fa fa-check' />
40
           </div>
42
           </div>
41
         </button>
43
         </button>
42
 
44
 
43
-        <button className='wsContentGeneric__option__menu__status__submenu__item invalid dropdown-item' type='button'>
45
+        <button className='selectStatus__submenu__item invalid dropdown-item' type='button'>
44
           {props.t('Input.SelectStatus.unvalidated')}
46
           {props.t('Input.SelectStatus.unvalidated')}
45
-          <div className='wsContentGeneric__option__menu__status__submenu__item__icon'>
47
+          <div className='selectStatus__submenu__item__icon'>
46
             <i className='fa fa-times' />
48
             <i className='fa fa-times' />
47
           </div>
49
           </div>
48
         </button>
50
         </button>
49
 
51
 
50
-        <button className='wsContentGeneric__option__menu__status__submenu__item ban dropdown-item' type='button'>
52
+        <button className='selectStatus__submenu__item ban dropdown-item' type='button'>
51
           {props.t('Input.SelectStatus.obsolete')}
53
           {props.t('Input.SelectStatus.obsolete')}
52
-          <div className='wsContentGeneric__option__menu__status__submenu__item__icon'>
54
+          <div className='selectStatus__submenu__item__icon'>
53
             <i className='fa fa-ban' />
55
             <i className='fa fa-ban' />
54
           </div>
56
           </div>
55
         </button>
57
         </button>

+ 1 - 1
src/component/Input/SelectStatus/SelectStatus.styl Näytä tiedosto

1
 @import '../../../css/Variable.styl'
1
 @import '../../../css/Variable.styl'
2
 
2
 
3
-&__status
3
+.selectStatus
4
   margin-right 20px
4
   margin-right 20px
5
   .current
5
   .current
6
     color blue
6
     color blue

+ 7 - 8
src/component/PopinFixed/PopinFixedOption.jsx Näytä tiedosto

1
 import React from 'react'
1
 import React from 'react'
2
-// import classnames from 'classnames'
2
+import classnames from 'classnames'
3
 import PropTypes from 'prop-types'
3
 import PropTypes from 'prop-types'
4
 import { translate } from 'react-i18next'
4
 import { translate } from 'react-i18next'
5
 import i18n from '../../i18n.js'
5
 import i18n from '../../i18n.js'
9
   translate.setI18n(props.i18n ? props.i18n : i18n) // mandatory to allow Apps to overrides trad
9
   translate.setI18n(props.i18n ? props.i18n : i18n) // mandatory to allow Apps to overrides trad
10
 
10
 
11
   return (
11
   return (
12
-    <div className='wsContentGeneric__option'>
13
-      <div className='wsContentGeneric__option__menu'>
14
-
15
-        <div className='wsFileFile__option__menu__addversion btn mr-auto'>
12
+    <div className={classnames('wsContentGeneric__option', `${props.customClass}__option`)}>
13
+      <div className={classnames('wsContentGeneric__option__menu', `${props.customClass}__option__menu`)}>
14
+        <div className='wsContentGeneric__option__menu__addversion btn mr-auto'>
16
           {props.t('PopinFixedOption.new_version')}
15
           {props.t('PopinFixedOption.new_version')}
17
           <i className='fa fa-plus-circle' />
16
           <i className='fa fa-plus-circle' />
18
         </div>
17
         </div>
19
 
18
 
20
-        {/* <SelectStatus /> */}
19
+        <SelectStatus />
21
 
20
 
22
-        <div className='wsContentGeneric__option__menu__action'>
21
+        <div className={classnames('wsContentGeneric__option__menu__action', `${props.customClass}__option__menu__action`)}>
23
           <i className='fa fa-archive' />
22
           <i className='fa fa-archive' />
24
         </div>
23
         </div>
25
-        <div className='wsContentGeneric__option__menu__action'>
24
+        <div className={classnames('wsContentGeneric__option__menu__action', `${props.customClass}__option__menu__action`)}>
26
           <i className='fa fa-trash' />
25
           <i className='fa fa-trash' />
27
         </div>
26
         </div>
28
       </div>
27
       </div>

+ 0 - 1
src/component/Timeline/Timeline.styl Näytä tiedosto

16
     background-color grey-hover
16
     background-color grey-hover
17
   &__messagelist
17
   &__messagelist
18
     flex 1 1 auto
18
     flex 1 1 auto
19
-    // flex 1 1 0
20
     margin-bottom 0
19
     margin-bottom 0
21
     padding-left 0
20
     padding-left 0
22
     border-bottom 1px solid grey
21
     border-bottom 1px solid grey

+ 1 - 1
src/component/Timeline/debugData.js Näytä tiedosto

10
     day: '28/11/17',
10
     day: '28/11/17',
11
     hour: '11h45'
11
     hour: '11h45'
12
   },
12
   },
13
-  text: "Ajout du paragraphe 3"
13
+  text: 'Ajout du paragraphe 3'
14
 }, {
14
 }, {
15
   id: 1,
15
   id: 1,
16
   type: 'message',
16
   type: 'message',