beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-21 23:20:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge 51fe39eca6 into d6bcd3fb0b

Browse source
This commit is contained in:
sideshowbarker 2024-11-20 20:01:46 -05:00 committed by GitHub
commit aaff1a4b6c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Libraries/LibWebView/InspectorClient.cpp
View file

@ -610,9 +610,7 @@ String InspectorClient::generate_dom_tree(JsonObject const& dom_tree)
comment = escape_html_entities(comment); comment = escape_html_entities(comment);
builder.appendff("<span class=\"hoverable comment\" {}>", data_attributes.string_view()); builder.appendff("<span class=\"hoverable comment\" {}>", data_attributes.string_view());
builder.append("<span>&lt;!--</span>"sv); builder.appendff("<span data-node-type=\"comment\" class=\"editable\" title=\"comment\">{}</span>", comment);
builder.appendff("<span data-node-type=\"comment\" class=\"editable\">{}</span>", comment);
builder.append("<span>--&gt;</span>"sv);
builder.append("</span>"sv); builder.append("</span>"sv);
return; return;
} }
@ -639,7 +637,6 @@ String InspectorClient::generate_dom_tree(JsonObject const& dom_tree)
auto tag = name.to_lowercase(); auto tag = name.to_lowercase();
builder.appendff("<span class=\"hoverable\" {}>", data_attributes.string_view()); builder.appendff("<span class=\"hoverable\" {}>", data_attributes.string_view());
builder.append("<span>&lt;</span>"sv);
builder.appendff("<span data-node-type=\"tag\" data-tag=\"{0}\" class=\"editable tag\">{0}</span>", tag); builder.appendff("<span data-node-type=\"tag\" data-tag=\"{0}\" class=\"editable tag\">{0}</span>", tag);
if (auto attributes = node.get_object("attributes"sv); attributes.has_value()) { if (auto attributes = node.get_object("attributes"sv); attributes.has_value()) {
@ -658,7 +655,6 @@ String InspectorClient::generate_dom_tree(JsonObject const& dom_tree)
}); });
} }
builder.append("<span>&gt;</span>"sv);
builder.append("</span>"sv); builder.append("</span>"sv);
}); });

22
Libraries/LibWebView/SourceHighlighter.h
View file

@ -87,7 +87,9 @@ constexpr inline StringView HTML_HIGHLIGHTER_STYLE = R"~~~(
} }
:root { :root {
--comment-color: lightgreen; --comment-color: dimgrey;
--comment-hover-color: lightgreen;
--details-background-color: #333;
--keyword-color: orangered; --keyword-color: orangered;
--name-color: orange; --name-color: orange;
--value-color: deepskyblue; --value-color: deepskyblue;
@ -100,7 +102,9 @@ constexpr inline StringView HTML_HIGHLIGHTER_STYLE = R"~~~(
@media (prefers-color-scheme: light) { @media (prefers-color-scheme: light) {
:root { :root {
--comment-color: green; --comment-color: silver;
--comment-hover-color: green;
--details-background-color: whitesmoke;
--keyword-color: red; --keyword-color: red;
--name-color: darkorange; --name-color: darkorange;
--value-color: blue; --value-color: blue;
@ -133,6 +137,16 @@ constexpr inline StringView HTML_HIGHLIGHTER_STYLE = R"~~~(
color: var(--line-number-color); color: var(--line-number-color);
} }
details, div {
margin-top: 4px;
margin-bottom: 4px;
details {
border: 1px solid #777;
border-radius: 6px;
padding: 2px 3px 2px 3px !important;
background-color: var(--details-background-color);
}
.tag { .tag {
font-weight: 600; font-weight: 600;
color: var(--keyword-color); color: var(--keyword-color);
@ -140,6 +154,10 @@ constexpr inline StringView HTML_HIGHLIGHTER_STYLE = R"~~~(
.comment { .comment {
color: var(--comment-color); color: var(--comment-color);
} }
.comment:hover {
color: var(--comment-hover-color);
background-color: inherit !important;
}
.attribute-name { .attribute-name {
color: var(--name-color); color: var(--name-color);
} }