Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x

This commit is contained in:
Jan Bartel 2021-11-17 14:23:19 +11:00
parent a99b1d90d0 aa5da31938
commit 508f289680
5 changed files with 45 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-home/src/main/resources/modules/demo-root.mod
View File

@ -15,5 +15,5 @@ webapps/root/
webapps/root/images/ webapps/root/images/
basehome:modules/demo.d/root/index.html|webapps/root/index.html basehome:modules/demo.d/root/index.html|webapps/root/index.html
basehome:modules/demo.d/root/jetty.css|webapps/root/jetty.css basehome:modules/demo.d/root/jetty.css|webapps/root/jetty.css
basehome:modules/demo.d/root/images/jetty-header.jpg|webapps/root/images/jetty-header.jpg basehome:modules/demo.d/root/images/jetty-pic.png|webapps/root/images/jetty-pic.png
basehome:modules/demo.d/root/images/webtide_logo.jpg|webapps/root/images/webtide_logo.jpg basehome:modules/demo.d/root/images/webtide_logo.jpg|webapps/root/images/webtide_logo.jpg

BIN
jetty-home/src/main/resources/modules/demo.d/root/images/jetty-header.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 101 KiB

BIN
jetty-home/src/main/resources/modules/demo.d/root/images/jetty-pic.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 482 KiB

8
jetty-home/src/main/resources/modules/demo.d/root/index.html
View File

@ -31,7 +31,7 @@
<table> <table>
<tr> <tr>
<td> <td>
<h2>demos ...</h2> <h2>demos</h2>
<ul> <ul>
<li><a href="/test/">Demo Jetty Webapp</a></li> <li><a href="/test/">Demo Jetty Webapp</a></li>
<li><a href="/test-spec/">Servlet 5.0 Test</a></li> <li><a href="/test-spec/">Servlet 5.0 Test</a></li>
@ -43,7 +43,7 @@
</ul> </ul>
</td> </td>
<td> <td>
<h2>information ...</h2> <h2>information</h2>
<ul> <ul>
<li><a href="https://www.eclipse.org/jetty/">Jetty Homepage</a></li> <li><a href="https://www.eclipse.org/jetty/">Jetty Homepage</a></li>
<li><a href="https://www.eclipse.org/jetty/documentation/current">Jetty Documentation</a></li> <li><a href="https://www.eclipse.org/jetty/documentation/current">Jetty Documentation</a></li>
@ -53,7 +53,7 @@
</ul> </ul>
</td> </td>
<td> <td>
<h2>getting&nbsp;help ...</h2> <h2>getting&nbsp;help</h2>
<ul> <ul>
<li><a href="https://www.eclipse.org/jetty/mailinglists.php">Mailing lists @ eclipse</a></li> <li><a href="https://www.eclipse.org/jetty/mailinglists.php">Mailing lists @ eclipse</a></li>
<li><a href="https://github.com/eclipse/jetty.project">Source @ github</a></li> <li><a href="https://github.com/eclipse/jetty.project">Source @ github</a></li>
@ -69,7 +69,7 @@
</div> </div>
<div id='blog'> <div id='blog'>
<h1>Jetty Blog</h1> <h1>Jetty Developer's Blog</h1>
<iframe src="https://webtide.com/blog.jsp" /> <iframe src="https://webtide.com/blog.jsp" />
</div> </div>
</body> </body>

275
jetty-home/src/main/resources/modules/demo.d/root/jetty.css
View File

