@megafon/ui-shared 6.9.1 → 6.10.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -23,6 +23,9 @@ h5 {
23
23
  padding-bottom: 72px;
24
24
  }
25
25
  }
26
+ .mfui-v6-container .mfui-v6-container__inner_prevent {
27
+ padding-top: 0.1px;
28
+ }
26
29
  .mfui-v6-container:first-child .mfui-v6-container__inner {
27
30
  border-top-left-radius: 0;
28
31
  border-top-right-radius: 0;
@@ -4212,3 +4215,16 @@ h5 {
4212
4215
  margin-top: 40px;
4213
4216
  }
4214
4217
  }
4218
+ .mfui-v6-container .mfui-v6-banner-box + .mfui-v6-info-cards {
4219
+ margin-top: 56px;
4220
+ }
4221
+ @media screen and (min-width: 768px) and (max-width: 1023px) {
4222
+ .mfui-v6-container .mfui-v6-banner-box + .mfui-v6-info-cards {
4223
+ margin-top: 48px;
4224
+ }
4225
+ }
4226
+ @media screen and (max-width: 767px) {
4227
+ .mfui-v6-container .mfui-v6-banner-box + .mfui-v6-info-cards {
4228
+ margin-top: 40px;
4229
+ }
4230
+ }
@@ -23,6 +23,8 @@ declare type Props = {
23
23
  disablePaddingBottom?: boolean;
24
24
  /** Включить тень в нижней части компонента */
25
25
  bottomShadow?: boolean;
26
+ /** Предотвратить прохождение верхнего отступа дочернего компонента через верхнюю границу контейнера */
27
+ preventMarginTopCollapse?: boolean;
26
28
  };
27
29
  declare const Container: React.FC<Props>;
28
30
  export default Container;
@@ -23,7 +23,9 @@ var Container = function Container(_ref) {
23
23
  disablePaddingTop = _ref.disablePaddingTop,
24
24
  disablePaddingBottom = _ref.disablePaddingBottom,
25
25
  _ref$bottomShadow = _ref.bottomShadow,
26
- bottomShadow = _ref$bottomShadow === void 0 ? false : _ref$bottomShadow;
26
+ bottomShadow = _ref$bottomShadow === void 0 ? false : _ref$bottomShadow,
27
+ _ref$preventMarginTop = _ref.preventMarginTopCollapse,
28
+ preventMarginTopCollapse = _ref$preventMarginTop === void 0 ? false : _ref$preventMarginTop;
27
29
  return /*#__PURE__*/React.createElement("div", {
28
30
  className: cn({
29
31
  'bg-color': backgroundColor,
@@ -34,7 +36,9 @@ var Container = function Container(_ref) {
34
36
  ref: rootRef,
35
37
  id: id
36
38
  }, /*#__PURE__*/React.createElement("div", {
37
- className: cn('inner')
39
+ className: cn('inner', {
40
+ prevent: preventMarginTopCollapse
41
+ })
38
42
  }, /*#__PURE__*/React.createElement(ContentArea, null, children)));
39
43
  };
40
44
 
@@ -47,6 +51,7 @@ Container.propTypes = {
47
51
  }), PropTypes.any])]),
48
52
  disablePaddingTop: PropTypes.bool,
49
53
  disablePaddingBottom: PropTypes.bool,
50
- bottomShadow: PropTypes.bool
54
+ bottomShadow: PropTypes.bool,
55
+ preventMarginTopCollapse: PropTypes.bool
51
56
  };
52
57
  export default Container;
@@ -23,6 +23,9 @@ h5 {
23
23
  padding-bottom: 72px;
24
24
  }
25
25
  }
26
+ .mfui-v6-container .mfui-v6-container__inner_prevent {
27
+ padding-top: 0.1px;
28
+ }
26
29
  .mfui-v6-container:first-child .mfui-v6-container__inner {
27
30
  border-top-left-radius: 0;
28
31
  border-top-right-radius: 0;
@@ -4212,3 +4215,16 @@ h5 {
4212
4215
  margin-top: 40px;
4213
4216
  }
4214
4217
  }
