Skip to content

Commit 146d251

Browse files
committed
Fixes a problem where calculated max-height might get overridden
Under certain circumstances calculated max-height might get overridden by the one specified in the css (+ if the css isn’t mobile first).
1 parent 0378da4 commit 146d251

6 files changed

+7
-7
lines changed

Diff for: client/dist/responsive-nav.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@
421421
for (var i = 0; i < nav.inner.length; i++) {
422422
savedHeight += nav.inner[i].offsetHeight;
423423
}
424-
var innerStyles = "." + opts.navClass + ".opened{max-height:" + savedHeight + "px}";
424+
var innerStyles = "." + opts.navClass + ".opened{max-height:" + savedHeight + "px !important}";
425425

426426
if (styleElement.styleSheet) {
427427
styleElement.styleSheet.cssText = innerStyles;

Diff for: client/dist/responsive-nav.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: client/src/responsive-nav.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ var responsiveNav = function (el, options) {
303303
for (var i = 0; i < nav.inner.length; i++) {
304304
savedHeight += nav.inner[i].offsetHeight;
305305
}
306-
var innerStyles = "." + opts.navClass + ".opened{max-height:" + savedHeight + "px}";
306+
var innerStyles = "." + opts.navClass + ".opened{max-height:" + savedHeight + "px !important}";
307307

308308
if (styleElement.styleSheet) {
309309
styleElement.styleSheet.cssText = innerStyles;

Diff for: client/test/responsive-nav.spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ describe("responsive-nav", function () {
4545
insertNav();
4646
var styleEl = document.getElementsByTagName("style")[0],
4747
styleContents = styleEl.innerHTML || styleEl.styleSheet.cssText.replace(/\s+/g, "").replace(/\;/g, "");
48-
expect(styleContents.replace(/\.opened/g, "")).toBe(".nav-collapse{max-height:16px}");
48+
expect(styleContents.replace(/\.opened/g, "")).toBe(".nav-collapse{max-height:16px !important}");
4949
nav.destroy();
5050
});
5151

@@ -112,7 +112,7 @@ describe("responsive-nav", function () {
112112
insertNav();
113113
var styleEl = document.getElementsByTagName("style")[0],
114114
styleContents = styleEl.innerHTML || styleEl.styleSheet.cssText.replace(/\s+/g, "").replace(/\;/g, "");
115-
expect(styleContents.replace(/\.opened/g, "")).toBe(".nav-collapse{max-height:50px}");
115+
expect(styleContents.replace(/\.opened/g, "")).toBe(".nav-collapse{max-height:50px !important}");
116116
nav.destroy();
117117
});
118118

Diff for: responsive-nav.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@
421421
for (var i = 0; i < nav.inner.length; i++) {
422422
savedHeight += nav.inner[i].offsetHeight;
423423
}
424-
var innerStyles = "." + opts.navClass + ".opened{max-height:" + savedHeight + "px}";
424+
var innerStyles = "." + opts.navClass + ".opened{max-height:" + savedHeight + "px !important}";
425425

426426
if (styleElement.styleSheet) {
427427
styleElement.styleSheet.cssText = innerStyles;

0 commit comments

Comments
 (0)