@ -1,9 +1,9 @@
BODY BODY
{ {
font-family: Arial, Helvetica, sans-serif; font-family: Arial, Verdana, Helvetica, sans-serif;
background-color: #FFFFFF; background-color: #FFFFFF;
font-size: 10pt; font-size: 14pt;
color: #666666; color: #444444;
} }
img img
@ -15,51 +15,52 @@ img
div#header div#header
{ {
clear: both; clear: both;
background-image: url('images/jetty-header.jpg'); background-image: url('images/jetty-pic.png');
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
height:200px; height: 277px;
border-bottom: 3px ridge #cccccc; border: 2px solid #1b2857;
border-right: 3px ridge #cccccc; border-radius: 10px;
border-top: 3px groove #cccccc; width: 900px;
border-left: 3px groove #cccccc;
width: 850px;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
} }
div#content div#content
{ {
clear: both; clear: both;
font-size: 10pt; font-size: 14pt;
font-family: Verdana;
font-weight: normal; font-weight: normal;
color: #666666; color: #666666;
margin-top: 30px; margin-top: 30px;
width: 850px; width: 900px;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
} }
div#links table div#links table
{ {
width: 850px; width: 900px;
border-spacing: 6px;
margin: auto;
} }
div#links td div#links td
{ {
vertical-align: top; vertical-align: top;
text-align: left; text-align: left;
border: 2px dotted #cccccc; border: 1px solid #f6815c;
border-radius: 10px;
padding: 8px; padding: 8px;
background-color: #efefef;
width: 280px; width: 280px;
} }
div#links div#links
{ {
margin-top: 20px; margin-top: 20px;
width: 850px; width: 950px;
color: #999999; color: #999999;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
@ -68,38 +69,26 @@ div#links
div#links h1,h2,p div#links h1,h2,p
{ {
font-size: 10pt; font-size: 11pt;
font-family: sans-serif; font-family: Helvetica, sans-serif;
text-align:left; text-align:left;
margin: 5px; margin: 5px;
} }
div#links h1
{
font-size: 22pt;
font-weight: normal;
font-family: sans-serif;
letter-spacing: 6pt;
color: #666666;
text-align: center;
margin-top:20px;
}
div#links h2 div#links h2
{ {
font-size: 12pt; font-size: 12pt;
font-weight: normal; font-family: Arial, sans-serif;
letter-spacing: 2pt; font-weight: bolder;
color: #666666; letter-spacing: 1pt;
text-align: right;
color: #1b2857;
} }
div#blog div#blog
{ {
margin-top: 20px; margin-top: 20px;
width: 850px; width: 900px;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
} }
@ -108,26 +97,19 @@ div#blog iframe
{ {
width: 100%; width: 100%;
height:350px; height:350px;
border: 2px dotted #cccccc; border: 2px solid #1b2857;
border-radius: 10px;
} }
div#footer
{
clear: both;
border-top: 4px groove #cccccc;
margin-top:20px;
padding-top:10px;
width: 850px;
}
h1 h1
{ {
font-size: 14pt; font-size: 22pt;
text-align:center; font-family: Arial, sans-serif;
font-weight: bold;
text-align: left;
color: #1b2857;
margin-top: 60px;
margin-bottom: 30px;
} }
A:link A:link
@ -135,7 +117,7 @@ A:link
color: #0099cc; color: #0099cc;
text-decoration: none; text-decoration: none;
font-weight: normal; font-weight: normal;
font-size: 10pt; font-size: 11pt;
font-family:sans-serif; font-family:sans-serif;
} }
@ -144,7 +126,7 @@ A:visited
color: #0099cc; color: #0099cc;
text-decoration: none; text-decoration: none;
font-weight: normal; font-weight: normal;
font-size: 10pt; font-size: 11pt;
font-family:sans-serif; font-family:sans-serif;
} }
@ -153,7 +135,7 @@ A:hover
color: #ff6600; color: #ff6600;
text-decoration: none; text-decoration: none;
font-weight: normal; font-weight: normal;
font-size: 10pt; font-size: 11pt;
font-family:sans-serif; font-family:sans-serif;
} }
@ -162,7 +144,7 @@ A:active
color: #0099cc; color: #0099cc;
text-decoration: none; text-decoration: none;
font-weight: normal; font-weight: normal;
font-size: 10pt; font-size: 11pt;
font-family:sans-serif; font-family:sans-serif;
} }
@ -170,182 +152,3 @@ A.disabled
{ {
color: #666666; color: #666666;
} }
form
{
display: inline;
}
.SEVERE
{
background-color: #ff0000;
}
.WARNING
{
background-color: #ff6633;
}
.INFO
{
background-color: #00cc33;
}
.CONFIG
{
background-color: #999999;
}
.FINE
{
background-color: #3333ff;
}
.FINER
{
background-color: #3333cc;
}
.FINEST
{
background-color: #333399;
}
table
{
width: 100%;
border-spacing: 0px;
border-collapse: separate;
}
td
{
font-family: Arial,sans-serif;
font-size: 10pt;
padding: 2px;
margin: 0px;
border: #eeeeee groove 2px;
}
#content td
{
vertical-align: top;
}
#key
{
border-spacing: 0px;
border: 0px;
}
#key td
{
border: #eeeeee groove 2px;
font-size: 8pt;
font-family: Helvetica;
font-weight: bold;
color: white;
}
thead th
{
border: #eeeeee groove 2px;
}
.seq
{
width: 7em;
min-width: 7em;
max-width: 7em;
color: white;
font-family: Helvetica;
font-weight: bold;
}
.date
{
width: 19em;
min-width: 19em;
max-width: 19em;
color: black;
background-color: #eeeeee;
}
.thread
{
width: 3em;
min-width: 3em;
max-width: 3em;
color: black;
background-color: #eeeeee;
}
.logger
{
width: 30em;
min-width: 30em;
max-width: 30em;
background-color: #eeeeee;
}
.logclass
{
width: 30em;
min-width: 30em;
max-width: 30em;
background-color: #eeeeee;
}
.method
{
width: 20em;
min-width: 20em;
max-width: 20em;
background-color: #eeeeee;
}
.message
{
width: 250em;
min-width: 250em;
max-width: 250em;
text-align: left;
background-color: #eeeeee;
font-family: monospace;
}
.message table
{
border: 0px;
}
.message td,tr
{
text-align: left;
vertical-align: top;
padding-top: 0px;
border: 0px;
}
.except
{
background: #eeeeee;
padding-top: 2px;
}
.excepticon
{
width: 40px;
max-width: 40px;
min-width: 40px;
}
button
{
background: white;
}