Просмотр исходного кода

Revert "WIP: use react-bootstrap Navbar"

This reverts commit 2f12041dd5561091c865ff76fa8a52dc7f1857df.
Yuki Takei 7 лет назад
Родитель
Сommit
5135dc3aa9

+ 2 - 2
src/client/js/components/PageEditor/CodeMirrorEditor.js

@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import PropTypes from 'prop-types';
 
 
 import Modal from 'react-bootstrap/es/Modal';
 import Modal from 'react-bootstrap/es/Modal';
-import NavItem from 'react-bootstrap/es/NavItem';
+import Button from 'react-bootstrap/es/Button';
 
 
 import InterceptorManager from '@commons/service/interceptor-manager';
 import InterceptorManager from '@commons/service/interceptor-manager';
 
 
@@ -650,7 +650,7 @@ export default class CodeMirrorEditor extends AbstractEditor {
   }
   }
 
 
   getNavbarItems() {
   getNavbarItems() {
-    return <NavItem bsSize="small" onClick={ this.showHandsonTableHandler }><img src="/images/icons/editor/table.svg" width="14" /></NavItem>;
+    return <Button bsSize="small" onClick={ this.showHandsonTableHandler }><img src="/images/icons/editor/table.svg" width="14" /></Button>;
   }
   }
 
 
   render() {
   render() {

+ 6 - 12
src/client/js/components/PageEditor/Editor.js

@@ -1,17 +1,11 @@
 import React from 'react';
 import React from 'react';
 import PropTypes from 'prop-types';
 import PropTypes from 'prop-types';
 
 
-import Navbar from 'react-bootstrap/es/Navbar';
-import Nav from 'react-bootstrap/es/Nav';
-import NavItem from 'react-bootstrap/es/NavItem';
-import Button from 'react-bootstrap/es/Button';
-import ButtonGroup from 'react-bootstrap/es/ButtonGroup';
-import Dropzone from 'react-dropzone';
-
 import AbstractEditor from './AbstractEditor';
 import AbstractEditor from './AbstractEditor';
 import CodeMirrorEditor from './CodeMirrorEditor';
 import CodeMirrorEditor from './CodeMirrorEditor';
 import TextAreaEditor from './TextAreaEditor';
 import TextAreaEditor from './TextAreaEditor';
 
 
+import Dropzone from 'react-dropzone';
 
 
 import pasteHelper from './PasteHelper';
 import pasteHelper from './PasteHelper';
 
 
@@ -202,13 +196,13 @@ export default class Editor extends AbstractEditor {
 
 
   renderNavbar() {
   renderNavbar() {
     return (
     return (
-      <Navbar className="mb-0 navbar-editor" fluid={true}>
-        <Nav pullRight>
+      <div className="m-0 navbar navbar-default navbar-editor" style={{ minHeight: 'unset' }}>
+        <ul className="pr-4 nav nav-navbar navbar-right">
           { this.getNavbarItems() != null && this.getNavbarItems().map((item, idx) => {
           { this.getNavbarItems() != null && this.getNavbarItems().map((item, idx) => {
-            return <div key={idx}>{item}</div>;
+            return <li key={idx}>{item}</li>;
           }) }
           }) }
-        </Nav>
-      </Navbar>
+        </ul>
+      </div>
     );
     );
   }
   }