Skip to content

Commit

Permalink
Merge branch 'main' into client-syntax-highlight
Browse files Browse the repository at this point in the history
  • Loading branch information
caugner committed Sep 11, 2024
2 parents ddf0d0f + f2bca97 commit 34b2173
Show file tree
Hide file tree
Showing 13 changed files with 2,144 additions and 3,033 deletions.
2 changes: 1 addition & 1 deletion .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
".": "2.62.0"
".": "2.63.0"
}
97 changes: 97 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

18 changes: 8 additions & 10 deletions client/src/document/organisms/sidebar/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,15 @@
padding-left: 0.5rem;
}

ol {
li {
.icon {
margin-right: 0.01em;
}
li {
.icon {
margin-right: 0.01em;
}

&.no-bullet {
display: block;
font-weight: var(--font-body-strong-weight);
list-style-type: none;
}
&.no-bullet {
display: block;
font-weight: var(--font-body-strong-weight);
list-style-type: none;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion client/src/observatory/results.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export default function ObservatoryResults() {
</section>
<div className="sidebar-container">
<SidebarContainer doc={{}}>
{<ObservatoryDocsNav /> || null}
<ObservatoryDocsNav />
</SidebarContainer>
</div>
{hasData && !combinedError && (
Expand Down
5 changes: 4 additions & 1 deletion client/src/playground/editor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,10 @@ function cmExtensions(colorScheme: string, language: string) {
];
}

const Editor = forwardRef<EditorHandle, any>(function EditorInner(
const Editor = forwardRef<
EditorHandle,
{ language: string; callback: () => void }
>(function EditorInner(
{
language,
callback = () => {},
Expand Down
6 changes: 5 additions & 1 deletion client/src/playground/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,11 @@ main.play {

> div.content {
align-items: end;
background: linear-gradient(to left, #111 16rem, transparent);
background: linear-gradient(
to left,
var(--place-new-side-background) 16rem,
transparent
);
flex-direction: column;
height: 100%;
justify-content: end;
Expand Down
7 changes: 1 addition & 6 deletions client/src/ui/molecules/tools-menu/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,7 @@ export const ToolsMenu = ({ visibleSubMenuId, toggleMenu }) => {

const menu = {
id: "tools",
label: (
<>
Tools <sup className="new">New</sup>
</>
),
label: "Tools",
items: [
{
description: "Write, test and share your code",
Expand All @@ -28,7 +24,6 @@ export const ToolsMenu = ({ visibleSubMenuId, toggleMenu }) => {
iconClasses: "submenu-icon",
label: OBSERVATORY_TITLE,
url: `/en-US/observatory`,
dot: "New",
},
{
description: "Get real-time assistance and support",
Expand Down
4 changes: 4 additions & 0 deletions client/src/ui/organisms/placement/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,10 @@ section.place {
width: initial;
}
}

html[data-nop] & {
display: none;
}
}

.dark section.place .pong-box2 {
Expand Down
Loading

0 comments on commit 34b2173

Please sign in to comment.