am 5eb58327: AI 149839: make the home page\'s announcement block expandable... primarily, this is to handle various lengths of text due to translations, but also allows us to be more flexible WRT the content for the top section.
Merge commit '5eb5832751cad87021b9f1ad77f1c26952030884' into donut
* commit '5eb5832751cad87021b9f1ad77f1c26952030884':
AI 149839: make the home page's announcement block expandable...
diff --git a/tools/droiddoc/templates/assets/android-developer-core.css b/tools/droiddoc/templates/assets/android-developer-core.css
index 30165df..8a1b9cd 100644
--- a/tools/droiddoc/templates/assets/android-developer-core.css
+++ b/tools/droiddoc/templates/assets/android-developer-core.css
@@ -719,14 +719,16 @@
float: left;
width: 584px;
height: 580px;
- background:url(images/home/bg_home_middle.png) no-repeat 0 0;
position:relative;
}
+#topAnnouncement {
+ background:url(images/home/bg_home_announcement.png) no-repeat 0 0;
+}
+
#homeTitle {
- margin:15px 15px 0;
- height:30px;
- background:url(images/hr_gray_side.jpg) no-repeat 0 29px;
+ padding:15px 15px 0;
+ height:30px;
}
#homeTitle h2 {
@@ -734,8 +736,14 @@
}
#announcement-block {
- margin:15px 15px 0;
- height:125px;
+ padding:0 15px 0;
+ overflow:hidden;
+ background: url(images/hr_gray_side.jpg) no-repeat 15px 0;
+ zoom:1;
+}
+
+#announcement-block>* {
+ padding:15px 0 0;
}
#announcement-block img {
@@ -748,6 +756,29 @@
margin:0;
}
+#carousel {
+ background:url(images/home/bg_home_carousel.png) no-repeat 0 0;
+ position:relative;
+ height:400px;
+}
+
+#carouselMain {
+ padding: 25px 21px 0;
+ height:185px;
+ background-position:top;
+ overflow:hidden;
+ position:relative;
+}
+
+#carouselMain img {
+ margin:0;
+}
+
+#homeMiddle p {
+ margin:0;
+ padding-bottom: 1em;
+}
+
.clearer { clear:both; }
#arrow-left, #arrow-right {
@@ -826,6 +857,12 @@
text-decoration:none;
text-align:center;
font-size:11px;
+ line-height:11px;
+}
+
+#app-list a span {
+ position:relative;
+ top:-4px;
}
#app-list img {
@@ -859,18 +896,6 @@
padding-bottom:.25em;
}
-#carouselMain {
- margin: 25px 21px 0;
- height:185px;
- background-position:top;
- background-repeat:no-repeat;
- overflow:hidden;
-}
-
-#carouselMain img {
- margin:0;
-}
-
/*carousel bulletin layouts*/
/*460px width*/
/*185px height*/
@@ -879,24 +904,24 @@
width:230px;
height:165px;
overflow:hidden;
- margin:8px 0 8px 8px;
+ padding:8px 0 8px 8px;
}
.desc-right {
float:left;
width:270px;
- margin:10px;
+ padding:10px;
}
.img-right {
float:right;
width:220px;
height:165px;
overflow:hidden;
- margin:8px 8px 8px 0;
+ padding:8px 8px 8px 0;
}
.desc-left {
float:right;
width:280px;
- margin:10px;
+ padding:10px;
text-align:right;
}
.img-top {
diff --git a/tools/droiddoc/templates/assets/images/home/bg_home_announcement.png b/tools/droiddoc/templates/assets/images/home/bg_home_announcement.png
new file mode 100755
index 0000000..91485ff
--- /dev/null
+++ b/tools/droiddoc/templates/assets/images/home/bg_home_announcement.png
Binary files differ
diff --git a/tools/droiddoc/templates/assets/images/home/bg_home_carousel.png b/tools/droiddoc/templates/assets/images/home/bg_home_carousel.png
new file mode 100755
index 0000000..5ce5e30
--- /dev/null
+++ b/tools/droiddoc/templates/assets/images/home/bg_home_carousel.png
Binary files differ
diff --git a/tools/droiddoc/templates/assets/images/home/bg_home_middle.png b/tools/droiddoc/templates/assets/images/home/bg_home_middle.png
deleted file mode 100644
index 4221e96..0000000
--- a/tools/droiddoc/templates/assets/images/home/bg_home_middle.png
+++ /dev/null
Binary files differ
