Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDejan Gloszic2006-02-26 06:40:59 +0000
committerDejan Gloszic2006-02-26 06:40:59 +0000
commit894973bc132720c577cda9d0d9baf451c9083ae7 (patch)
tree2c4426d78deb282404fce8f4487996b0487d4e55
parent2e6ea706208ea2ef23ef27336dea9c8e3ef9405b (diff)
downloadeclipse.platform.ua-894973bc132720c577cda9d0d9baf451c9083ae7.tar.gz
eclipse.platform.ua-894973bc132720c577cda9d0d9baf451c9083ae7.tar.xz
eclipse.platform.ua-894973bc132720c577cda9d0d9baf451c9083ae7.zip
*** empty log message ***
-rw-r--r--org.eclipse.ui.intro.universal/introContent.xml3
-rw-r--r--org.eclipse.ui.intro.universal/plugin.xml3
-rw-r--r--org.eclipse.ui.intro.universal/themes/circles/html/root.css148
-rw-r--r--org.eclipse.ui.intro.universal/themes/circles/html/shared.css27
-rw-r--r--org.eclipse.ui.intro.universal/themes/circles/preview.pngbin0 -> 13921 bytes
-rw-r--r--org.eclipse.ui.intro.universal/themes/purpleMesh/html/root.css21
-rw-r--r--org.eclipse.ui.intro.universal/themes/purpleMesh/html/shared.css32
-rw-r--r--org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/html/IntroHTMLGenerator.java2
8 files changed, 121 insertions, 115 deletions
diff --git a/org.eclipse.ui.intro.universal/introContent.xml b/org.eclipse.ui.intro.universal/introContent.xml
index d14c4520b..aa2f93990 100644
--- a/org.eclipse.ui.intro.universal/introContent.xml
+++ b/org.eclipse.ui.intro.universal/introContent.xml
@@ -16,7 +16,8 @@
<text>Go to the workbench</text>
</link>
</group>
- <group id="branding" style-id="branding" bgImage="$introBrandingImage$">
+ <group id="branding">
+ <img src="$introBrandingImage$" alt="$introBrandingImageText$"/>
</group>
<!-- General purpose groups for adding additional content -->
<group id="extra-group1" filteredFrom="swt"><anchor id="anchor"/></group>
diff --git a/org.eclipse.ui.intro.universal/plugin.xml b/org.eclipse.ui.intro.universal/plugin.xml
index ef49d95b8..d589a1cce 100644
--- a/org.eclipse.ui.intro.universal/plugin.xml
+++ b/org.eclipse.ui.intro.universal/plugin.xml
@@ -53,7 +53,8 @@
default="true"
id="org.eclipse.ui.intro.universal.circles"
name="%theme.name.circles"
- path="$nl$/themes/circles"/>
+ path="$nl$/themes/circles"
+ previewImage="themes/circles/preview.png"/>
<theme
id="org.eclipse.ui.intro.universal.purpleMesh"
name="%theme.name.purpleMesh"
diff --git a/org.eclipse.ui.intro.universal/themes/circles/html/root.css b/org.eclipse.ui.intro.universal/themes/circles/html/root.css
index 7ba976532..680c615a7 100644
--- a/org.eclipse.ui.intro.universal/themes/circles/html/root.css
+++ b/org.eclipse.ui.intro.universal/themes/circles/html/root.css
@@ -16,27 +16,42 @@
*/
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/rootpage/welcomebckgrd.jpg); background-repeat : no-repeat; background-position : center center; background-color : #7169D1;
+ width:expression(document.body.clientWidth < 770? "770px": "auto" );
+ background-image : url(../graphics/rootpage/welcomebckgrd.jpg); background-repeat : no-repeat; background-position : center center;
+ background-attachment : fixed;
+ background-color : #7169D1;
}
#root {
/*
background-image : url(../graphics/rootpage/brandmark.gif);
*/
+/*
background-repeat : no-repeat; background-position : bottom left;
- /* min-height : 450px;
- */ height : 100%;
- /* height : expression(document.body.clientHeight < 450? "450px": "100%" );
*/
+ min-height : 450px;
+ height : expression(document.body.clientHeight < 450? "450px": "100%" );
+/*
+ border-color: magenta;
+ border-style : solid;
+ border-width : 1px;
+*/
+ overflow: hidden;
}
-/*
- * We will not use the general-purpose group1 used in
- * other pages for a curve image.
- */
+ /* For non-IE browsers */
+#root[id] { display: table; position: static; }
-#extra-group1 {
- display : none;
+#branding {
+ position: absolute;
+ bottom : 20px;
+ left : 20px;
+/*
+ border-style : solid;
+ border-width : 1px;
+ border-color: white;
+*/
}
+
/*
* Set up the navigation bar. It should be centered in the middle
* of the page
@@ -47,10 +62,15 @@ body {
*/
position: absolute;
top: 50%; text-align : center;
- /*
- background-color: cyan;
- */
}
+
+/* for non-IE browsers only */
+#links-background[id] {
+ display: table-cell;
+ vertical-align: middle;
+ position: static;
+}
+
/* 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
@@ -58,12 +78,18 @@ body {
#links-background > #page-links {
width : 33em; margin : 0 auto;
}
+
#page-links {
width : 884px;
height: 387px;
position : relative;
- left : -19px;
+ left : -18px;
top : -50%;
+/*
+ border-style : solid;
+ border-color: yellow;
+ border-width : 1px;
+*/
}
#page-links a {
@@ -72,20 +98,32 @@ body {
*/
}
+#page-links[id] { position: static; }
+
+/* Position root links using absolute coordinates */
#page-links a img {
height : 103px;
width : 103px;
- vertical-align : middle;
}
-#page-links a img#overview {
- height: 154px;
- width: 141px;
+#page-links a:hover img {
+ width : 202px;
+ height : 80px;
+}
+
+#page-links a#overview img {
+ width : 141px;
+ height : 154px;
+}
+
+#page-links a:hover #overview img {
+ width : 202px;
+ height : 99px;
}
#page-links a#overview {
- left: 0px;
- top: 0px;
+ left: -1px;
+ top: 4px;
}
#page-links a#whatsnew {
@@ -176,84 +214,82 @@ body {
}
/* properties for each of the page-links */
#page-links a#overview img { background-image : url(../graphics/icons/ctool/overview.gif); }
-/*
-#page-links a:hover#overview img { background-image : url(../graphics/icons/ctool/overview72.gif); }
-*/
+#page-links a:hover#overview img { background-image : url(../graphics/icons/ctool/overview_tophov.gif); }
#page-links a#tutorials img { background-image : url(../graphics/icons/ctool/tutorials.gif); }
-/*
-#page-links a:hover#tutorials img { background-image : url(../graphics/icons/ctool/tutorials.gif); }
-*/
+#page-links a:hover#tutorials img { background-image : url(../graphics/icons/ctool/tutorials_tophov.gif); }
#page-links a#samples img { background-image : url(../graphics/icons/ctool/samples.gif); }
-/*
-#page-links a:hover#samples img { background-image : url(../graphics/icons/ctool/samples72.gif); }
-*/
+#page-links a:hover#samples img { background-image : url(../graphics/icons/ctool/samples_tophov.gif); }
#page-links a#whatsnew img { background-image : url(../graphics/icons/ctool/whatsnew.gif); }
-/*
-#page-links a:hover#whatsnew img { background-image : url(../graphics/icons/ctool/whatsnew72.gif); }
-*/
+#page-links a:hover#whatsnew img { background-image : url(../graphics/icons/ctool/whatsnew_tophov.gif); }
#page-links a#firststeps img { background-image : url(../graphics/icons/ctool/firststeps.gif); }
+#page-links a:hover#firststeps img { background-image : url(../graphics/icons/ctool/firststeps_tophov.gif); }
+
#page-links a#migrate img { background-image : url(../graphics/icons/ctool/migrate.gif); }
+#page-links a:hover#migrate img { background-image : url(../graphics/icons/ctool/migrate_tophov.gif); }
+
#page-links a#webresources img { background-image : url(../graphics/icons/ctool/webresources.gif); }
+#page-links a:hover#webresources img { background-image : url(../graphics/icons/ctool/webresources_tophov.gif); }
/*
* Set up the action links
*/
#action-links {
- width : 98%; position : absolute; left : 0px; top : 20px;
+ width : 100%;
+ position: absolute;
+ top: 50%;
+ text-align : center;
}
-#action-links a#workbench {
- position : absolute; top : -16px; right : -8px; text-align : right;
+
+#action-links a {
+ position : relative;
+ top : -50%;
}
+
#action-links a .background-image,
#action-links a #workbench_img {
- height : 53px; width : 53px; text-align : center; vertical-align : top;
+ height : 103px; width : 103px;
+ position : absolute;
+ left : 364px;
+ top : -83px;
}
+
+#action-links a:hover#workbench img {
+ width : 202px;
+ height : 80px;
+}
+
/* 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 img { background-image : url(../graphics/icons/ctool/workbench.gif); }
+#action-links a:hover#workbench img { background-image : url(../graphics/icons/ctool/workbench_tophov.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;
+ display : block; 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;
}
+*/
diff --git a/org.eclipse.ui.intro.universal/themes/circles/html/shared.css b/org.eclipse.ui.intro.universal/themes/circles/html/shared.css
index 5f4883548..94f599f2e 100644
--- a/org.eclipse.ui.intro.universal/themes/circles/html/shared.css
+++ b/org.eclipse.ui.intro.universal/themes/circles/html/shared.css
@@ -377,9 +377,6 @@ h1, p { margin-left : 10px; } /* required in mozilla so the page description is
#page-content * a p .text {
display : block;
- /*
- width : 300px;
- */
position : relative;
top : -45px;
left : 53px;
@@ -387,16 +384,8 @@ h1, p { margin-left : 10px; } /* required in mozilla so the page description is
#page-content * a p > .text { left: 58px; }
-/* Special case for Mozilla, because the links are displayed
- in 1 vertical column instead of 2 centered columns */
-
-#page-content * > a { width : 700px; }
-#page-content * a > .link-label { width : 700px; }
-#page-content * a p > .text { width : 700px; }
-
#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
@@ -405,32 +394,22 @@ h1, p { margin-left : 10px; } /* required in mozilla so the page description is
*/
.content-group {
- /* To center in Moz (have to use text-align for IE) */
- margin-left : auto;
- margin-right : auto;
- /*
- width : 750px;
- */
- /*
- margin-bottom : 30px;
- */
+ width : auto;
padding-left: 10px;
padding-right: 10px;
float : none;
clear : both;
- text-align : left;
+ text-align: left;
}
.content-link {
-/*
- width : 360px;
- */
text-align : left;
margin-left : 5px;
margin-right : 5px;
margin-top : 10px;
margin-bottom : -20px;
vertical-align : top;
+ clear : both;
}
.content-group > .content-link {
diff --git a/org.eclipse.ui.intro.universal/themes/circles/preview.png b/org.eclipse.ui.intro.universal/themes/circles/preview.png
new file mode 100644
index 000000000..0e81aeaa9
--- /dev/null
+++ b/org.eclipse.ui.intro.universal/themes/circles/preview.png
Binary files differ
diff --git a/org.eclipse.ui.intro.universal/themes/purpleMesh/html/root.css b/org.eclipse.ui.intro.universal/themes/purpleMesh/html/root.css
index 7c4752a55..4b01ccae3 100644
--- a/org.eclipse.ui.intro.universal/themes/purpleMesh/html/root.css
+++ b/org.eclipse.ui.intro.universal/themes/purpleMesh/html/root.css
@@ -11,6 +11,15 @@
#page-links a p .text, #action-links a p .text {
font-size : 13pt; font-weight : 500; color : #E5E5E5;
}
+
+/*
+ * Turn off shared backround image.
+ */
+
+.page {
+ background-image: none;
+}
+
/*
* Set up the content for the root page.
*/
@@ -19,7 +28,17 @@ body {
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%" );
+/*
+ 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 : 20px;
+ left : 20px;
}
/*
diff --git a/org.eclipse.ui.intro.universal/themes/purpleMesh/html/shared.css b/org.eclipse.ui.intro.universal/themes/purpleMesh/html/shared.css
index 566b8ca09..7b72862f2 100644
--- a/org.eclipse.ui.intro.universal/themes/purpleMesh/html/shared.css
+++ b/org.eclipse.ui.intro.universal/themes/purpleMesh/html/shared.css
@@ -339,9 +339,6 @@ h1, p { margin-left : 10px; } /* required in mozilla so the page description is
#page-content * a .link-label {
display : block;
- /*
- width : 300px;
- */
position : relative;
top : -50px;
left : 60px;
@@ -351,9 +348,6 @@ h1, p { margin-left : 10px; } /* required in mozilla so the page description is
#page-content * a p .text {
display : block;
- /*
- width : 300px;
- */
position : relative;
top : -45px;
left : 53px;
@@ -361,13 +355,6 @@ h1, p { margin-left : 10px; } /* required in mozilla so the page description is
#page-content * a p > .text { left: 58px; }
-/* Special case for Mozilla, because the links are displayed
- in 1 vertical column instead of 2 centered columns */
-
-#page-content * > a { width : 700px; }
-#page-content * a > .link-label { width : 700px; }
-#page-content * a p > .text { width : 700px; }
-
#page-content * a:hover { border-right : 5px; }
@@ -379,15 +366,6 @@ h1, p { margin-left : 10px; } /* required in mozilla so the page description is
*/
.content-group {
- /* To center in Moz (have to use text-align for IE) */
- margin-left : auto;
- margin-right : auto;
- /*
- width : 750px;
- */
- /*
- margin-bottom : 30px;
- */
padding-left: 10px;
padding-right: 10px;
float : none;
@@ -396,15 +374,13 @@ h1, p { margin-left : 10px; } /* required in mozilla so the page description is
}
.content-link {
-/*
- width : 360px;
- */
text-align : left;
margin-left : 5px;
margin-right : 5px;
margin-top : 10px;
margin-bottom : -20px;
vertical-align : top;
+ clear : both;
}
.content-group > .content-link {
@@ -435,9 +411,6 @@ p #group-description {
.content-link .link-label {
display : block;
- /*
- width : 300px;
- */
position : relative;
top : -50px;
left : 60px;
@@ -446,9 +419,6 @@ p #group-description {
.content-link p .text {
display : block;
- /*
- width : 300px;
- */
position : relative;
top : -45px;
left : 53px;
diff --git a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/html/IntroHTMLGenerator.java b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/html/IntroHTMLGenerator.java
index eafd430fe..b9c1eb74b 100644
--- a/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/html/IntroHTMLGenerator.java
+++ b/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/html/IntroHTMLGenerator.java
@@ -876,7 +876,7 @@ public class IntroHTMLGenerator {
if (blankImageURL != null) {
image.addAttribute(IIntroHTMLConstants.ATTRIBUTE_SRC, blankImageURL);
if (pngOnWin32) {
- String style = "filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + imageSrc + "', sizingMethod='scale')"; //$NON-NLS-1$//$NON-NLS-2$
+ String style = "filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='" + imageSrc + "', sizingMethod='image')"; //$NON-NLS-1$//$NON-NLS-2$
image.addAttribute(IIntroHTMLConstants.ATTRIBUTE_STYLE, style);
}
}

Back to the top