Skip to content

Commit efa266e

Browse files
authored
Prepare atlas4 release (#280)
* fix: hide-desktop being forced on profile-tablet * allow secondary color for topbar with sidebar menu
1 parent c044883 commit efa266e

File tree

5 files changed

+11
-1
lines changed

5 files changed

+11
-1
lines changed
-2.67 KB
Loading
113 Bytes
Loading

packages/atlas/src/themesource/atlas_core/web/core/helpers/_helper-classes.scss

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,12 +209,16 @@
209209
display: none #{$important-helpers-value};
210210
}
211211
}
212+
213+
// force hide everything that should be hidden only on mid-size screen
214+
// to be also hidden on tablet with big screen width.
212215
.profile-tablet .hide-tablet {
213216
display: none #{$important-helpers-value};
214217
}
215218

216219
@media (min-width: $screen-lg) {
217-
.hide-desktop {
220+
// due to force hidden, this is needed to only be hidden on desktop with profile-desktop.
221+
.profile-desktop .hide-desktop {
218222
display: none #{$important-helpers-value};
219223
}
220224
}

packages/atlas/src/themesource/atlas_core/web/layouts/_layout-atlas.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,11 @@
7171
background: var(--navtopbar-bg);
7272
border-bottom: var(--navtopbar-border-bottom);
7373

74+
// allow secondary color for different type of navbar
75+
&.topbar-secondary{
76+
background: var(--navtopbar-bg-secondary, --navtopbar-bg);
77+
}
78+
7479
// Topbar Content
7580
.topbar-content {
7681
display: flex;

packages/atlas/src/themesource/atlas_core/web/themes/_theme-default.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@
176176
--navtopbar-glyph-size: 1.2em;
177177

178178
--navtopbar-bg: var(--topbar-bg);
179+
--navtopbar-bg-secondary: transparent;
179180
--navtopbar-bg-hover: var(--navigation-bg-hover);
180181
--navtopbar-bg-active: var(--navigation-bg-active);
181182
--navtopbar-color: var(--navigation-color);

0 commit comments

Comments
 (0)