4218
+ .mfui-v6-container .mfui-v6-banner-box + .mfui-v6-info-cards {
4219
+ margin-top: 56px;
4220
+ }
4221
+ @media screen and (min-width: 768px) and (max-width: 1023px) {
4222
+ .mfui-v6-container .mfui-v6-banner-box + .mfui-v6-info-cards {
4223
+ margin-top: 48px;
4224
+ }
4225
+ }
4226
+ @media screen and (max-width: 767px) {
4227
+ .mfui-v6-container .mfui-v6-banner-box + .mfui-v6-info-cards {
4228
+ margin-top: 40px;
4229
+ }
4230
+ }
@@ -23,6 +23,8 @@ declare type Props = {
23
23
  disablePaddingBottom?: boolean;
24
24
  /** Включить тень в нижней части компонента */
25
25
  bottomShadow?: boolean;
26
+ /** Предотвратить прохождение верхнего отступа дочернего компонента через верхнюю границу контейнера */
27
+ preventMarginTopCollapse?: boolean;
26
28
  };
27
29
  declare const Container: React.FC<Props>;
28
30
  export default Container;
@@ -37,7 +37,9 @@ var Container = function Container(_ref) {
37
37
  disablePaddingTop = _ref.disablePaddingTop,
38
38
  disablePaddingBottom = _ref.disablePaddingBottom,
39
39
  _ref$bottomShadow = _ref.bottomShadow,
40
- bottomShadow = _ref$bottomShadow === void 0 ? false : _ref$bottomShadow;
40
+ bottomShadow = _ref$bottomShadow === void 0 ? false : _ref$bottomShadow,
41
+ _ref$preventMarginTop = _ref.preventMarginTopCollapse,
42
+ preventMarginTopCollapse = _ref$preventMarginTop === void 0 ? false : _ref$preventMarginTop;
41
43
  return /*#__PURE__*/_react["default"].createElement("div", {
42
44
  className: cn({
43
45
  'bg-color': backgroundColor,
@@ -48,7 +50,9 @@ var Container = function Container(_ref) {
48
50
  ref: rootRef,
49
51
  id: id
50
52
  }, /*#__PURE__*/_react["default"].createElement("div", {
51
- className: cn('inner')
53
+ className: cn('inner', {
54
+ prevent: preventMarginTopCollapse
55
+ })
52
56
  }, /*#__PURE__*/_react["default"].createElement(_uiCore.ContentArea, null, children)));
53
57
  };
54
58
 
@@ -61,7 +65,8 @@ Container.propTypes = {
61
65
  }), _propTypes["default"].any])]),
62
66
  disablePaddingTop: _propTypes["default"].bool,
63
67
  disablePaddingBottom: _propTypes["default"].bool,
64
- bottomShadow: _propTypes["default"].bool
68
+ bottomShadow: _propTypes["default"].bool,
69
+ preventMarginTopCollapse: _propTypes["default"].bool
65
70
  };
66
71
  var _default = Container;
67
72
  exports["default"] = _default;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@megafon/ui-shared",
3
- "version": "6.9.1",
3
+ "version": "6.10.0",
4
4
  "files": [
5
5
  "dist"
6
6
  ],
@@ -82,7 +82,7 @@
82
82
  },
83
83
  "dependencies": {
84
84
  "@babel/runtime": "^7.8.4",
85
- "@megafon/ui-core": "^6.4.4",
85
+ "@megafon/ui-core": "^6.5.0",
86
86
  "@megafon/ui-helpers": "^2.6.0",
87
87
  "core-js": "^3.6.4",
88
88
  "htmr": "^0.9.2",
@@ -90,5 +90,5 @@
90
90
  "prop-types": "^15.7.2",
91
91
  "swiper": "^6.5.6"
92
92
  },
93
- "gitHead": "cb2d3e9827cb0754536a50f64c09a3b4a37af255"
93
+ "gitHead": "9804a8e7196f90b0c310e4ee83988276ff7b58bc"
94
94
  }