swapped carbide theme for slate theme
authorfturovic <frank.turovich@nokia.com>
Tue, 29 Jun 2010 14:04:33 -0500
changeset 1554 f83f6a37088e
parent 1547 c01ec4eb0dbe
child 1556 707b5fa4c143
swapped carbide theme for slate theme
core/com.nokia.carbide.cpp/about.html
core/com.nokia.carbide.cpp/intro/css/graphics/rootpage/background_carbide.jpg
core/com.nokia.carbide.cpp/plugin.properties
core/com.nokia.carbide.cpp/plugin.xml
core/com.nokia.carbide.cpp/themes/carbide/graphics/contentpage/background.jpg
core/com.nokia.carbide.cpp/themes/carbide/graphics/root/background.jpg
core/com.nokia.carbide.cpp/themes/carbide/html/firststeps.css
core/com.nokia.carbide.cpp/themes/carbide/html/migrate.css
core/com.nokia.carbide.cpp/themes/carbide/html/overview.css
core/com.nokia.carbide.cpp/themes/carbide/html/root.css
core/com.nokia.carbide.cpp/themes/carbide/html/shared.css
core/com.nokia.carbide.cpp/themes/carbide/html/tutorials.css
core/com.nokia.carbide.cpp/themes/carbide/html/webresources.css
core/com.nokia.carbide.cpp/themes/carbide/html/whatsnew.css
--- a/core/com.nokia.carbide.cpp/about.html	Mon Jun 28 08:02:30 2010 -0500
+++ b/core/com.nokia.carbide.cpp/about.html	Tue Jun 29 14:04:33 2010 -0500
@@ -1,26 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-	<title>Tips &amp; Hints</title>
-    <link href="carbide.css" rel="stylesheet" type="text/css">
-</head>
-
-<body>
-<p align="center">&nbsp;</p>
-<table width="530" border="0" align="center" cellspacing="5" bgcolor="#FFFFFF">
-  <tr>
-    <td width="215"><img src="icons/about.png" width="215" height="199"></td>
-    <td width="294"><p align="right" class="text"><b><img src="intro/css/graphics/rootpage/brandmark.gif" ></b></p>
-      <p class="text">&nbsp;</p>
-      <p class="text">&nbsp;</p>
-      <p class="titleSmall">Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).  
-All rights reserved. <br>
-License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></p>
-      <p class="titleSmall">This product includes software developed by Eclipse Project. <a href="http://www.eclipse.org">http://www.eclipse.org</a></p>
-    </td>
-  </tr>
-</table>
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<title>Tips &amp; Hints</title>
+    <link href="carbide.css" rel="stylesheet" type="text/css">
+</head>
+
+<body background="intro/css/graphics/rootpage/background_carbide.jpg">
+<p align="center">&nbsp;</p>
+<table width="530" border="0" align="center" cellspacing="5" bgcolor="#FFFFFF">
+  <tr>
+    <td width="215"><img src="icons/about.png" width="215" height="199"></td>
+    <td width="294"><p align="right" class="text"><b><img src="intro/css/graphics/rootpage/brandmark.gif" ></b></p>
+      <p class="text">&nbsp;</p>
+      <p class="titleSmall">Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).  
+All rights reserved. <br>
+License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></p>
+      <p class="titleSmall">This product includes software developed by Eclipse Project. <a href="http://www.eclipse.org">http://www.eclipse.org</a></p>
+    </td>
+  </tr>
+</table>
+</body>
 </html>
\ No newline at end of file
Binary file core/com.nokia.carbide.cpp/intro/css/graphics/rootpage/background_carbide.jpg has changed
--- a/core/com.nokia.carbide.cpp/plugin.properties	Mon Jun 28 08:02:30 2010 -0500
+++ b/core/com.nokia.carbide.cpp/plugin.properties	Tue Jun 29 14:04:33 2010 -0500
@@ -7,13 +7,13 @@
 CHEAT_SHEETS_MENU = &Cheat Sheets...
 
 productBlurb=\nCarbide.c++ Version 3.0.0\n\
-Build {0} {1}\n\n\n\n\n\
+Build {0} {1}\n\n\n\
 Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.\n\
 Visit http://developer.symbian.org/\n\
 This product includes software developed by Eclipse Project.\n\
 Visit http://www.eclipse.org/
 
-theme.name.carbide = Carbide
+theme.name.carbide = Slate
 
 carbcPreference.common=carbide symbian cpp cplusplus
 carbcPreference.diagnostics=diagnostic logs
@@ -23,5 +23,5 @@
 PreferencePages.Capabilities.categoryName = &Capabilities
 PreferencePages.Capabilities.activityPromptButton = &Prompt when enabling capabilities
 PreferencePages.Capabilities.activityPromptButtonTooltip = Prompt when a feature is first used that requires enablement of capabilities
-PreferencePages.Capabilities.captionMessage = Capabilities allow you to enable or disable various product components.  These capabilities are grouped according to a set of predefined categories.
+PreferencePages.Capabilities.captionMessage = Capabilities allow you to enable or disable various product components. These capabilities are grouped according to a set of predefined categories.
 
--- a/core/com.nokia.carbide.cpp/plugin.xml	Mon Jun 28 08:02:30 2010 -0500
+++ b/core/com.nokia.carbide.cpp/plugin.xml	Tue Jun 29 14:04:33 2010 -0500
@@ -61,7 +61,7 @@
 			value="Migration information available."/>
 		<property
 			name="introDescription-webresources"
-			value="The following web resources provide information and guidance on creating Symbian OS progams using Carbide.c++"/>
+			value="The following web resources provide information and guidance on creating Symbian OS programs using Carbide.c++"/>
 		
 		<!-- Splash screen attributes -->
 		<property 
