Browse Source

bugfix: remove unuse style and add IE11 style

close #5762
pull/5786/head
chenshuai2144 7 years ago
parent
commit
38cdd7edce
  1. 2
      package.json
  2. 12
      src/global.less
  3. 11
      src/layouts/BlankLayout.tsx

2
package.json

@ -58,7 +58,7 @@
"not ie <= 10" "not ie <= 10"
], ],
"dependencies": { "dependencies": {
"@ant-design/pro-layout": "^4.8.7", "@ant-design/pro-layout": "^4.9.11",
"@antv/data-set": "^0.10.2", "@antv/data-set": "^0.10.2",
"antd": "^3.23.6", "antd": "^3.23.6",
"classnames": "^2.2.6", "classnames": "^2.2.6",

12
src/global.less

@ -24,11 +24,6 @@ body {
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.ant-pro-basicLayout {
width: 100%;
height: 100%;
}
ul, ul,
ol { ol {
list-style: none; list-style: none;
@ -50,3 +45,10 @@ ol {
} }
} }
} }
// 兼容IE11
@media screen and(-ms-high-contrast: active), (-ms-high-contrast: none) {
body .ant-design-pro > .ant-layout {
min-height: 100vh;
}
}

11
src/layouts/BlankLayout.tsx

@ -1,14 +1,5 @@
import React from 'react'; import React from 'react';
const Layout: React.FC = ({ children }) => ( const Layout: React.FC = ({ children }) => <>{children}</>;
<div
style={{
width: '100vw',
height: '100vh',
}}
>
{children}
</div>
);
export default Layout; export default Layout;

Loading…
Cancel
Save