From 34c560271887b5d56a3a3fe04344958acb7bba4d Mon Sep 17 00:00:00 2001 From: Lorenzo Natali Date: Thu, 6 Oct 2016 18:35:03 +0200 Subject: [PATCH] fix #1093. Improved rule manager buttons (#1094) --- .../components/manager/rulesmanager/RulesManager.css | 6 ++++-- .../components/manager/rulesmanager/RulesTableControls.jsx | 7 +++---- web/client/plugins/manager/style/manager.css | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/web/client/components/manager/rulesmanager/RulesManager.css b/web/client/components/manager/rulesmanager/RulesManager.css index 1b66e2819b..fad27e2b96 100644 --- a/web/client/components/manager/rulesmanager/RulesManager.css +++ b/web/client/components/manager/rulesmanager/RulesManager.css @@ -7,10 +7,12 @@ } .rules-controls { - text-align: right; + width: auto; margin-bottom: 15px; } - +.rules-controls .btn { + border-left: 1px solid #5C9FB4; +} .rules-pagination { text-align: right; margin-top: -22px; diff --git a/web/client/components/manager/rulesmanager/RulesTableControls.jsx b/web/client/components/manager/rulesmanager/RulesTableControls.jsx index 2ba69fb8b4..2e5e167ca9 100644 --- a/web/client/components/manager/rulesmanager/RulesTableControls.jsx +++ b/web/client/components/manager/rulesmanager/RulesTableControls.jsx @@ -7,7 +7,7 @@ */ const React = require('react'); -const {Button, Glyphicon, Modal} = require('react-bootstrap'); +const {ButtonGroup, Button, Glyphicon, Modal} = require('react-bootstrap'); const Message = require('../../I18N/Message'); @@ -23,7 +23,6 @@ const RulesTableControls = React.createClass({ }, getDefaultProps() { return { - bsSize: "small", moveRulesToPage: () => {}, updateActiveRule: () => {}, deleteRules: () => {}, @@ -51,7 +50,7 @@ const RulesTableControls = React.createClass({ const firstPage = this.props.rulesPage === 1 || !this.props.rulesPage; const lastPage = this.props.rulesPage === numberOfPages || !this.props.rulesPage; return ( -
+ @@ -110,7 +109,7 @@ const RulesTableControls = React.createClass({ -
+ ); } }); diff --git a/web/client/plugins/manager/style/manager.css b/web/client/plugins/manager/style/manager.css index d80abb4346..2c35fff25b 100644 --- a/web/client/plugins/manager/style/manager.css +++ b/web/client/plugins/manager/style/manager.css @@ -20,5 +20,5 @@ } .Manager-Container .Manager-Tools-Nav { order: -1; - flex: 0 0 15em; + max-width: 20%; }