Binary file core/com.nokia.carbide.cpp/themes/carbide/graphics/contentpage/background.jpg has changed
Binary file core/com.nokia.carbide.cpp/themes/carbide/graphics/root/background.jpg has changed
--- a/core/com.nokia.carbide.cpp/themes/carbide/html/firststeps.css	Mon Jun 28 08:02:30 2010 -0500
+++ b/core/com.nokia.carbide.cpp/themes/carbide/html/firststeps.css	Tue Jun 29 14:04:33 2010 -0500
@@ -1,22 +1,22 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-body {
-	/* background-image : url(../graphics/root/background.jpg); */
-}
-
-/* show the "selected" image for this page */
-#navigation-links a#firststeps img, 
-#navigation-links a#firststeps:hover img,
-#navigation-links a#firststeps:focus img,
-#navigation-links a#firststeps:active img {
-	background-image : url(../graphics/icons/ctool/firsteps48sel.gif); 
-}
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+body {
+	background-image : url(../graphics/root/background.jpg);
+}
+
+/* show the "selected" image for this page */
+#navigation-links a#firststeps img, 
+#navigation-links a#firststeps:hover img,
+#navigation-links a#firststeps:focus img,
+#navigation-links a#firststeps:active img {
+	background-image : url(../graphics/icons/ctool/firsteps48sel.gif); 
+}
--- a/core/com.nokia.carbide.cpp/themes/carbide/html/migrate.css	Mon Jun 28 08:02:30 2010 -0500
+++ b/core/com.nokia.carbide.cpp/themes/carbide/html/migrate.css	Tue Jun 29 14:04:33 2010 -0500
@@ -1,22 +1,22 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-body {
-	/* background-image : url(../graphics/root/background.jpg); */
-}
-
-/* show the "selected" image for this page */
-#navigation-links a#migrate img, 
-#navigation-links a#migrate:hover img,
-#navigation-links a#migrate:focus img,
-#navigation-links a#migrate:active img {
-	background-image : url(../graphics/icons/ctool/migrate48sel.gif); 
-}
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+body {
+	background-image : url(../graphics/root/background.jpg);
+}
+
+/* show the "selected" image for this page */
+#navigation-links a#migrate img, 
+#navigation-links a#migrate:hover img,
+#navigation-links a#migrate:focus img,
+#navigation-links a#migrate:active img {
+	background-image : url(../graphics/icons/ctool/migrate48sel.gif); 
+}
--- a/core/com.nokia.carbide.cpp/themes/carbide/html/overview.css	Mon Jun 28 08:02:30 2010 -0500
+++ b/core/com.nokia.carbide.cpp/themes/carbide/html/overview.css	Tue Jun 29 14:04:33 2010 -0500
@@ -1,22 +1,22 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-body {
-	/* background-image : url(../graphics/root/background.jpg); */
-}
-
-/* show the "selected" image for this page */
-#navigation-links a#overview img, 
-#navigation-links a#overview:hover img,
-#navigation-links a#overview:focus img,
-#navigation-links a#overview:active img {
-	background-image : url(../graphics/icons/ctool/overview48sel.gif); 
-}
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+body {
+	background-image : url(../graphics/root/background.jpg);
+}
+
+/* show the "selected" image for this page */
+#navigation-links a#overview img, 
+#navigation-links a#overview:hover img,
+#navigation-links a#overview:focus img,
+#navigation-links a#overview:active img {
+	background-image : url(../graphics/icons/ctool/overview48sel.gif); 
+}
--- a/core/com.nokia.carbide.cpp/themes/carbide/html/root.css	Mon Jun 28 08:02:30 2010 -0500
+++ b/core/com.nokia.carbide.cpp/themes/carbide/html/root.css	Tue Jun 29 14:04:33 2010 -0500
@@ -1,291 +1,292 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-/* 
- * Set up general font colours, sizes, etc.  Some of these will override
- * settings from the shared CSS 
- */
-.intro-header H1 {
-	font-family: Helvetica, sans-serif;
-	font-size: 20px;
-	color: #0A94D6;
-}
-
-#page-links a .link-label, #action-links a .link-label {
-	font-size : 13pt;
-	font-weight : 600;
-	color : #0A94D6;
-}
-#page-links a p .text, #action-links a p .text {
-	font-size : 13pt;
-	font-weight : 500;
-	color : #333333;
-}
-
-/*
- * Turn off shared backround image.
- */
-
-.page {
-	background-image: none;
-}
-
-/*
- * Set up the content for the root page.
- */
-body {
-	min-width : 770px;
-	/* since IE doesn't support min-width, use expression */
-	width:expression(document.body.clientWidth < 770? "770px": "auto" );
-	/* background-image : url(../graphics/root/background.jpg); */
-	background-repeat : no-repeat;
-	background-position : top left;
-	/* background-color : #7169D1; */
-}
-#root {
-/*
-	/* background-image : url(../graphics/root/brandmark.gif); */
-*/
-	background-repeat : no-repeat;
-	background-position : bottom left;
-	min-height : 450px;
-	height : 100%;
-	height : expression(document.body.clientHeight < 450? "450px": "100%" );
-}
-
-#branding {
-	position: absolute;
-	bottom : 10px;
-	left : 10px;
-}
-
-/*
- * We will not use the general-purpose group1 used in
- * other pages for a curve image.
- */
-
-#extra-group1 {
-	display : none;
-}
-/* 
- * Set up the navigation bar.  It should be centered in the middle
- * of the page
- */
-#links-background {
-	/* background-image : url(../graphics/root/dots.gif); */
-	background-repeat : repeat-x;
-	width : 100%;
-	height : 177px;
-	margin-top : 18%;
-	margin-bottom : auto;
-	text-align : center;
-}
-/* specify a width for Moz so we can center.  
- * **Important** If additional links are added, we will have to increase this width 
- * to accomodate them, otherwise they will wrap to a new line 
- */
-
-#links-background > #page-links {
-	width: 33em;
-	margin: 0 auto;
-}
-
-#page-links {
-	position : relative;
-	top : 50px;
-	text-align: center;
-}
-#page-links a {
-	position : relative;
-	width : 86px;
-	margin-left : 1em;
-	margin-right : 1em;
-	text-align : center;
-	vertical-align : top;
-}
-/* float left for Moz so the items all appear inline */
-#page-links > a {
-	float : left;
-	position : relative;
-}
-#page-links a img {
-	height : 82px;
-	width : 82px;
-	vertical-align : middle;
-}
-
-/* remove the hover image from the flow of the document,
-   so it doesn't take up space and change the position
-   of the link label and descriptions */
-#page-links a .background-image {
-	position : absolute;
-}
-/* properly align the link label and text based on class (left vs. right) */
-#page-links a:hover {
-	/* This is needed for IE to force the hover pseudo selectors below to work.*/
-	padding : 0 em;
-}
-/* Hide both the label and the description of the link and remove them from static HTML flow, until user hovers over link */
-/* First, set the width of both the label and the description to a max of 15 em. */
-/* This can be changed when translated to different country locals. */
-#page-links a span {
-	width : 16em;
-}
-
-/* Set up left links orientation first. */
-#page-links a.left:link .link-label,
-#page-links a.left:visited .link-label {
-	display: none;
-}
-#page-links a.left:hover .link-label,
-#page-links a.left:focus .link-label,
-#page-links a.left:active .link-label {
-	text-align: left;
-	display: block;
-	position: absolute;
-	top : 120 %;
-	left : 0;
-}
-
-/* hide description and remove it from static HTML flow, until user hovers over link */
-#page-links a.left:link .text,
-#page-links a.left:visited .text {
-	display: none;
-}
-#page-links a.left:hover .text,
-#page-links a.left:focus .text,
-#page-links a.left:active .text {
-	text-align: left;
-	display: block;
-	position: absolute;
-	left : 0;
-	top: 145%;
-}
-/* Set up right links orientation now. */
-#page-links a.right:link .link-label,
-#page-links a.right:visited .link-label {
-	display: none;
-}
-#page-links a.right:hover .link-label,
-#page-links a.right:focus .link-label,
-#page-links a.right:active .link-label {
-	text-align: right;
-	display: block;
-	position: absolute;
-	top : 120 %;
-	right : 0;
-}
-/* hide description and remove it from static HTML flow, until user hovers over link */
-#page-links a.right:link .text,
-#page-links a.right:visited .text {
-	display: none;
-}
-#page-links a.right:hover .text,
-#page-links a.right:focus .text,
-#page-links a.right:active .text {
-	text-align: right;
-	display: block;
-	position: absolute;
-	right : 0;
-	top: 145%;
-}
-
-/* properties for each of the page-links  */
-#page-links a#overview img { background-image : url(../graphics/icons/etool/overview72.gif); }
-#page-links a:hover#overview img { background-image : url(../graphics/icons/ctool/overview72.gif); }
-
-#page-links a#tutorials img { background-image : url(../graphics/icons/etool/tutorials72.gif); }
-#page-links a:hover#tutorials img { background-image : url(../graphics/icons/ctool/tutorials72.gif); }
-
-#page-links a#samples img { background-image : url(../graphics/icons/etool/samples72.gif); }
-#page-links a:hover#samples img { background-image : url(../graphics/icons/ctool/samples72.gif); }
-
-#page-links a#whatsnew img { background-image : url(../graphics/icons/etool/whatsnew72.gif); }
-#page-links a:hover#whatsnew img { background-image : url(../graphics/icons/ctool/whatsnew72.gif); }
-
-#page-links a#firststeps img { background-image : url(../graphics/icons/etool/firsteps72.gif); }
-#page-links a:hover#firststeps img { background-image : url(../graphics/icons/ctool/firsteps72.gif); }
-
-#page-links a#webresources img { background-image : url(../graphics/icons/etool/webrsrc72.gif); }
-#page-links a:hover#webresources img { background-image : url(../graphics/icons/ctool/webrsrc72.gif); }
-
-#page-links a#migrate img { background-image : url(../graphics/icons/etool/migrate72.gif); }
-#page-links a:hover#migrate img { background-image : url(../graphics/icons/ctool/migrate72.gif); }
-
-/*
- * Set up the action links
- */
-#action-links {
-	width : 98%;
-	position : absolute;
-	left : 0px;
-	top : 20px;
-}
-#action-links a#workbench {
-	position : absolute;
-	top : -16px;
-	right : -8px;
-	text-align : right;
-}
-#action-links a .background-image,
-#action-links a #workbench_img {
-	height : 53px;
-	width : 53px;
-	text-align : center;
-	vertical-align : top;
-}
-/* special case for mozilla */
-#action-links a > .background-image,
-#action-links a > #workbench_img {
-	vertical-align : middle;
-}
-/* remove the hover image from the flow of the document,
-   so it doesn't take up space and change the position
-   of the main image */
-#action-links a .background-image {
-	position : absolute;
-}
-
-#action-links a#workbench .background-image {
-	background-image : url(../graphics/icons/etool/wb48.gif);
-}
-
-#action-links a#workbench:hover .background-image,
-#action-links a#workbench:focus .background-image,
-#action-links a#workbench:active .background-image {
-	background-image : url(../graphics/icons/ctool/wb48.gif);
-	visibility : visible;
-	position: absolute;
-	top: 0px;
-	right: 0px;	
-}
-/* hide the link and description until users hover over the link */
-#action-links a p .text, #action-links a .link-label {
-	display : none;
-}
-#action-links a:hover .link-label,
-#action-links a:focus .link-label,
-#action-links a:active .link-label {
-	display : block;
-	width : 16em;
-	margin-left : 10px;
-}
-#action-links a:hover p .text,
-#action-links a:focus p .text,
-#action-links a:active p .text {
-	display : block;
-	width : 16em;
-}
-#action-links a:hover,
-#action-links a:focus,
-#action-links a:active {
-	border : 0px;
-}
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/* 
+ * Set up general font colours, sizes, etc.  Some of these will override
+ * settings from the shared CSS 
+ */
+.intro-header H1 {
+	font-family: Helvetica, sans-serif;
+	font-size: 20px;
+	color: #000000;
+}
+
+#page-links a .link-label, #action-links a .link-label {
+	font-size : 13pt;
+	font-weight : 600;
+	color : #000000;
+}
+#page-links a p .text, #action-links a p .text {
+	font-size : 13pt;
+	font-weight : 500;
+	color : #333333;
+}
+
+/*
+ * Turn off shared backround image.
+ */
+
+.page {
+	background-position:left-10 top-10;
+	background-image: background.jpg;
+}
+
+/*
+ * Set up the content for the root page.
+ */
+body {
+	min-width : 770px;
+	/* since IE doesn't support min-width, use expression */
+	width:expression(document.body.clientWidth < 770? "770px": "auto" );
+	/* background-image : url(../graphics/root/background.jpg); */
+	background-repeat : no-repeat;
+	background-position : top left;
+	/* background-color : #7169D1; */
+}
+#root {
+/*
+	/* background-image : url(../graphics/root/brandmark.gif); */
+*/
+	background-repeat : no-repeat;
+	background-position : bottom left;
+	min-height : 450px;
+	height : 100%;
+	height : expression(document.body.clientHeight < 450? "450px": "100%" );
+}
+
+#branding {
+	position: absolute;
+	bottom : 10px;
+	left : 10px;
+}
+
+/*
+ * We will not use the general-purpose group1 used in
+ * other pages for a curve image.
+ */
+
+#extra-group1 {
+	display : none;
+}
+/* 
+ * Set up the navigation bar.  It should be centered in the middle
+ * of the page
+ */
+#links-background {
+	/* background-image : url(../graphics/root/dots.gif); */
+	background-repeat : repeat-x;
+	width : 100%;
+	height : 177px;
+	margin-top : 18%;
+	margin-bottom : auto;
+	text-align : center;
+}
+/* specify a width for Moz so we can center.  
+ * **Important** If additional links are added, we will have to increase this width 
+ * to accomodate them, otherwise they will wrap to a new line 
+ */
+
+#links-background > #page-links {
+	width: 33em;
+	margin: 0 auto;
+}
+
+#page-links {
+	position : relative;
+	top : 50px;
+	text-align: center;
+}
+#page-links a {
+	position : relative;
+	width : 86px;
+	margin-left : 1em;
+	margin-right : 1em;
+	text-align : center;
+	vertical-align : top;
+}
+/* float left for Moz so the items all appear inline */
+#page-links > a {
+	float : left;
+	position : relative;
+}
+#page-links a img {
+	height : 82px;
+	width : 82px;
+	vertical-align : middle;
+}
+
+/* remove the hover image from the flow of the document,
+   so it doesn't take up space and change the position
+   of the link label and descriptions */
+#page-links a .background-image {
+	position : absolute;
+}
+/* properly align the link label and text based on class (left vs. right) */
+#page-links a:hover {
+	/* This is needed for IE to force the hover pseudo selectors below to work.*/
+	padding : 0 em;
+}
+/* Hide both the label and the description of the link and remove them from static HTML flow, until user hovers over link */
+/* First, set the width of both the label and the description to a max of 15 em. */
+/* This can be changed when translated to different country locals. */
+#page-links a span {
+	width : 16em;
+}
+
+/* Set up left links orientation first. */
+#page-links a.left:link .link-label,
+#page-links a.left:visited .link-label {
+	display: none;
+}
+#page-links a.left:hover .link-label,
+#page-links a.left:focus .link-label,
+#page-links a.left:active .link-label {
+	text-align: left;
+	display: block;
+	position: absolute;
+	top : 120 %;
+	left : 0;
+}
+
+/* hide description and remove it from static HTML flow, until user hovers over link */
+#page-links a.left:link .text,
+#page-links a.left:visited .text {
+	display: none;
+}
+#page-links a.left:hover .text,
+#page-links a.left:focus .text,
+#page-links a.left:active .text {
+	text-align: left;
+	display: block;
+	position: absolute;
+	left : 0;
+	top: 145%;
+}
+/* Set up right links orientation now. */
+#page-links a.right:link .link-label,
+#page-links a.right:visited .link-label {
+	display: none;
+}
+#page-links a.right:hover .link-label,
+#page-links a.right:focus .link-label,
+#page-links a.right:active .link-label {
+	text-align: right;
+	display: block;
+	position: absolute;
+	top : 120 %;
+	right : 0;
+}
+/* hide description and remove it from static HTML flow, until user hovers over link */
+#page-links a.right:link .text,
+#page-links a.right:visited .text {
+	display: none;
+}
+#page-links a.right:hover .text,
+#page-links a.right:focus .text,
+#page-links a.right:active .text {
+	text-align: right;
+	display: block;
+	position: absolute;
+	right : 0;
+	top: 145%;
+}
+
+/* properties for each of the page-links  */
+#page-links a#overview img { background-image : url(../graphics/icons/etool/overview72.gif); }
+#page-links a:hover#overview img { background-image : url(../graphics/icons/ctool/overview72.gif); }
+
+#page-links a#tutorials img { background-image : url(../graphics/icons/etool/tutorials72.gif); }
+#page-links a:hover#tutorials img { background-image : url(../graphics/icons/ctool/tutorials72.gif); }
+
+#page-links a#samples img { background-image : url(../graphics/icons/etool/samples72.gif); }
+#page-links a:hover#samples img { background-image : url(../graphics/icons/ctool/samples72.gif); }
+
+#page-links a#whatsnew img { background-image : url(../graphics/icons/etool/whatsnew72.gif); }
+#page-links a:hover#whatsnew img { background-image : url(../graphics/icons/ctool/whatsnew72.gif); }
+
+#page-links a#firststeps img { background-image : url(../graphics/icons/etool/firsteps72.gif); }
+#page-links a:hover#firststeps img { background-image : url(../graphics/icons/ctool/firsteps72.gif); }
+
+#page-links a#webresources img { background-image : url(../graphics/icons/etool/webrsrc72.gif); }
+#page-links a:hover#webresources img { background-image : url(../graphics/icons/ctool/webrsrc72.gif); }
+
+#page-links a#migrate img { background-image : url(../graphics/icons/etool/migrate72.gif); }
+#page-links a:hover#migrate img { background-image : url(../graphics/icons/ctool/migrate72.gif); }
+
+/*
+ * Set up the action links
+ */
+#action-links {
+	width : 98%;
+	position : absolute;
+	left : 0px;
+	top : 20px;
+}
+#action-links a#workbench {
+	position : absolute;
+	top : -16px;
+	right : -8px;
+	text-align : right;
+}
+#action-links a .background-image,
+#action-links a #workbench_img {
+	height : 53px;
+	width : 53px;
+	text-align : center;
+	vertical-align : top;
+}
+/* special case for mozilla */
+#action-links a > .background-image,
+#action-links a > #workbench_img {
+	vertical-align : middle;
+}
+/* remove the hover image from the flow of the document,
+   so it doesn't take up space and change the position
+   of the main image */
+#action-links a .background-image {
+	position : absolute;
+}
+
+#action-links a#workbench .background-image {
+	background-image : url(../graphics/icons/etool/wb48.gif);
+}
+
+#action-links a#workbench:hover .background-image,
+#action-links a#workbench:focus .background-image,
+#action-links a#workbench:active .background-image {
+	background-image : url(../graphics/icons/ctool/wb48.gif);
+	visibility : visible;
+	position: absolute;
+	top: 0px;
+	right: 0px;	
+}
+/* hide the link and description until users hover over the link */
+#action-links a p .text, #action-links a .link-label {
+	display : none;
+}
+#action-links a:hover .link-label,
+#action-links a:focus .link-label,
+#action-links a:active .link-label {
+	display : block;
+	width : 16em;
+	margin-left : 10px;
+}
+#action-links a:hover p .text,
+#action-links a:focus p .text,
+#action-links a:active p .text {
+	display : block;
+	width : 16em;
+}
+#action-links a:hover,
+#action-links a:focus,
+#action-links a:active {
+	border : 0px;
+}
--- a/core/com.nokia.carbide.cpp/themes/carbide/html/shared.css	Mon Jun 28 08:02:30 2010 -0500
+++ b/core/com.nokia.carbide.cpp/themes/carbide/html/shared.css	Tue Jun 29 14:04:33 2010 -0500
@@ -1,443 +1,443 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-/* 
- * Set up general fonts, sizes and colors 
- */
-body { font-family : Verdana, Helvetica, sans-serif; }
-
-H1, H2, H3, H4, p, a { color : #0A94D6; }
-
-.intro-header H1 {
-	font-family: Verdana, Helvetica, sans-serif;
-	font-size: 20px;
-	color: #0A94D6;
-}
-
-h2 {
-	font-size : 13pt;
-	font-weight : normal;
-	color : #0A94D6;
-}
-/* For regular div labels */
-H4 .div-label {
-	font-size : 10pt;
-	font-weight : bold;
-}
-
-/* For separators */
-HR {
-	width: 90%;
-	align: left;
-	height : 1px;
-	color :  #0A94D6;
-}
-
-/* For the main page content's title */
-#content-header H4 .div-label {
-	font-size : 14pt;
-	font-weight : bold;
-	color : #0A94D6;
-	float : none;
-	clear : both;
-}
-
-.page-description { 
-	font-size : 10pt;
-	float : none;
-	clear : both;
-}
-
-a {
-	font-weight : bold;
-	text-decoration : none;
-	color : #4D4D4D;
-}
-
-a .link-label {
-	font-size : 10pt;
-	font-weight : normal;
-}
-
-/* Hide the 'special-effect' extra div in links by default. */
-.link-extra-div {
-	display : none;
-}
-
-#navigation-links a .link-label {
-	font-size : 9pt;
-	font-weight : normal;
-	color : #0A94D6;
-}
-
-a .text {
-	font-size : 8pt;
-	font-weight : normal;
-}
-
-p .group-description {
-	font-size : 10pt;
-	font-weight : normal;
-}
-
-
-/* 
- * Set up other general properties like padding/margins
- */
-html, body { width : 100%; height : 100%; }
-
-html, body, div, h1, h4, p, a { margin : 0px; padding : 0px; }
-
-.intro-header H1 { padding-top : 10px; margin-left : 10px; }
-
-.section { }
-.section-body { display: none; padding : 0px; }
-
-/* For regular div labels */
-#page-content div H4 {
-	padding : 10px;
-	padding-bottom : 0px;
-}
-
-/* For the main page content's div label */
-#page-content #content-header H4 {
-	padding-bottom : 10px;
-	padding-top : 0px;
-}
-
-/* special case for Mozilla's main content-header label.
-   Mozilla 1.4 needs more room at the top */
-#page-content > #content-header H4 { padding-top : 10px; }
-
-/* Needed in IE to get shift+tab to show the active image properly */
-a:active {
-	border : solid 0px;
-}
-
-a img {
-	border-width : 0;
-	background-repeat : no-repeat;
-}
-
-/*
- * to get scrollbars working in both IE and Mozilla
- */
-html,body { overflow: auto; }
-html>body { overflow: visible; }
-
-/*
- * Set up the body, decorative background, and navigation for the content 
- * pages. 
- * Note: the root page handles its own background and navigation; these
- * settings primarily apply to the content pages
- */
-body {
-	/*background-color : #FFFFFF;*/
-	background-repeat : no-repeat;
-	background-position : bottom right;
-}
-
-/*
- * We will use one of the general purpose groups to show
- * the curve image
- */
-#extra-group1 { 
-	/* width : 100%;
-	height : 164px;
-	position : absolute;
-	top : 0px;
-	/* background-image : url(../graphics/contentpage/backgroundcurve.gif); */
-	background-repeat : no-repeat;
-	background-position : top center;
-	margin : 0;
-	padding : 0;
-	*/
-}
-
-/*
- * Hide the other general-purpose groups
- */
-
-#extra-group2,
-#extra-group3,
-#extra-group4,
-#extra-group5 {
-	display : none;
-}
-
-.intro-header {	background-color : transparent; z-index : 100;}
-
-body, .page{
-	min-width : 770px;
-	/* since IE doesn't support min-width, try expression */
-	width:expression(document.body.clientWidth < 770? "770px": "auto" );
-	min-height : 425px;
-	height : 100%;
-	height : expression(document.body.clientHeight < 425? "425px": "100%" );
-}
-
-.page { 
-	min-height : 475px;
-	/* background-image : url(../graphics/root/background.jpg); */
-	background-repeat : repeat-x;
-	background-position : top left;
-}
-
-#page-content {
-	background-repeat : no-repeat;
-	background-position : bottom right;
-	height : 70%;
-}
-
-/* 
- * Lay out the navigation links 
- * (Root page does something similar for its navigation)
- */
-#navigation-links {
-	position : relative;
-	left : 10px;
-	top : 5px;
-	height : 60px;
-	width : 98%;
-}
-
-#navigation-links a {
-	padding-left : 5px;
-	padding-right : 5px;
-	float : left;
-	text-align : center;
-}
-
-#navigation-links #customize {
-	padding-left : 5px;
-	padding-right : 5px;
-	float : left;
-	text-align : center;
-}
-
-#navigation-links a img {
-	height : 52px;
-	width : 52px;
-	vertical-align : middle;
-}
-
-#navigation-links a .link-label { display : block; margin-top : 5px;}
-
-#navigation-links a .text { display : none; }
-
-#navigation-links a:hover, 
-#navigation-links a:focus 
-#navigation-links a:active { border-right : 0px;}
-
-/* properties for each of the navigation-links  */
-#navigation-links a#overview img { background-image : url(../graphics/icons/etool/overview48.gif); }
-#navigation-links a#overview:hover img,
-#navigation-links a#overview:focus img,
-#navigation-links a#overview:active img { background-image : url(../graphics/icons/ctool/overview48.gif); }
-
-#navigation-links a#tutorials img { background-image : url(../graphics/icons/etool/tutorials48.gif); }
-#navigation-links a#tutorials:hover img,
-#navigation-links a#tutorials:active img,
-#navigation-links a#tutorials:focus img { background-image : url(../graphics/icons/ctool/tutorials48.gif); }
-
-#navigation-links a#samples img { background-image : url(../graphics/icons/etool/samples48.gif); }
-#navigation-links a#samples:hover img,
-#navigation-links a#samples:active img,
-#navigation-links a#samples:focus img { background-image : url(../graphics/icons/ctool/samples48.gif); }
-
-#navigation-links a#whatsnew img { background-image : url(../graphics/icons/etool/whatsnew48.gif); }
-#navigation-links a#whatsnew:hover img,
-#navigation-links a#whatsnew:focus img,
-#navigation-links a#whatsnew:active img { background-image : url(../graphics/icons/ctool/whatsnew48.gif); }
-
-#navigation-links a#firststeps img { background-image : url(../graphics/icons/etool/firsteps48.gif); }
-#navigation-links a#firststeps:hover img,
-#navigation-links a#firststeps:focus img,
-#navigation-links a#firststeps:active img { background-image : url(../graphics/icons/ctool/firsteps48.gif); }
-
-#navigation-links a#webresources img { background-image : url(../graphics/icons/etool/webrsrc48.gif); }
-#navigation-links a#webresources:hover img,
-#navigation-links a#webresources:focus img,
-#navigation-links a#webresources:active img { background-image : url(../graphics/icons/ctool/webrsrc48.gif); }
-
-#navigation-links a#migrate img { background-image : url(../graphics/icons/etool/migrate48.gif); }
-#navigation-links a#migrate:hover img,
-#navigation-links a#migrate:focus img,
-#navigation-links a#migrate:active img { background-image : url(../graphics/icons/ctool/migrate48.gif); }
-
-
-#navigation-links a#workbench { position : absolute;  right : 0px; top : -35px; text-align : right;}
-#navigation-links a#workbench .text { display : none; }
-#navigation-links a#workbench img { background-image : url(../graphics/icons/etool/wb48.gif); width : 53px; height : 53px;}
-#navigation-links a#workbench:hover img,
-#navigation-links a#workbench:focus img,
-#navigation-links a#workbench:active img { background-image : url(../graphics/icons/ctool/wb48.gif); }
-
-/* 
- * Lay out the page title and description 
- */
-h1, p { margin-left : 10px; } /* required in mozilla so the page description is properly indented */
-
-/* position the page content so that the page title overlays the bottom
- * of the background image, but make sure the content is always on top 
- * (using z-index) */
-#page-content {
-	float : none;
-	clear : both;
-	text-align : center;
-	margin-top : 35px;
-}
-
-.page > #page-content { margin-top : 50px; }
-
-#page-content p { 
-	padding-bottom : 15px; 
-	text-align : left; 
-	float : none;
-	clear : both;
-}
-
-/* Page content bins */
-
-#page-content #top-left {
-  border: none; float: left; margin: 0px; padding: 0px; width: 50%;
-  clear: left;
-}
-#page-content #top-right {
-  border: none; float: right; margin: 0px; padding: 0px; width: 50%;
-  clear: right;
-}
-
-/* top-bottom divider - runs the entire width to ensure
- * bottom boxes start at the same y
- */
-#page-content #content-divider {
-  border: none; float: none; margin: 0; padding: 0px; width: 100%;
-  clear: both;
-}
-
-#page-content #bottom-left {
-  border: none; float: left; margin: 0px; padding: 0px; width: 50%;
-  clear: left;
-}
-#page-content #bottom-right {
-  border: none; float: right; margin: 0px; padding: 0px; width: 50%;
-  clear: right;
-}
-
-#page-content #content-header H4, .page-description {
-	text-align : left;
-	margin-right : 10px;
-	float : none;
-	clear : both;
-}
-
-#page-content #top-left > *, 
-#page-content #top-right > *,
-#page-content #bottom-left > *,
-#page-content #bottom-right > * {
-	display: block;
-}
-
-#page-content * > a {
-	vertical-align : middle; 
-}
-
-#page-content * a img {
-	height : 57px;
-	width : 57px;
-	vertical-align : middle;
-}	
-
-/* Controls link titles on welcome page */
-#page-content * a .link-label {
-	font-weight : bold;
-	display : block;
-	position : relative;
-	top : -50px;
-	left : 60px;
-	margin-right: 60px;
-}
-
-#page-content * a > .link-label { left: 65px; }
-
-/* Controls text description 0n welcome page */
-#page-content * a p .text {
-	display : block;
-	position : relative;
-	top : -45px;
-	margin-bottom: -25px;
-	left : 53px;
-	margin-right: 53px;
-	color: #000;
-}
-
-#page-content * a p > .text { left: 58px; }
-
-#page-content * a:hover { border-right : 5px; }
-
-
-/* The following rules are for extensions in all pages. Extensions should be placed in
- * groups with the style 'content-group' and contain links with the style 'content-link'.
- * Group is important so that importance mixin style can be applied to the group that
- * uses block display. We need to see a solid rectangle around the extension, not 
- * a tight polygon around the link perimeter.
- */
- 
-.content-group {
-	margin-left: 10px;
-	margin-right: 10px;
-	padding-left: 10px;
-	padding-right: 10px;
-	float : none;
-	clear : both;
-	text-align : left;
-	/* color: #000000; */
-	/* Carbide branding mod
-	margin-bottom : 0px;
-	/* background-image : url(../graphics/contentpage/page-link-wide.gif); */
-	background-repeat:no-repeat;
-	background-position : top left;
-	*/
-}
-
-
-.categoryContentnav {
-	font-size: 9pt; 
-	font-weight: bold; 
-	color: #4A4D4A; 
-}
-
-.topicList {
-	font-size: 8pt; 
-	line-height:1.75;
-	color: #00507C;
-}
-
-/* .content-link:hover { border-right : 0px; } */
-.content-link:hover { 
-	background-image : url(../graphics/contentpage/page-link-wide.gif);
-}
-
-
-iframe {
-	position:relative;
-	top:16px;
-	width:100%;
-	height:100%;
-	padding-left:10px;
-	}
-
-/* mozilla scrollbar appearing off page fix */
-#page-content > iframe {
-	width: 98%;
-	padding-left: 2%;
-}	
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+/* 
+ * Set up general fonts, sizes and colors 
+ */
+body { font-family : Verdana, Helvetica, sans-serif; }
+
+H1, H2, H3, H4, p, a { color : #000000; }
+
+.intro-header H1 {
+	font-family: Verdana, Helvetica, sans-serif;
+	font-size: 20px;
+	color: #000000;
+}
+
+h2 {
+	font-size : 13pt;
+	font-weight : normal;
+	color : #000000;
+}
+/* For regular div labels */
+H4 .div-label {
+	font-size : 10pt;
+	font-weight : bold;
+}
+
+/* For separators */
+HR {
+	width: 90%;
+	align: left;
+	height : 1px;
+	color :  #000000;
+}
+
+/* For the main page content's title */
+#content-header H4 .div-label {
+	font-size : 14pt;
+	font-weight : bold;
+	color : #000000;
+	float : none;
+	clear : both;
+}
+
+.page-description { 
+	font-size : 10pt;
+	float : none;
+	clear : both;
+}
+
+a {
+	font-weight : bold;
+	text-decoration : none;
+	color : #4D4D4D;
+}
+
+a .link-label {
+	font-size : 10pt;
+	font-weight : normal;
+}
+
+/* Hide the 'special-effect' extra div in links by default. */
+.link-extra-div {
+	display : none;
+}
+
+#navigation-links a .link-label {
+	font-size : 9pt;
+	font-weight : normal;
+	color : #000000;
+}
+
+a .text {
+	font-size : 8pt;
+	font-weight : normal;
+}
+
+p .group-description {
+	font-size : 10pt;
+	font-weight : normal;
+}
+
+
+/* 
+ * Set up other general properties like padding/margins
+ */
+html, body { width : 100%; height : 100%; }
+
+html, body, div, h1, h4, p, a { margin : 0px; padding : 0px; }
+
+.intro-header H1 { padding-top : 10px; margin-left : 10px; }
+
+.section { }
+.section-body { display: none; padding : 0px; }
+
+/* For regular div labels */
+#page-content div H4 {
+	padding : 10px;
+	padding-bottom : 0px;
+}
+
+/* For the main page content's div label */
+#page-content #content-header H4 {
+	padding-bottom : 10px;
+	padding-top : 0px;
+}
+
+/* special case for Mozilla's main content-header label.
+   Mozilla 1.4 needs more room at the top */
+#page-content > #content-header H4 { padding-top : 10px; }
+
+/* Needed in IE to get shift+tab to show the active image properly */
+a:active {
+	border : solid 0px;
+}
+
+a img {
+	border-width : 0;
+	background-repeat : no-repeat;
+}
+
+/*
+ * to get scrollbars working in both IE and Mozilla
+ */
+html,body { overflow: auto; }
+html>body { overflow: visible; }
+
+/*
+ * Set up the body, decorative background, and navigation for the content 
+ * pages. 
+ * Note: the root page handles its own background and navigation; these
+ * settings primarily apply to the content pages
+ */
+body {
+	/*background-color : #FFFFFF;*/
+	background-repeat : no-repeat;
+	background-position : bottom right;
+}
+
+/*
+ * We will use one of the general purpose groups to show
+ * the curve image
+ */
+#extra-group1 { 
+	/* width : 100%;
+	height : 164px;
+	position : absolute;
+	top : 0px;
+	/* background-image : url(../graphics/contentpage/backgroundcurve.gif); */
+	background-repeat : no-repeat;
+	background-position : top center;
+	margin : 0;
+	padding : 0;
+	*/
+}
+
+/*
+ * Hide the other general-purpose groups
+ */
+
+#extra-group2,
+#extra-group3,
+#extra-group4,
+#extra-group5 {
+	display : none;
+}
+
+.intro-header {	background-color : transparent; z-index : 100;}
+
+body, .page{
+	min-width : 770px;
+	/* since IE doesn't support min-width, try expression */
+	width:expression(document.body.clientWidth < 770? "770px": "auto" );
+	min-height : 425px;
+	height : 100%;
+	height : expression(document.body.clientHeight < 425? "425px": "100%" );
+}
+
+.page { 
+	min-height : 475px;
+	background-image : url(../graphics/root/background.jpg);
+	background-repeat : repeat-x;
+	background-position : top left;
+}
+
+#page-content {
+	background-repeat : no-repeat;
+	background-position : bottom right;
+	height : 70%;
+}
+
+/* 
+ * Lay out the navigation links 
+ * (Root page does something similar for its navigation)
+ */
+#navigation-links {
+	position : relative;
+	left : 10px;
+	top : 5px;
+	height : 60px;
+	width : 98%;
+}
+
+#navigation-links a {
+	padding-left : 5px;
+	padding-right : 5px;
+	float : left;
+	text-align : center;
+}
+
+#navigation-links #customize {
+	padding-left : 5px;
+	padding-right : 5px;
+	float : left;
+	text-align : center;
+}
+
+#navigation-links a img {
+	height : 52px;
+	width : 52px;
+	vertical-align : middle;
+}
+
+#navigation-links a .link-label { display : block; margin-top : 5px;}
+
+#navigation-links a .text { display : none; }
+
+#navigation-links a:hover, 
+#navigation-links a:focus 
+#navigation-links a:active { border-right : 0px;}
+
+/* properties for each of the navigation-links  */
+#navigation-links a#overview img { background-image : url(../graphics/icons/etool/overview48.gif); }
+#navigation-links a#overview:hover img,
+#navigation-links a#overview:focus img,
+#navigation-links a#overview:active img { background-image : url(../graphics/icons/ctool/overview48.gif); }
+
+#navigation-links a#tutorials img { background-image : url(../graphics/icons/etool/tutorials48.gif); }
+#navigation-links a#tutorials:hover img,
+#navigation-links a#tutorials:active img,
+#navigation-links a#tutorials:focus img { background-image : url(../graphics/icons/ctool/tutorials48.gif); }
+
+#navigation-links a#samples img { background-image : url(../graphics/icons/etool/samples48.gif); }
+#navigation-links a#samples:hover img,
+#navigation-links a#samples:active img,
+#navigation-links a#samples:focus img { background-image : url(../graphics/icons/ctool/samples48.gif); }
+
+#navigation-links a#whatsnew img { background-image : url(../graphics/icons/etool/whatsnew48.gif); }
+#navigation-links a#whatsnew:hover img,
+#navigation-links a#whatsnew:focus img,
+#navigation-links a#whatsnew:active img { background-image : url(../graphics/icons/ctool/whatsnew48.gif); }
+
+#navigation-links a#firststeps img { background-image : url(../graphics/icons/etool/firsteps48.gif); }
+#navigation-links a#firststeps:hover img,
+#navigation-links a#firststeps:focus img,
+#navigation-links a#firststeps:active img { background-image : url(../graphics/icons/ctool/firsteps48.gif); }
+
+#navigation-links a#webresources img { background-image : url(../graphics/icons/etool/webrsrc48.gif); }
+#navigation-links a#webresources:hover img,
+#navigation-links a#webresources:focus img,
+#navigation-links a#webresources:active img { background-image : url(../graphics/icons/ctool/webrsrc48.gif); }
+
+#navigation-links a#migrate img { background-image : url(../graphics/icons/etool/migrate48.gif); }
+#navigation-links a#migrate:hover img,
+#navigation-links a#migrate:focus img,
+#navigation-links a#migrate:active img { background-image : url(../graphics/icons/ctool/migrate48.gif); }
+
+
+#navigation-links a#workbench { position : absolute;  right : 0px; top : -35px; text-align : right;}
+#navigation-links a#workbench .text { display : none; }
+#navigation-links a#workbench img { background-image : url(../graphics/icons/etool/wb48.gif); width : 53px; height : 53px;}
+#navigation-links a#workbench:hover img,
+#navigation-links a#workbench:focus img,
+#navigation-links a#workbench:active img { background-image : url(../graphics/icons/ctool/wb48.gif); }
+
+/* 
+ * Lay out the page title and description 
+ */
+h1, p { margin-left : 10px; } /* required in mozilla so the page description is properly indented */
+
+/* position the page content so that the page title overlays the bottom
+ * of the background image, but make sure the content is always on top 
+ * (using z-index) */
+#page-content {
+	float : none;
+	clear : both;
+	text-align : center;
+	margin-top : 35px;
+}
+
+.page > #page-content { margin-top : 50px; }
+
+#page-content p { 
+	padding-bottom : 15px; 
+	text-align : left; 
+	float : none;
+	clear : both;
+}
+
+/* Page content bins */
+
+#page-content #top-left {
+  border: none; float: left; margin: 0px; padding: 0px; width: 50%;
+  clear: left;
+}
+#page-content #top-right {
+  border: none; float: right; margin: 0px; padding: 0px; width: 50%;
+  clear: right;
+}
+
+/* top-bottom divider - runs the entire width to ensure
+ * bottom boxes start at the same y
+ */
+#page-content #content-divider {
+  border: none; float: none; margin: 0; padding: 0px; width: 100%;
+  clear: both;
+}
+
+#page-content #bottom-left {
+  border: none; float: left; margin: 0px; padding: 0px; width: 50%;
+  clear: left;
+}
+#page-content #bottom-right {
+  border: none; float: right; margin: 0px; padding: 0px; width: 50%;
+  clear: right;
+}
+
+#page-content #content-header H4, .page-description {
+	text-align : left;
+	margin-right : 10px;
+	float : none;
+	clear : both;
+}
+
+#page-content #top-left > *, 
+#page-content #top-right > *,
+#page-content #bottom-left > *,
+#page-content #bottom-right > * {
+	display: block;
+}
+
+#page-content * > a {
+	vertical-align : middle; 
+}
+
+#page-content * a img {
+	height : 57px;
+	width : 57px;
+	vertical-align : middle;
+}	
+
+/* Controls link titles on welcome page */
+#page-content * a .link-label {
+	font-weight : bold;
+	display : block;
+	position : relative;
+	top : -50px;
+	left : 60px;
+	margin-right: 60px;
+}
+
+#page-content * a > .link-label { left: 65px; }
+
+/* Controls text description 0n welcome page */
+#page-content * a p .text {
+	display : block;
+	position : relative;
+	top : -45px;
+	margin-bottom: -25px;
+	left : 53px;
+	margin-right: 53px;
+	color: #000;
+}
+
+#page-content * a p > .text { left: 58px; }
+
+#page-content * a:hover { border-right : 5px; }
+
+
+/* The following rules are for extensions in all pages. Extensions should be placed in
+ * groups with the style 'content-group' and contain links with the style 'content-link'.
+ * Group is important so that importance mixin style can be applied to the group that
+ * uses block display. We need to see a solid rectangle around the extension, not 
+ * a tight polygon around the link perimeter.
+ */
+ 
+.content-group {
+	margin-left: 10px;
+	margin-right: 10px;
+	padding-left: 10px;
+	padding-right: 10px;
+	float : none;
+	clear : both;
+	text-align : left;
+	/* color: #000000; */
+	/* Carbide branding mod
+	margin-bottom : 0px;
+	/* background-image : url(../graphics/contentpage/page-link-wide.gif); */
+	background-repeat:no-repeat;
+	background-position : top left;
+	*/
+}
+
+
+.categoryContentnav {
+	font-size: 9pt; 
+	font-weight: bold; 
+	color: #4A4D4A; 
+}
+
+.topicList {
+	font-size: 8pt; 
+	line-height:1.75;
+	color: #00507C;
+}
+
+/* .content-link:hover { border-right : 0px; } */
+.content-link:hover { 
+	background-image : url(../graphics/contentpage/page-link-wide.gif);
+}
+
+
+iframe {
+	position:relative;
+	top:16px;
+	width:100%;
+	height:100%;
+	padding-left:10px;
+	}
+
+/* mozilla scrollbar appearing off page fix */
+#page-content > iframe {
+	width: 98%;
+	padding-left: 2%;
+}	
--- a/core/com.nokia.carbide.cpp/themes/carbide/html/tutorials.css	Mon Jun 28 08:02:30 2010 -0500
+++ b/core/com.nokia.carbide.cpp/themes/carbide/html/tutorials.css	Tue Jun 29 14:04:33 2010 -0500
@@ -1,22 +1,22 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-body {
-	/* background-image : url(../graphics/root/background.jpg); */
-}
-
-/* show the "selected" image for this page */
-#navigation-links a#tutorials img, 
-#navigation-links a#tutorials:hover img,
-#navigation-links a#tutorials:focus img,
-#navigation-links a#tutorials:active img {
-	background-image : url(../graphics/icons/ctool/tutorials48sel.gif); 
-}
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+body {
+	background-image : url(../graphics/root/background.jpg);
+}
+
+/* show the "selected" image for this page */
+#navigation-links a#tutorials img, 
+#navigation-links a#tutorials:hover img,
+#navigation-links a#tutorials:focus img,
+#navigation-links a#tutorials:active img {
+	background-image : url(../graphics/icons/ctool/tutorials48sel.gif); 
+}
--- a/core/com.nokia.carbide.cpp/themes/carbide/html/webresources.css	Mon Jun 28 08:02:30 2010 -0500
+++ b/core/com.nokia.carbide.cpp/themes/carbide/html/webresources.css	Tue Jun 29 14:04:33 2010 -0500
@@ -1,22 +1,22 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-body {
-	/* background-image : url(../graphics/root/background.jpg); */
-}
-
-/* show the "selected" image for this page */
-#navigation-links a#webresources img, 
-#navigation-links a#webresources:hover img,
-#navigation-links a#webresources:focus img,
-#navigation-links a#webresources:active img {
-	background-image : url(../graphics/icons/ctool/webrsrc48sel.gif); 
-}
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+body {
+	background-image : url(../graphics/root/background.jpg);
+}
+
+/* show the "selected" image for this page */
+#navigation-links a#webresources img, 
+#navigation-links a#webresources:hover img,
+#navigation-links a#webresources:focus img,
+#navigation-links a#webresources:active img {
+	background-image : url(../graphics/icons/ctool/webrsrc48sel.gif); 
+}
--- a/core/com.nokia.carbide.cpp/themes/carbide/html/whatsnew.css	Mon Jun 28 08:02:30 2010 -0500
+++ b/core/com.nokia.carbide.cpp/themes/carbide/html/whatsnew.css	Tue Jun 29 14:04:33 2010 -0500
@@ -1,28 +1,28 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-body {
-	/* background-image : url(../graphics/root/background.jpg); */
-}
-
-/* show the "selected" image for this page */
-#navigation-links a#whatsnew img, 
-#navigation-links a#whatsnew:hover img,
-#navigation-links a#whatsnew:focus img,
-#navigation-links a#whatsnew:active img {
-	background-image : url(../graphics/icons/ctool/whatsnew48sel.gif); 
-}
-
-/*
- * Default images for content links in this page.
- */
-.content-link img { background-image : url(../graphics/icons/obj48/new_obj.gif); }
+/*******************************************************************************
+ * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+body {
+	background-image : url(../graphics/root/background.jpg);
+}
+
+/* show the "selected" image for this page */
+#navigation-links a#whatsnew img, 
+#navigation-links a#whatsnew:hover img,
+#navigation-links a#whatsnew:focus img,
+#navigation-links a#whatsnew:active img {
+	background-image : url(../graphics/icons/ctool/whatsnew48sel.gif); 
+}
+
+/*
+ * Default images for content links in this page.
+ */
+.content-link img { background-image : url(../graphics/icons/obj48/new_obj.gif); }
 .content-link:hover img { background-image : url(../graphics/icons/obj48/newhov_obj.gif); }
\ No newline at end of file