Skip to content

Commit

Permalink
Merge branch 'develop' into wip/frizi/panic-handling
Browse files Browse the repository at this point in the history
  • Loading branch information
Frizi committed Aug 17, 2023
2 parents 35c9880 + 1dfdee5 commit 54a8aab
Show file tree
Hide file tree
Showing 41 changed files with 940 additions and 973 deletions.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

85 changes: 65 additions & 20 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions app/gui/view/documentation/assets/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@
padding-bottom: 4px;
}

.enso-docs code {
font-family: EnsoRegular;
}

.enso-docs .unordered-list {
margin: 0;
padding: 0;
Expand Down Expand Up @@ -195,6 +199,7 @@ div.enso-docs .marked-icon-info {
}

.enso-docs .example {
font-family: EnsoRegular;
white-space: pre;
overflow-x: auto;
margin: 0.05rem 0.1rem;
Expand Down
9 changes: 3 additions & 6 deletions app/gui/view/documentation/src/html.rs
Original file line number Diff line number Diff line change
Expand Up @@ -258,13 +258,10 @@ fn list_of_examples<'a>(examples: &'a Examples) -> Box<dyn Render + 'a> {
}
}

/// Build an HTML code of the example from the documentation section. Engine already provides as
/// with a preformatted HTML code, but we need to modify some tags in order to properly style it.
fn example_from_doc_section(doc_section: &DocSection) -> String {
fn example_from_doc_section(doc_section: &DocSection) -> &str {
match doc_section {
DocSection::Marked { mark: Mark::Example, body, .. } =>
body.replace("<pre>", "<div class=\"example\">").replace("</pre>", "</div>"),
_ => String::from("Invalid example"),
DocSection::Marked { mark: Mark::Example, body, .. } => body,
_ => "Invalid example",
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ impl Model {
dom.dom().set_attribute_or_warn("class", "visualization scrollable");
dom.dom().set_style_or_warn("overflow-x", "hidden");
dom.dom().set_style_or_warn("overflow-y", "auto");
dom.dom().set_style_or_warn("font-family", "DejaVuSansMonoBook");
dom.dom().set_style_or_warn("font-family", "EnsoRegular");
dom.dom().set_style_or_warn("font-size", "12px");
dom.dom().set_style_or_warn("border-radius", "14px");
dom.dom().set_style_or_warn("padding-left", &padding_text);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ impl SpanWidget for Widget {

let ext = ctx.get_extension_or_default::<Extension>();
let bold = ext.bold || is_placeholder;
let text_weight = bold.then_some(text::Weight::Bold);
let text_weight = bold.then_some(text::Weight::ExtraBold);

let input = &self.frp.public.input;
input.content(content);
Expand Down
1 change: 0 additions & 1 deletion app/ide-desktop/lib/content/esbuild-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@ export function bundlerOptions(args: Arguments) {
pathModule.resolve(THIS_PATH, 'src', 'index.html'),
pathModule.resolve(THIS_PATH, 'src', 'run.js'),
pathModule.resolve(THIS_PATH, 'src', 'style.css'),
pathModule.resolve(THIS_PATH, 'src', 'docsStyle.css'),
pathModule.resolve(THIS_PATH, 'src', 'serviceWorker.ts'),
...wasmArtifacts.split(pathModule.delimiter),
...fsSync
Expand Down
Loading

0 comments on commit 54a8aab

Please sign in to comment.