Author: rwesten
Date: Tue May 24 13:42:43 2011
New Revision: 790009

Log:
Publishing merge to stanbol site by rwesten

Modified:
    websites/production/stanbol/   (props changed)
    websites/production/stanbol/content/stanbol/css/stanbol.css
    
websites/production/stanbol/content/stanbol/docs/trunk/entityhub/entityhubandlinkeddata.html

Propchange: websites/production/stanbol/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 24 13:42:43 2011
@@ -1 +1 @@
-/websites/staging/stanbol/trunk:779452-789942
+/websites/staging/stanbol/trunk:779452-790008

Modified: websites/production/stanbol/content/stanbol/css/stanbol.css
==============================================================================
--- websites/production/stanbol/content/stanbol/css/stanbol.css (original)
+++ websites/production/stanbol/content/stanbol/css/stanbol.css Tue May 24 
13:42:43 2011
@@ -17,12 +17,31 @@ h1,h2,h3,h4,h5,h6 {
   color: #6f3f00;
 }
 
-#content {
- margin: 50px 100px 100px 300px;
- padding: 0 30px 40px;
- background-color: #fff;
+@media screen
+{
+  #content {
+     margin: 50px 100px 100px 300px;
+     padding: 0 30px 40px;
+     background-color: #fff;
+  }
+  #navigation {
+    font-size: 85%;
+    color: #333;
+    float: left;
+    padding: 20px 3px 3px 15px;
+    position: fixed;
+    top: 10px;
+  }
+}
+@media print 
+{
+  #content {
+    background-color: #fff;
+  }
+  #navigation {
+    display: none;
+  }
 }
-
 #content h1,h2,h3,h4,h5,h6 {
   color: #6f3f00;
   border-bottom: 1px solid #ffdaae;
@@ -50,14 +69,6 @@ h1,h2,h3,h4,h5,h6 {
   margin-bottom: 0;
 }
 
-#navigation {
-  font-size: 85%;
-  color: #333;
-  float: left;
-  padding: 20px 3px 3px 15px;
-  position: fixed;
-  top: 10px;
-}
 
 #navigation img {
   padding-bottom: 20px;

Modified: 
websites/production/stanbol/content/stanbol/docs/trunk/entityhub/entityhubandlinkeddata.html
==============================================================================
--- 
websites/production/stanbol/content/stanbol/docs/trunk/entityhub/entityhubandlinkeddata.html
 (original)
+++ 
websites/production/stanbol/content/stanbol/docs/trunk/entityhub/entityhubandlinkeddata.html
 Tue May 24 13:42:43 2011
@@ -47,7 +47,7 @@
   <div id="content">
     <h1 class="title"></h1>
     <h1 id="adopting-linked-media-principles-for-stanbol-entityhub">Adopting 
Linked Media principles for Stanbol Entityhub</h1>
-<p><a href="http://linkeddata.org/";>Linked Data</a> describe the idea of 
linking - formally unconnected - bits of data over the web. Think about how 
hyperlinks are used to navigate within the Web of documents. Linked data tries 
to do the same for the Web of Data. This basic idea is also central to most of 
the Apache Stanbol Components. However Stanbol is not only concerned about 
about linking data but also with interlinking the web of documents with the web 
of data. Therefore <a 
href="http://lists.w3.org/Archives/Public/public-lod/2011May/0019.html";>this 
proposal</a> to extend Linked Data principles to also support content and not 
just data seams like a natural fit for Apache Stanbol.</p>
+<p><a href="http://linkeddata.org/";>Linked Data</a> describes the idea of 
linking - formally unconnected - bits of data over the web. Think about how 
hyperlinks are used to navigate within the Web of documents. Linked data tries 
to do the same for the Web of Data. This basic idea is also central to most of 
the Apache Stanbol Components. However Stanbol is not only concerned about 
about linking data but also with interlinking the web of documents with the web 
of data. Therefore <a 
href="http://lists.w3.org/Archives/Public/public-lod/2011May/0019.html";>this 
proposal</a> to extend Linked Data principles to also support content and not 
just data seams like a natural fit for Apache Stanbol.</p>
 <p>This Documents first provides a short introduction to Linked Data and the 
proposed Linked Media extensions. The second part of the document analysis 
requirements of the Stanbol Entityhub related to Linked Data and Linked Media. 
The third section goes than into more details on how Linked Media principles 
could be implemented by Entityhub.</p>
 <h2 
id="short-introduction-to-linked-data-and-proposed-linked-media-extensions">Short
 Introduction to Linked Data and proposed Linked Media extensions</h2>
 <p>from <a href="http://linkeddata.org/faq";>linkeddata.org</a> </p>


Reply via email to