You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2014/07/17 10:35:58 UTC

svn commit: r1611284 - in /myfaces/tobago/trunk/src/site: apt/guide.apt fml/faq.fml

Author: lofwyr
Date: Thu Jul 17 08:35:58 2014
New Revision: 1611284

URL: http://svn.apache.org/r1611284
Log:
docs

Modified:
    myfaces/tobago/trunk/src/site/apt/guide.apt
    myfaces/tobago/trunk/src/site/fml/faq.fml

Modified: myfaces/tobago/trunk/src/site/apt/guide.apt
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/src/site/apt/guide.apt?rev=1611284&r1=1611283&r2=1611284&view=diff
==============================================================================
--- myfaces/tobago/trunk/src/site/apt/guide.apt (original)
+++ myfaces/tobago/trunk/src/site/apt/guide.apt Thu Jul 17 08:35:58 2014
@@ -606,7 +606,7 @@ mvn install -Pall-modules
   default <<<tobago.css>>> file of the theme.
 
   Tobago 1.0.x and Tobago 1.5.x are using the old name <<<style.css>>>, since Tobago 2.0.0
-  <<<tobago.css>>> is used, <<<style.css>>> will also be included for compatibility.
+  <<<tobago.css>>> is used, <<<style.css>>> will also be included for compatibility (in Tobago 2.x).
 
   The {{{https://svn.apache.org/repos/asf/myfaces/tobago/trunk/tobago-example/tobago-theme-example/}example theme}} provides
   an example for styling sheet cells and contains more complex examples of markup, which need addtional JavaScript

Modified: myfaces/tobago/trunk/src/site/fml/faq.fml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/src/site/fml/faq.fml?rev=1611284&r1=1611283&r2=1611284&view=diff
==============================================================================
--- myfaces/tobago/trunk/src/site/fml/faq.fml (original)
+++ myfaces/tobago/trunk/src/site/fml/faq.fml Thu Jul 17 08:35:58 2014
@@ -169,10 +169,10 @@
          <source>
 /META-INF/tobago-config.xml
 (resource-path/html/theme-name)
-/org/apache/myfaces/tobago/renderkit/html/xxxxx/standard/style/style.css (standard styles)
+/org/apache/myfaces/tobago/renderkit/html/xxxxx/standard/style/tobago.css (standard styles)
 /org/apache/myfaces/tobago/renderkit/html/xxxxx/standard/style/tobago-menu.css (menu styles)
 /org/apache/myfaces/tobago/renderkit/html/xxxxx/standard/style/tobago-sheet.css (sheet styles)
-/org/apache/myfaces/tobago/renderkit/html/xxxxx/msie/style/style.css (different styles for msie)</source>
+/org/apache/myfaces/tobago/renderkit/html/xxxxx/msie/style/tobago.css (different styles for msie)</source>
 
            Property and resource loading and renderer loading is done in the following order
            <source>
@@ -212,7 +212,7 @@ resource-path/content-type/theme/client/
           The standard markup is defined in tobago-config.xml of the tobago-theme-standard.
           This can be extended in your own theme.
           The markup attribute is rendered as a CSS class tobago-[renderer-name.toLowerCase]-markup-[markup].
-          For an example please look at the markup number and the CSS class tobago-in-markup-number for UIInput in theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css
+          For an example please look at the markup number and the CSS class tobago-in-markup-number for UIIn in theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/tobago.css
           </p>
       </answer>
     </faq>