From 96bd4edce5157dbcedc47415d22b58e1d6e0424d Mon Sep 17 00:00:00 2001 From: Christopher Joe Date: Mon, 16 Jan 2017 14:54:38 +1300 Subject: [PATCH] Fix things not aligning well in the toolbar --- admin/client/dist/js/bundle.js | 2 +- admin/client/src/components/Toolbar/Toolbar.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/client/dist/js/bundle.js b/admin/client/dist/js/bundle.js index 211c3e6f3..f8fe5f643 100644 --- a/admin/client/dist/js/bundle.js +++ b/admin/client/dist/js/bundle.js @@ -753,7 +753,7 @@ function t(e){r(this,t) var n=a(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,e)) return n.handleBackButtonClick=n.handleBackButtonClick.bind(n),n}return o(t,e),s(t,[{key:"render",value:function n(){var e=["btn","btn-secondary","action","font-icon-left-open-big","toolbar__back-button","btn--no-text"],t={ className:e.join(" "),onClick:this.handleBackButtonClick,href:"#",type:"button"} -return u["default"].createElement("div",{className:"toolbar toolbar--north"},u["default"].createElement("div",{className:"toolbar__navigation"},this.props.showBackButton&&u["default"].createElement("button",t),this.props.children)) +return u["default"].createElement("div",{className:"toolbar toolbar--north"},u["default"].createElement("div",{className:"toolbar__navigation fill-width"},this.props.showBackButton&&u["default"].createElement("button",t),this.props.children)) }},{key:"handleBackButtonClick",value:function i(e){return"undefined"!=typeof this.props.handleBackButtonClick?void this.props.handleBackButtonClick(e):void e.preventDefault()}}]),t}(c["default"]) f.propTypes={handleBackButtonClick:u["default"].PropTypes.func,showBackButton:u["default"].PropTypes.bool,breadcrumbs:u["default"].PropTypes.array},f.defaultProps={showBackButton:!1},t["default"]=f},function(e,t,n){ diff --git a/admin/client/src/components/Toolbar/Toolbar.js b/admin/client/src/components/Toolbar/Toolbar.js index d27811df0..c47ed92fc 100644 --- a/admin/client/src/components/Toolbar/Toolbar.js +++ b/admin/client/src/components/Toolbar/Toolbar.js @@ -27,7 +27,7 @@ class Toolbar extends SilverStripeComponent { return (
-
+
{this.props.showBackButton && }