Skip to content

Commit cd166c6

Browse files
authored
Merge branch 'main' into feat/lesson
2 parents 6061675 + 150ffa3 commit cd166c6

File tree

6 files changed

+20
-19
lines changed

6 files changed

+20
-19
lines changed

RELEASE-NOTES.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ Please note after `1.0` Semver will be followed using normal protocols.
1313
## Improvements
1414
* Expression evaluation has been improved to support additional cases with mixed Lisp and JS style function callbacks
1515
* Improved the performance characteristics of reactive conditionals in templates
16-
17-
## Bugs
18-
* Fix `pick` in utils to work with proxy objects
19-
2016
For instance you can now pass js to Lisp style arguments
2117
```javascript
2218
{concat 'my' 'friend' (isDog ? 'simon dog' : 'pookie cat') }
19+
```
20+
21+
## Bugs
22+
* Fix `pick` in utils to work with proxy objects
2323

2424
# Version 0.10.4-0.10.8
2525

docs/src/helpers/navigation.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,10 +308,10 @@ export const getSidebarMenu = async ({ url, topbarSection }) => {
308308
};
309309

310310
/* Adds links for prev/next page used at bottom of guide pages */
311-
export const getPageTraversalLinks = async ({ url }) => {
311+
export const getPageTraversalLinks = async ({ url = '' }) => {
312+
url = url.replace(/\/$/, '');
312313
const menu = await await getFlattenedSidebarMenu({ url });
313314
const currentIndex = findIndex(menu, item => item.url == url);
314-
315315
let next;
316316
let previous;
317317
if (currentIndex >= 0) {

docs/src/layouts/Layout.astro

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import '../css/layers.css';
33
import '../css/fonts.css';
44
5-
import { UIIcon } from '@semantic-ui/core';
5+
import { UICard, UIIcon } from '@semantic-ui/core';
66
import Body from './Body.astro';
77
import Sidebar from '@components/Sidebar.astro';
88
import DocsMasthead from '@components/DocsMasthead.astro';
@@ -68,26 +68,26 @@ const activeURL = Astro.url.pathname;
6868
<div class="traversal">
6969
<ui-container>
7070
{pageTraversal.previous && (
71-
<ui-card href={pageTraversal.previous.url} previous>
71+
<UICard fluid href={pageTraversal.previous.url} previous>
7272
<div class="label">
7373
<ui-icon icon="left chevron"></ui-icon>
7474
Previous
7575
</div>
7676
<div class="header">
7777
{pageTraversal.previous.name}
7878
</div>
79-
</ui-card>
79+
</UICard>
8080
)}
8181
{pageTraversal.next && (
82-
<ui-card href={pageTraversal.next.url} next>
82+
<UICard fluid href={pageTraversal.next.url} next>
8383
<div class="label">
8484
Next
8585
<ui-icon icon="right chevron"></ui-icon>
8686
</div>
8787
<div class="header">
8888
{pageTraversal.next.name}
8989
</div>
90-
</ui-card>
90+
</UICard>
9191
)}
9292
</ui-container>
9393
</div>

docs/src/layouts/Layout.css

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,31 +76,32 @@
7676

7777
ui-container {
7878
display: flex;
79-
79+
gap: 2rem;
8080
}
8181

8282
ui-card {
8383
text-align: left;
84-
min-width: 300px;
84+
width: 50%;
85+
86+
flex-grow: 1;
8587
.label {
8688
color: var(--primary-text-color);
8789
font-weight: bold;
88-
font-size: var(--small);
90+
font-size: var(--large);
8991
transition: var(--transition);
9092
}
9193
.header {
9294
color: var(--standard-60);
93-
font-size: var(--large);
95+
font-size: var(--huge);
9496
font-weight: var(--bold);
9597
transition: var(--transition);
9698
}
9799
}
98100

99101
[previous] {
100-
margin-right: auto;
102+
text-align: left;
101103
}
102104
[next]{
103-
margin-left: auto;
104105
text-align: right;
105106
}
106107
}

src/components/card/css/card-shadow.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
@layer component.card.variations.fluid {
183183
:host([fluid]),
184184
.fluid.card {
185-
width: 100%;
185+
--card-width: auto;
186186
--card-image-max-width: none;
187187
}
188188
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
:host([fluid]),
22
.fluid.card {
3-
width: 100%;
3+
--card-width: auto;
44
--card-image-max-width: none;
55
}

0 commit comments

Comments
 (0)