This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/juneau-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new a456ec5e2 Merge branch 'asf-site' of
https://gitbox.apache.org/repos/asf/juneau-website.git into asf-site
a456ec5e2 is described below
commit a456ec5e25643abbb54c41ef537b2254b22dc3c9
Author: JamesBognar <[email protected]>
AuthorDate: Mon Jul 4 15:59:52 2022 -0400
Merge branch 'asf-site' of
https://gitbox.apache.org/repos/asf/juneau-website.git into asf-site
---
content/site/apidocs-9.0.0/overview-summary.html | 2 +-
content/site/apidocs-9.0.0/resources/juneau-code.css | 2 ++
content/styles/juneau-code.css | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/content/site/apidocs-9.0.0/overview-summary.html
b/content/site/apidocs-9.0.0/overview-summary.html
index ca90d457b..09d1ef4e9 100644
--- a/content/site/apidocs-9.0.0/overview-summary.html
+++ b/content/site/apidocs-9.0.0/overview-summary.html
@@ -1551,7 +1551,7 @@
<p class='bjava'>
<jc>// Parse a JSON object as a bean.</jc>
String <jv>json</jv> = <js>"{\"name\":\"John Smith\","\age\":21}"</js>;
- Person <jv>person</jv> = Json.<jsm>from</jsm>(<jv>json</jv>,
Person.<jk>class</jk>);
+ Person <jv>person</jv> = Json.<jsm>to</jsm>(<jv>json</jv>,
Person.<jk>class</jk>);
</p>
<p>
Marshalling support is provided for a wide variety of POJO types
including:
diff --git a/content/site/apidocs-9.0.0/resources/juneau-code.css
b/content/site/apidocs-9.0.0/resources/juneau-code.css
index f899d9cc9..b597b4c07 100644
--- a/content/site/apidocs-9.0.0/resources/juneau-code.css
+++ b/content/site/apidocs-9.0.0/resources/juneau-code.css
@@ -91,6 +91,7 @@ bc {
p.bcode,p.bjava,p.bjson,p.bxml,p.bini,p.buon,p.burlenc,p.bconsole,p.bschema,
div.bcode,div.bjava,div.bjson,div.bxml,div.bini,div.buon,div.burlenc,div.bconsole,div.bschema
{
border-left: 3px solid #4c6b87;
+ margin: 0px 20px 5px 20px;
overflow: hidden;
background-color: #f8f8f8;
}
@@ -107,6 +108,7 @@ dd p.bschema, dd div.bschema,
dd p.bconsole, dd div.bconsole {
margin-left:0px;
margin-right:20px;
+ margin-bottom:5px;
}
/* Override padding bottom in javadoc comments. */
diff --git a/content/styles/juneau-code.css b/content/styles/juneau-code.css
index b597b4c07..d93e85158 100644
--- a/content/styles/juneau-code.css
+++ b/content/styles/juneau-code.css
@@ -92,7 +92,7 @@
p.bcode,p.bjava,p.bjson,p.bxml,p.bini,p.buon,p.burlenc,p.bconsole,p.bschema,
div.bcode,div.bjava,div.bjson,div.bxml,div.bini,div.buon,div.burlenc,div.bconsole,div.bschema
{
border-left: 3px solid #4c6b87;
margin: 0px 20px 5px 20px;
- overflow: hidden;
+ overflow: auto;
background-color: #f8f8f8;
}
