Skip to content

Commit b5f9f2c

Browse files
authored
Merge pull request #106 from mendix/fix/fix-sidebar
fix sidebar issue
2 parents a78e3e4 + 215dffc commit b5f9f2c

File tree

3 files changed

+26
-22
lines changed

3 files changed

+26
-22
lines changed

styles/web/css/main.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

styles/web/css/main.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

styles/web/sass/ui_resources/atlas_ui_resources/layouts/_layout-atlas-responsive.scss

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -41,22 +41,9 @@
4141

4242

4343
.mx-scrollcontainer-slide {
44-
&:not(.mx-scrollcontainer-open) > .region-sidebar {
45-
overflow: hidden;
46-
}
4744

4845
&.mx-scrollcontainer-open > .region-sidebar {
4946
width: $sidebar-width !important;
50-
51-
& > .mx-scrollcontainer-wrapper {
52-
position: relative;
53-
}
54-
}
55-
56-
.region-sidebar > .mx-scrollcontainer-wrapper {
57-
z-index: 2;
58-
left: 0 !important;
59-
background-color: inherit;
6047
}
6148
}
6249

@@ -70,13 +57,6 @@
7057
display: inline-block !important;
7158
}
7259
}
73-
74-
.mx-scrollcontainer-slide,
75-
.mx-scrollcontainer-push {
76-
&:not(.mx-scrollcontainer-open) > .region-sidebar {
77-
visibility: hidden;
78-
}
79-
}
8060

8161
// Sidebar
8262
.region-sidebar {
@@ -121,6 +101,12 @@
121101

122102
// Topbar variant
123103
.layout-atlas-responsive-topbar {
104+
.mx-scrollcontainer-slide,
105+
.mx-scrollcontainer-push {
106+
&:not(.mx-scrollcontainer-open) > .region-sidebar {
107+
visibility: hidden;
108+
}
109+
}
124110
}
125111

126112
// All responsive layouts
@@ -136,6 +122,24 @@
136122
}
137123
}
138124
}
125+
126+
.mx-scrollcontainer-slide {
127+
&:not(.mx-scrollcontainer-open) > .region-sidebar {
128+
overflow: hidden;
129+
}
130+
131+
&.mx-scrollcontainer-open > .region-sidebar {
132+
133+
& > .mx-scrollcontainer-wrapper {
134+
position: relative;
135+
}
136+
}
137+
138+
.region-sidebar > .mx-scrollcontainer-wrapper {
139+
z-index: 2;
140+
background-color: inherit;
141+
}
142+
}
139143
}
140144

141145
// Fix Safari issue of sidebar disappearing

0 commit comments

Comments
 (0)