Skip to content

Commit e1bbeb0

Browse files
committed
Renamed sidebar class
1 parent dc9153b commit e1bbeb0

File tree

6 files changed

+20
-15
lines changed

6 files changed

+20
-15
lines changed

packages/theme-pink-cupcake/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
88
## [6.0.0-beta.7](https://github.com/userfrosting/theme-pink-cupcake/compare/6.0.0-beta.6...6.0.0-beta.7)
99
- Add scroll-padding-top to prevent content from being hidden behind fixed headers when using anchor links
1010
- Minor UI tweaks to sidebar components
11+
- Renamed sidebar class
1112
- CSS: Add webkit-font-smoothing
1213

1314
## [6.0.0-beta.6](https://github.com/userfrosting/theme-pink-cupcake/compare/6.0.0-beta.5...6.0.0-beta.6)

packages/theme-pink-cupcake/src/components/Content/FooterContent.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<footer class="uf-main uk-section uk-section-small uk-section-muted uk-text-center">
2+
<footer class="uk-section uk-section-small uk-section-muted uk-text-center">
33
<hr />
44
<p class="uk-text-small uk-text-center" data-test="slot">
55
<slot></slot>
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<template>
2-
<div
3-
class="uf-main uk-section uk-section-default uk-section-muted"
2+
<main
3+
class="uk-section uk-section-default uk-section-muted"
44
uk-height-viewport="expand: true">
55
<div class="uk-container" data-test="slot">
66
<slot></slot>
77
</div>
8-
</div>
8+
</main>
99
</template>

packages/theme-pink-cupcake/src/components/NavBar/NavBar.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ withDefaults(
2323
<li>
2424
<a
2525
class="uk-navbar-item uk-logo"
26-
uk-toggle="target: aside.uf-sidenav; cls: open">
26+
uk-toggle="target: aside; cls: open">
2727
<font-awesome-icon icon="bars" />
2828
</a>
2929
</li>

packages/theme-pink-cupcake/src/components/SideBar/SideBar.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<aside class="uf-sidenav">
2+
<aside>
33
<ul class="uk-nav-default" uk-nav>
44
<slot></slot>
55
</ul>

packages/theme-pink-cupcake/src/less/components/uf-sidebar.less

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* Set to `light` to use dark text on light background for sidebar
66
*/
77
@sidebar-aside-color-mode: dark;
8+
@sidebar-aside-mode: left; // left | right
89

910
@sidebar-width: 285px;
1011
@sidebar-item-padding-vertical: 4px;
@@ -45,7 +46,7 @@
4546
/* ========================================================================
4647
Component: Sidebar
4748
========================================================================== */
48-
aside.uf-sidenav {
49+
aside {
4950
--uk-inverse: @sidebar-aside-color-mode;
5051
position: fixed;
5152
left: 0;
@@ -59,7 +60,8 @@ aside.uf-sidenav {
5960
transition: height 0.3s ease-out;
6061

6162
/* Set main content beside sidebar */
62-
~ .uf-main {
63+
~ main,
64+
~ footer {
6365
margin-left: @sidebar-width;
6466
}
6567

@@ -131,23 +133,25 @@ aside.uf-sidenav {
131133
// @media (max-width: @breakpoint-small-max) {}
132134
/* Phone landscape and smaller */
133135
@media (max-width: @breakpoint-small-max) {
134-
aside.uf-sidenav:not(.open) {
136+
aside:not(.open) {
135137
display: none !important;
136138
}
137139

138-
aside.uf-sidenav {
139-
~ .uf-main {
140+
aside {
141+
~ main,
142+
~ footer {
140143
margin-left: inherit;
141144
}
142145
}
143146
}
144147

145148
// Right side modifier
146-
aside.uf-sidenav-right {
149+
aside when (@sidebar-aside-mode = right) {
147150
left: auto;
148151
right: 0;
149152

150-
~ .uf-main {
153+
~ main,
154+
~ footer {
151155
margin-right: @sidebar-width;
152156
margin-left: inherit;
153157
}
@@ -168,7 +172,7 @@ aside.uf-sidenav-right {
168172
/* ========================================================================
169173
Dark mode variant
170174
========================================================================== */
171-
aside.uf-sidenav when (@sidebar-aside-color-mode = dark) {
175+
aside when (@sidebar-aside-color-mode = dark) {
172176
background-color: @inverse-sidebar-background;
173177

174178
.uk-nav-default > li > a {
@@ -202,7 +206,7 @@ aside.uf-sidenav when (@sidebar-aside-color-mode = dark) {
202206
}
203207

204208
// Apply light text color to nav headers
205-
.uk-nav-header {
209+
.uk-nav-default .uk-nav-header {
206210
color: @global-inverse-color;
207211
}
208212
}

0 commit comments

Comments
 (0)