From: Brett Porter Date: Tue, 5 Sep 2006 14:53:29 +0000 (+0000) Subject: apply a new stylesheet X-Git-Tag: archiva-0.9-alpha-1~605 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b2d80fe809faf44f70f155afadc2db23e81a2513;p=archiva.git apply a new stylesheet Submitted by: Joel Sudiacal (CSS and icons) git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@440363 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp b/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp index 556c91424..8e7ba5f8a 100644 --- a/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp +++ b/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp @@ -26,17 +26,37 @@ -<%-- TODO: image by type -jar ---%> - -<%-- TODO: download link -
- Download -
---%> - + + + + Maven Plugin + + + + POM + + <%-- These types aren't usually set in the POM yet, so we fudge them for the well known ones --%> + + + Maven Archetype + + + + Maven Skin + + <%-- Must be last so that the above get picked up if possible --%> + + + JAR + + + + + + +${packageName} +

@@ -48,9 +68,15 @@

+
+ <%-- TODO! download URL + + --%> +
+
-

+ @@ -78,7 +104,7 @@ <%-- TODO: Mailing Lists --%> -

+
<%-- TODO: perhaps using ajax? --%> diff --git a/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag b/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag index 98b5303f7..b43205abb 100644 --- a/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag +++ b/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag @@ -28,15 +28,14 @@ + + + - - - + ${text} - - - + ${text} diff --git a/archiva-webapp/src/main/webapp/css/maven-theme.css b/archiva-webapp/src/main/webapp/css/maven-theme.css index e035dce77..cb6ad3b9c 100644 --- a/archiva-webapp/src/main/webapp/css/maven-theme.css +++ b/archiva-webapp/src/main/webapp/css/maven-theme.css @@ -15,7 +15,7 @@ */ body { - padding: 0px 0px 10px 0px; + padding: 0 0 10px 0; } body, td, select, input, li { @@ -27,6 +27,36 @@ select, input { font-size: x-small; } +#contentBox h1 { + background-image: url( ../images/arrow.gif ); + background-repeat: no-repeat; + background-position: left bottom; + border-bottom: 1px solid #DFDEDE; + padding: 0 0 1px 23px; + margin-bottom: 7px; + color: #333; + voice-family: inherit; + font-size: small !important; +} + +#contentBox h2 { + border-bottom: 1px solid #DFDEDE; + padding: 0 0 1px 0; + margin-bottom: 7px; + color: #333; + voice-family: inherit; + font-size: small !important; +} + +#contentBox h3 { + border-bottom: 1px solid #DFDEDE; + padding: 0 0 1px 0; + margin-bottom: 7px; + color: #333; + voice-family: inherit; + font-size: small !important; +} + table { width: auto; } @@ -36,10 +66,6 @@ code { font-size: 13px; } -a { - text-decoration: none; -} - #legend li.externalLink { background: url( ../images/external.png ) left top no-repeat; padding-left: 18px; @@ -76,26 +102,7 @@ p { color: gray; font-weight: bold; font-size: 11px; - padding: 10px 0px 1px 19px; -} - -table.bodyTable th { - color: white; - background-color: #bbb; - text-align: left; - font-weight: bold; -} - -table.bodyTable th, table.bodyTable td { - font-size: 1em; -} - -table.bodyTable tr.a { - background-color: #ddd; -} - -table.bodyTable tr.b { - background-color: #eee; + padding: 10px 0 1px 19px; } .source { @@ -135,10 +142,6 @@ dt { color: white } -a:link { - color: #333; -} - .errormark, .warningmark, .donemark, .infomark { background: url( ../images/icon_error_sml.gif ) no-repeat; } @@ -195,6 +198,10 @@ a:link { display: block; } +#navcolumn li.collapsed { + background-image: url( ../images/super.gif ); +} + #navcolumn li.expanded { background-image: url( ../images/super.gif ); height: inherit; @@ -222,9 +229,41 @@ a:link { display: block; } +#navcolumn li ul li { + color: #333 !important; + text-indent: 30px !important; + line-height: 20px !important; + height: 20px !important; + background-image: url( ../images/supersub.gif ) !important; + font-size: 9px; + width: 161px; + background-repeat: no-repeat; + display: block; + padding-left: 0; +} + +#navcolumn li ul li a:hover { + color: #fff !important; + background: url( ../images/super_hl_sub.gif ) 0 -20px no-repeat; + background-position: right; + width: 161px; + display: block; +} + #footer { background: url( ../images/footerborder.gif ) 0 5px repeat-x; padding: 14px 4px 12px 4px; margin-top: 2em; } +a:link, a:visited { + color: #333; +} + +#navcolumn a { + text-decoration: none; +} + +a:active, a:hover { + color: #f30; +} diff --git a/archiva-webapp/src/main/webapp/css/site.css b/archiva-webapp/src/main/webapp/css/site.css index 99059b193..80a0a9a7c 100644 --- a/archiva-webapp/src/main/webapp/css/site.css +++ b/archiva-webapp/src/main/webapp/css/site.css @@ -14,80 +14,74 @@ * limitations under the License. */ +.sidebar3 { + width: 10em; + float: right; + text-align: center; +} + +#sidebarb { + font-size: small; + text-align: center; + padding: 10px 10px 10px 10px; + border: 1px #DFDEDE solid; + width: 10em; +} + #sidebar { float: right; font-size: small; margin: 10px; padding: 10px; - border: 1px black solid; + border: 1px #DFDEDE solid; + width: 10em; +} + +#download { + background-image: url( ../images/dl.gif ); + background-repeat: no-repeat; + float: right; + font-size: small; + font-weight: bold; + margin: 10px; + padding: 10px; + height: auto; width: 10em; + display: block; +} + +#download a { + text-decoration: none; } #contentArea { - border: 1px solid black; margin-right: 15em; padding: 1em; } -#tabs strong { - border: 1px solid black; +#tabs b { + border: 1px #DFDEDE solid; padding-left: 1em; padding-right: 1em; } #tabs a { - border: 1px solid black; + border: 1px #DFDEDE solid; padding-left: 1em; padding-right: 1em; text-decoration: none; } #tabArea { - border: 1px solid black; + border-top: 1px solid #DFDEDE; padding: 1em; } -#searchBox p { - font-size: x-small; - text-align: center; - color: gray; -} - #searchTypes { text-align: right; font-size: xx-small; } -/* TODO: remove if they aren't used -#feed { - float: right; -} - -.downloadButton { - background-color: green; - border: double white; - float: right; - padding: 5px; -} - -.downloadButton a { - font-size: large; - color: white; - font-weight: bold; - text-decoration: none; -} - -#labels { - background-color: #f2f2f2; - padding: 0.5em 1em 0.5em 1em; -} - -.statusWarn { - color: orange; - font-weight: bold; -} -*/ - .statusOk { color: green; font-weight: bold; @@ -107,18 +101,3 @@ .actionMessage { font-weight: bold; } - -sWarn { - color: orange; - font-weight: bold; -} - -/* WebWork validation failures */ -.errorMessage { - color: red; - font-weight: bold; -} - -.actionMessage { - font-weight: bold; -} diff --git a/archiva-webapp/src/main/webapp/images/archetype.gif b/archiva-webapp/src/main/webapp/images/archetype.gif new file mode 100755 index 000000000..40958a5ee Binary files /dev/null and b/archiva-webapp/src/main/webapp/images/archetype.gif differ diff --git a/archiva-webapp/src/main/webapp/images/arrow.gif b/archiva-webapp/src/main/webapp/images/arrow.gif new file mode 100755 index 000000000..ce00e3d0c Binary files /dev/null and b/archiva-webapp/src/main/webapp/images/arrow.gif differ diff --git a/archiva-webapp/src/main/webapp/images/dl.gif b/archiva-webapp/src/main/webapp/images/dl.gif new file mode 100755 index 000000000..710e7b848 Binary files /dev/null and b/archiva-webapp/src/main/webapp/images/dl.gif differ diff --git a/archiva-webapp/src/main/webapp/images/jar.gif b/archiva-webapp/src/main/webapp/images/jar.gif new file mode 100755 index 000000000..63dcb611a Binary files /dev/null and b/archiva-webapp/src/main/webapp/images/jar.gif differ diff --git a/archiva-webapp/src/main/webapp/images/mavenplugin.gif b/archiva-webapp/src/main/webapp/images/mavenplugin.gif new file mode 100755 index 000000000..04430ccf6 Binary files /dev/null and b/archiva-webapp/src/main/webapp/images/mavenplugin.gif differ diff --git a/archiva-webapp/src/main/webapp/images/other.gif b/archiva-webapp/src/main/webapp/images/other.gif new file mode 100755 index 000000000..23c84b7af Binary files /dev/null and b/archiva-webapp/src/main/webapp/images/other.gif differ diff --git a/archiva-webapp/src/main/webapp/images/pom.gif b/archiva-webapp/src/main/webapp/images/pom.gif new file mode 100755 index 000000000..1ce952fde Binary files /dev/null and b/archiva-webapp/src/main/webapp/images/pom.gif differ diff --git a/archiva-webapp/src/main/webapp/images/skin.gif b/archiva-webapp/src/main/webapp/images/skin.gif new file mode 100755 index 000000000..d59ff62bb Binary files /dev/null and b/archiva-webapp/src/main/webapp/images/skin.gif differ diff --git a/archiva-webapp/src/main/webapp/images/super_hl_sub.gif b/archiva-webapp/src/main/webapp/images/super_hl_sub.gif new file mode 100755 index 000000000..0b35f7a26 Binary files /dev/null and b/archiva-webapp/src/main/webapp/images/super_hl_sub.gif differ diff --git a/archiva-webapp/src/main/webapp/images/supersub.gif b/archiva-webapp/src/main/webapp/images/supersub.gif new file mode 100755 index 000000000..3f28dbce5 Binary files /dev/null and b/archiva-webapp/src/main/webapp/images/supersub.gif differ diff --git a/design/white-site/src/site/resources/css/site.css b/design/white-site/src/site/resources/css/site.css index 13fa49ebb..80a0a9a7c 100644 --- a/design/white-site/src/site/resources/css/site.css +++ b/design/white-site/src/site/resources/css/site.css @@ -17,12 +17,12 @@ .sidebar3 { width: 10em; float: right; - text-align:center; + text-align: center; } #sidebarb { font-size: small; - text-align:center; + text-align: center; padding: 10px 10px 10px 10px; border: 1px #DFDEDE solid; width: 10em; @@ -38,20 +38,19 @@ } #download { - font-size: 11px; background-image: url( ../images/dl.gif ); - background-repeat:no-repeat; + background-repeat: no-repeat; float: right; font-size: small; - font-weight:bold; + font-weight: bold; margin: 10px; padding: 10px; - height:auto; + height: auto; width: 10em; display: block; } -#download a:link, a:visited { +#download a { text-decoration: none; }