Author: fmeschbe
Date: Sun Jun 3 18:03:14 2012
New Revision: 1345729
URL: http://svn.apache.org/viewvc?rev=1345729&view=rev
Log:
SLING-2002 Resource improvements:
- embed logo, ASF logo, and favicon with CSS
- surround images in content with a 1px black border
Added:
sling/site/trunk/content/res/
- copied from r1340755, sling/site/trunk/content/css/
sling/site/trunk/content/res/apache.png (with props)
sling/site/trunk/content/res/favicon.ico (with props)
sling/site/trunk/content/res/logo.png (with props)
Removed:
sling/site/trunk/content/css/
Modified:
sling/site/trunk/content/res/site.css
sling/site/trunk/templates/skeleton.html
Added: sling/site/trunk/content/res/apache.png
URL:
http://svn.apache.org/viewvc/sling/site/trunk/content/res/apache.png?rev=1345729&view=auto
==============================================================================
Binary file - no diff available.
Propchange: sling/site/trunk/content/res/apache.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: sling/site/trunk/content/res/favicon.ico
URL:
http://svn.apache.org/viewvc/sling/site/trunk/content/res/favicon.ico?rev=1345729&view=auto
==============================================================================
Binary file - no diff available.
Propchange: sling/site/trunk/content/res/favicon.ico
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: sling/site/trunk/content/res/logo.png
URL:
http://svn.apache.org/viewvc/sling/site/trunk/content/res/logo.png?rev=1345729&view=auto
==============================================================================
Binary file - no diff available.
Propchange: sling/site/trunk/content/res/logo.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: sling/site/trunk/content/res/site.css
URL:
http://svn.apache.org/viewvc/sling/site/trunk/content/res/site.css?rev=1345729&r1=1340755&r2=1345729&view=diff
==============================================================================
--- sling/site/trunk/content/res/site.css (original)
+++ sling/site/trunk/content/res/site.css Sun Jun 3 18:03:14 2012
@@ -1,5 +1,3 @@
-/* @override http://sling.apache.org/site/media.data/site.css */
-
body {
background-color: #ffffff;
color: #3b3b3b;
@@ -59,6 +57,14 @@ a:hover {
color: #1faae9
}
+img {
+ width: 100%;
+ border: solid 1px black;
+ margin-top: 0.5em;
+ margin-bottom: 0.5em;
+ padding: 0.5em
+}
+
.title {
position: absolute;
left: 1px;
@@ -71,6 +77,14 @@ a:hover {
background-position: bottom;
}
+.title img {
+ width: initial;
+ border: none;
+ margin-top: 0px;
+ margin-bottom: 0px;
+ padding: 0px;
+}
+
.logo {
position: absolute;
width: 15em;
Modified: sling/site/trunk/templates/skeleton.html
URL:
http://svn.apache.org/viewvc/sling/site/trunk/templates/skeleton.html?rev=1345729&r1=1345728&r2=1345729&view=diff
==============================================================================
--- sling/site/trunk/templates/skeleton.html (original)
+++ sling/site/trunk/templates/skeleton.html Sun Jun 3 18:03:14 2012
@@ -19,20 +19,20 @@
-->
<head>
<title>Apache Sling - {% block title %}{% endblock %}</title>
- <link rel="stylesheet" href="/css/site.css" type="text/css" media="all">
- <link rel="icon"
href="http://sling.apache.org/site/media.data/favicon.ico">
+ <link rel="stylesheet" href="/res/site.css" type="text/css" media="all">
+ <link rel="icon" href="/res/favicon.ico">
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
</head>
<body>
<div class="title">
<div class="logo">
- <a href="http://sling.apache.org/site/index.html">
- <img border="0" alt="Apache Sling"
src="http://sling.apache.org/site/media.data/logo.png">
+ <a href="http://sling.apache.org/">
+ <img border="0" alt="Apache Sling" src="/res/logo.png">
</a>
</div>
<div class="header">
<a href="http://www.apache.org/">
- <img border="0" alt="Apache"
src="http://sling.apache.org/site/media.data/apache.png">
+ <img border="0" alt="Apache" src="/res/apache.png">
</a>
</div>
</div>