AI 146951: CSS edits for docs;
remove preliminary watermark;
remove red color text for warnings;
delete the caution class;
use 1em top-margin only for elements nested in a DD, elements nested in regular
LIs should only be a half em.
BUG=1798190
Automated import of CL 146951
diff --git a/tools/droiddoc/templates/assets/android-developer-core.css b/tools/droiddoc/templates/assets/android-developer-core.css
index 81e233a..2a62291 100644
--- a/tools/droiddoc/templates/assets/android-developer-core.css
+++ b/tools/droiddoc/templates/assets/android-developer-core.css
@@ -110,11 +110,18 @@
padding:0 0 0 2em;
}
-li p, dd p {
+li p {
+ margin:.5em 0 0;
+}
+
+dd p {
margin:1em 0 0;
}
-li pre, li table, li img,
+li pre, li table, li img {
+ margin:.5em 0 0 1em;
+}
+
dd pre, dd table, dd img {
margin:1em 0 0 1em;
}
@@ -169,7 +176,6 @@
margin:0;
position:relative;
width:100%;
- background: url('images/preliminary.png');
}
#header {
diff --git a/tools/droiddoc/templates/assets/android-developer-docs.css b/tools/droiddoc/templates/assets/android-developer-docs.css
index 747da92..a12e6d9 100644
--- a/tools/droiddoc/templates/assets/android-developer-docs.css
+++ b/tools/droiddoc/templates/assets/android-developer-docs.css
@@ -570,15 +570,7 @@
margin:0 0 .5em;
padding:0;
}
-
-/* old p.note, p.caution, p.warning {
- margin:0 0 1em;
- padding: 4px 10px;
- background-color: #efefef;
- border-top: 1px solid;
- border-bottom: 1px solid;
-}
-*/
+
p.note, p.caution, p.warning {
margin: 1em;
padding: 0 0 0 .5em;
@@ -594,21 +586,16 @@
p.note {
border-color: #99aacc;
}
-
-p.caution {
- border-color: #ffcc33;
-}
p.warning {
border-color: #aa0033;
}
-p.warning b, p.warning em, p.warning strong {
- color: #aa0033;
+p.warning b, p.warning strong {
font-weight: bold;
}
-li p.note, li p.warning, li p.caution {
+li p.note, li p.warning {
margin: .5em 0 0 0;
padding: .2em .5em .2em .9em;
}