Преглед на файлове

added TextAreaPlugin integration + fixed url of tracim_lib dependency

Skylsmoi преди 6 години
родител
ревизия
483e5c8f2d
променени са 3 файла, в които са добавени 8 реда и са изтрити 4 реда
  1. 1 1
      package.json
  2. 3 0
      src/component/PageHtml.jsx
  3. 4 3
      src/css/index.styl

+ 1 - 1
package.json Целия файл

36
     "url-loader": "^0.6.2",
36
     "url-loader": "^0.6.2",
37
     "webpack": "^3.8.1",
37
     "webpack": "^3.8.1",
38
     "whatwg-fetch": "^2.0.3",
38
     "whatwg-fetch": "^2.0.3",
39
-    "tracim_lib": "git://github.com/Skylsmoi/tracim_lib.git"
39
+    "tracim_lib": "git://github.com/tracim/tracim_lib.git"
40
   },
40
   },
41
   "devDependencies": {
41
   "devDependencies": {
42
     "webpack-dashboard": "^1.1.1",
42
     "webpack-dashboard": "^1.1.1",

+ 3 - 0
src/component/PageHtml.jsx Целия файл

1
 import React from 'react'
1
 import React from 'react'
2
+import { TextAreaPlugin } from 'tracim_lib'
2
 
3
 
3
 const PageHtml = props => {
4
 const PageHtml = props => {
4
   return (
5
   return (
5
     <div className='wsFilePageHtml__contentpage__textnote'>
6
     <div className='wsFilePageHtml__contentpage__textnote'>
6
       <div className='wsFilePageHtml__contentpage__textnote__latestversion' dangerouslySetInnerHTML={{__html: props.version}} />
7
       <div className='wsFilePageHtml__contentpage__textnote__latestversion' dangerouslySetInnerHTML={{__html: props.version}} />
7
       <div className='wsFilePageHtml__contentpage__textnote__text' dangerouslySetInnerHTML={{__html: props.text}} />
8
       <div className='wsFilePageHtml__contentpage__textnote__text' dangerouslySetInnerHTML={{__html: props.text}} />
9
+
10
+      <TextAreaPlugin customClass={'wsFilePageHtml'} />
8
     </div>
11
     </div>
9
   )
12
   )
10
 }
13
 }

+ 4 - 3
src/css/index.styl Целия файл

1
 @import "../../node_modules/tracim_lib/src/css/Variable.styl"
1
 @import "../../node_modules/tracim_lib/src/css/Variable.styl"
2
 
2
 
3
 .wsFilePageHtml
3
 .wsFilePageHtml
4
-  width 1200px
5
-  height calc(100% - 85px)
6
-  overflow-Y auto
7
   &__header
4
   &__header
8
     background-color htmlColor
5
     background-color htmlColor
6
+    &__editionmode
7
+      display none
9
     &__icon
8
     &__icon
10
       .fa-file-word-o
9
       .fa-file-word-o
11
         color white
10
         color white
21
         opacity 0.7
20
         opacity 0.7
22
       &__text
21
       &__text
23
         font-size 14px
22
         font-size 14px
23
+      &__edition
24
+        display none
24
     &__messagelist
25
     &__messagelist
25
       min-height 300px
26
       min-height 300px
26
       &__item
27
       &__item