Skip to content

Commit 4847dee

Browse files
committed
Update layouts
1 parent a2aa26c commit 4847dee

File tree

134 files changed

+18
-11
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+18
-11
lines changed

Atlas_UI_Reference_App.mpr

0 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
// THIS FILE IS AUTO-GENERATED. PLEASE DO NOT MODIFY THIS FILE.
2-
$use-modern-client: false;
2+
$use-modern-client: true;

themesource/atlas_core/web/core/widgets/_scroll-container-react.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@
210210
pointer-events: auto;
211211
}
212212

213-
.mx-scrollcontainer-center {
213+
.mx-scrollcontainer-middle {
214214
.mx-layoutgrid,
215215
.mx-layoutgrid-fluid {
216216
@include layout-spacing($type: padding, $direction: all, $device: responsive);

themesource/atlas_core/web/layouts/_layout-atlas-responsive.scss

+13-7
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@
44
Extra styling for responsive layouts
55
========================================================================== */
66
@mixin layout-atlas-responsive() {
7-
$sidebar-icon-height: 52px;
8-
$sidebar-icon-width: 52px;
7+
:root {
8+
--sidebar-icon-height: 52px;
9+
--sidebar-icon-width: 52px;
10+
}
911

1012
.layout-atlas-responsive,
1113
.layout-atlas-responsive-default,
12-
.layout-atlas-responsive-sidebar{
14+
.layout-atlas-responsive-sidebar {
1315
@media (min-width: $screen-md) {
1416
--closed-sidebar-width: var(--navsidebar-width-closed);
1517
.mx-scrollcontainer-shrink:not(.mx-scrollcontainer-open) > .region-sidebar,
@@ -29,7 +31,7 @@
2931
z-index: 100;
3032
top: var(--topbar-minimalheight);
3133
bottom: 0;
32-
left: $sidebar-icon-width;
34+
left: var(--sidebar-icon-width);
3335
display: block;
3436
min-width: auto;
3537
padding: var(--spacing-small) 0;
@@ -57,7 +59,7 @@
5759
z-index: 100;
5860
top: 0;
5961
bottom: 0;
60-
left: $sidebar-icon-width;
62+
left: var(--sidebar-icon-width);
6163
display: block;
6264
overflow-y: auto;
6365
min-width: auto;
@@ -111,7 +113,7 @@
111113
// Sidebar
112114
.region-sidebar {
113115
.toggle-btn {
114-
width: $sidebar-icon-width;
116+
width: var(--sidebar-icon-width);
115117
border-color: transparent;
116118
border-radius: 0;
117119
background: transparent;
@@ -160,6 +162,10 @@
160162
padding: var(--spacing-small) var(--spacing-medium);
161163
border-radius: var(--border-radius-default);
162164
}
165+
img {
166+
width: var(--sidebar-icon-width);
167+
padding: var(--spacing-small) var(--spacing-medium);
168+
}
163169
}
164170
}
165171
}
@@ -253,7 +259,7 @@
253259
&.mx-scrollcontainer-open {
254260
.region-sidebar:hover {
255261
.toggle-btn-sidebar {
256-
left: calc(var(--navsidebar-width-open) - $icon-size / 2);
262+
left: calc(var(--sidebar-size, var(--navsidebar-width-open)) - $icon-size / 2);
257263
rotate: 180deg;
258264
}
259265
}

themesource/atlas_core/web/main.scss

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
// Default variables
2-
@import "exclusion-variables";
2+
@import "exclusion-variables-defaults";
33
@import "../../../theme/web/exclusion-variables";
4+
@import "generated-exclusion-variables";
45
@import "variables";
56
@import "../../../theme/web/custom-variables";
6-
@import "themes/legacy-variables/css-variables-mappings"; // support for custom sass variable
7+
@import "themes/legacy-variables/css-variables-mappings";
78

89
// Font Family Import
910
@if $font-family-import != false {

0 commit comments

Comments
 (0)