Browse Source

Merge pull request #1 from Skylsmoi/alexicauvin

Skylsmoi 7 years ago
parent
commit
51e6e79b4e
No account linked to committer's email

+ 1 - 0
package.json View File

6
   "scripts": {
6
   "scripts": {
7
     "mockapi": "node jsonserver/server.js",
7
     "mockapi": "node jsonserver/server.js",
8
     "servdev": "NODE_ENV=development webpack-dev-server --watch --colors --inline --hot --progress",
8
     "servdev": "NODE_ENV=development webpack-dev-server --watch --colors --inline --hot --progress",
9
+    "servdevwindoz": "webpack-dev-server --watch --colors --inline --hot --progress",
9
     "servdev-dashboard": "NODE_ENV=development webpack-dashboard -- webpack-dev-server --watch --colors --inline --hot --progress",
10
     "servdev-dashboard": "NODE_ENV=development webpack-dashboard -- webpack-dev-server --watch --colors --inline --hot --progress",
10
     "build": "NODE_ENV=production webpack -p",
11
     "build": "NODE_ENV=production webpack -p",
11
     "test": "echo \"Error: no test specified\" && exit 1"
12
     "test": "echo \"Error: no test specified\" && exit 1"

+ 4 - 0
src/component/common/PopinFixed/PopinFixedHeader.jsx View File

13
         {props.name}
13
         {props.name}
14
       </div>
14
       </div>
15
 
15
 
16
+      <div className={classnames('wsFileGeneric__header__edittitle', `${props.customClass}__header__changetitle`)}>
17
+        <i className='fa fa-pencil' />
18
+      </div>
19
+
16
       <div className={classnames('wsFileGeneric__header__close', `${props.customClass}__header__close`)}>
20
       <div className={classnames('wsFileGeneric__header__close', `${props.customClass}__header__close`)}>
17
         <i className='fa fa-times' />
21
         <i className='fa fa-times' />
18
       </div>
22
       </div>

+ 0 - 3
src/component/common/PopinFixed/PopinFixedOption.jsx View File

7
     <div className='wsFileGeneric__option'>
7
     <div className='wsFileGeneric__option'>
8
       <div className='wsFileGeneric__option__menu'>
8
       <div className='wsFileGeneric__option__menu'>
9
         <div className='wsFileGeneric__option__menu__action'>
9
         <div className='wsFileGeneric__option__menu__action'>
10
-          <i className='fa fa-pencil' />
11
-        </div>
12
-        <div className='wsFileGeneric__option__menu__action'>
13
           <i className='fa fa-archive' />
10
           <i className='fa fa-archive' />
14
         </div>
11
         </div>
15
         <div className='wsFileGeneric__option__menu__action'>
12
         <div className='wsFileGeneric__option__menu__action'>

+ 7 - 0
src/css/Generic.styl View File

100
       text-overflow ellipsis
100
       text-overflow ellipsis
101
       overflow hidden
101
       overflow hidden
102
       white-space nowrap
102
       white-space nowrap
103
+    &__edittitle
104
+      margin 0 15px
105
+      color white
106
+      font-size 20px
107
+      cursor pointer
103
     &__close
108
     &__close
104
       border 1px solid white
109
       border 1px solid white
105
       border-radius 5px
110
       border-radius 5px
112
     border-bottom 1px solid grey
117
     border-bottom 1px solid grey
113
     padding 15px
118
     padding 15px
114
     height 58px
119
     height 58px
120
+    text-align right
115
     background-color off-white
121
     background-color off-white
116
     & > i
122
     & > i
117
       vertical-align middle
123
       vertical-align middle
129
   &__wrapper
135
   &__wrapper
130
     display flex
136
     display flex
131
     flex-direction column
137
     flex-direction column
138
+