Browse Source

fixed SelectStatus css

Côme Huguiès 7 years ago
parent
commit
870858ee83

+ 14 - 12
src/component/Input/SelectStatus/SelectStatus.jsx View File

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

+ 1 - 1
src/component/Input/SelectStatus/SelectStatus.styl View File

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

+ 7 - 8
src/component/PopinFixed/PopinFixedOption.jsx View File

@@ -1,5 +1,5 @@
1 1
 import React from 'react'
2
-// import classnames from 'classnames'
2
+import classnames from 'classnames'
3 3
 import PropTypes from 'prop-types'
4 4
 import { translate } from 'react-i18next'
5 5
 import i18n from '../../i18n.js'
@@ -9,20 +9,19 @@ const PopinFixedOption = props => {
9 9
   translate.setI18n(props.i18n ? props.i18n : i18n) // mandatory to allow Apps to overrides trad
10 10
 
11 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 15
           {props.t('PopinFixedOption.new_version')}
17 16
           <i className='fa fa-plus-circle' />
18 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 22
           <i className='fa fa-archive' />
24 23
         </div>
25
-        <div className='wsContentGeneric__option__menu__action'>
24
+        <div className={classnames('wsContentGeneric__option__menu__action', `${props.customClass}__option__menu__action`)}>
26 25
           <i className='fa fa-trash' />
27 26
         </div>
28 27
       </div>

+ 0 - 1
src/component/Timeline/Timeline.styl View File

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

+ 1 - 1
src/component/Timeline/debugData.js View File

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