mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 12:05:37 +00:00
Remove add wrapper element
Added 100% height to fill-width to fix some layout issues
This commit is contained in:
parent
eb7a8be3f8
commit
0a0a990c54
6
admin/client/dist/js/bundle.js
vendored
6
admin/client/dist/js/bundle.js
vendored
@ -2035,8 +2035,10 @@ e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,wri
|
|||||||
value:!0})
|
value:!0})
|
||||||
var s=function(){function e(e,t){for(var n=0;n<t.length;n++){var i=t[n]
|
var s=function(){function e(e,t){for(var n=0;n<t.length;n++){var i=t[n]
|
||||||
i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,n,i){return n&&e(t.prototype,n),i&&e(t,i),t}}(),l=n(4),u=i(l),d=n(20),c=i(d),f=function(e){
|
i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}return function(t,n,i){return n&&e(t.prototype,n),i&&e(t,i),t}}(),l=n(4),u=i(l),d=n(20),c=i(d),f=function(e){
|
||||||
function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).apply(this,arguments))}return a(t,e),s(t,[{key:"render",value:function n(){return u["default"].createElement("div",{className:"app"
|
function t(){return r(this,t),o(this,(t.__proto__||Object.getPrototypeOf(t)).apply(this,arguments))}return a(t,e),s(t,[{key:"render",value:function n(){var e=u["default"].Children.only(this.props.children)
|
||||||
},this.props.children)}}]),t}(c["default"])
|
|
||||||
|
|
||||||
|
return e}}]),t}(c["default"])
|
||||||
t["default"]=f},function(e,t){e.exports=ReactRouterRedux},function(e,t){e.exports=ReduxThunk},function(e,t){e.exports=ReducerRegister},function(e,t,n){"use strict"
|
t["default"]=f},function(e,t){e.exports=ReactRouterRedux},function(e,t){e.exports=ReduxThunk},function(e,t){e.exports=ReducerRegister},function(e,t,n){"use strict"
|
||||||
function i(e){return e&&e.__esModule?e:{"default":e}}function r(e){return{type:a["default"].SET_CONFIG,payload:{config:e}}}Object.defineProperty(t,"__esModule",{value:!0}),t.setConfig=r
|
function i(e){return e&&e.__esModule?e:{"default":e}}function r(e){return{type:a["default"].SET_CONFIG,payload:{config:e}}}Object.defineProperty(t,"__esModule",{value:!0}),t.setConfig=r
|
||||||
var o=n(151),a=i(o)},function(e,t){"use strict"
|
var o=n(151),a=i(o)},function(e,t){"use strict"
|
||||||
|
12
admin/client/dist/styles/bundle.css
vendored
12
admin/client/dist/styles/bundle.css
vendored
@ -15998,12 +15998,9 @@ input.checkbox,input.radio,input[type=checkbox],input[type=radio]{
|
|||||||
|
|
||||||
body,html{
|
body,html{
|
||||||
width:100%;
|
width:100%;
|
||||||
|
height:100%;
|
||||||
margin:0;
|
margin:0;
|
||||||
padding:0;
|
padding:0;
|
||||||
}
|
|
||||||
|
|
||||||
.fill-height,body,html{
|
|
||||||
height:100%;
|
|
||||||
display:-ms-flexbox;
|
display:-ms-flexbox;
|
||||||
display:-webkit-box;
|
display:-webkit-box;
|
||||||
display:flex;
|
display:flex;
|
||||||
@ -16016,14 +16013,15 @@ body,html{
|
|||||||
}
|
}
|
||||||
|
|
||||||
.fill-height,.fill-width{
|
.fill-height,.fill-width{
|
||||||
|
height:100%;
|
||||||
|
display:-ms-flexbox;
|
||||||
|
display:-webkit-box;
|
||||||
|
display:flex;
|
||||||
-webkit-box-direction:normal;
|
-webkit-box-direction:normal;
|
||||||
}
|
}
|
||||||
|
|
||||||
.fill-width{
|
.fill-width{
|
||||||
width:100%;
|
width:100%;
|
||||||
display:-ms-flexbox;
|
|
||||||
display:-webkit-box;
|
|
||||||
display:flex;
|
|
||||||
-ms-flex-direction:row;
|
-ms-flex-direction:row;
|
||||||
-webkit-box-orient:horizontal;
|
-webkit-box-orient:horizontal;
|
||||||
flex-direction:row;
|
flex-direction:row;
|
||||||
|
@ -7,7 +7,9 @@ import SilverStripeComponent from 'lib/SilverStripeComponent';
|
|||||||
*/
|
*/
|
||||||
class App extends SilverStripeComponent {
|
class App extends SilverStripeComponent {
|
||||||
render() {
|
render() {
|
||||||
return (<div className="app">{this.props.children}</div>);
|
// TODO re-add <div className="app"> wrapper when applying to document.body
|
||||||
|
const Child = React.Children.only(this.props.children);
|
||||||
|
return (Child);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -168,6 +168,7 @@ html, body {
|
|||||||
// Nested items take up width
|
// Nested items take up width
|
||||||
.fill-width {
|
.fill-width {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
display: -ms-flexbox;
|
display: -ms-flexbox;
|
||||||
display: flex;
|
display: flex;
|
||||||
-ms-flex-direction: row;
|
-ms-flex-direction: row;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user