aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Fernandez <joefernandez@google.com>2015-04-14 16:54:49 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-14 16:54:49 +0000
commita74d2efe8fbb131bc41650bce0deb92073dced46 (patch)
treee3120c3e59ead02dbbee5e632b07f775519731f0
parentffc357f098b9fb939d6869c0f2f1b70fb20c88b6 (diff)
parenta5863928c2e85a5764cf94d8cdfafefc0f865449 (diff)
downloadbuild-a74d2efe8fbb131bc41650bce0deb92073dced46.tar.gz
Merge "docs: add new style elements for Material Design cross-references" into lmp-docs
-rw-r--r--tools/droiddoc/templates-sdk/assets/css/default.css25
-rw-r--r--tools/droiddoc/templates-sdk/assets/images/styles/notice-designers-material.pngbin0 -> 3208 bytes
-rw-r--r--tools/droiddoc/templates-sdk/assets/images/styles/notice-designers-material@2x.pngbin0 -> 5877 bytes
3 files changed, 18 insertions, 7 deletions
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index f411d9347c..2e0155994d 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -2965,7 +2965,8 @@ div.design-announce p {
a.notice-developers-video,
a.notice-developers,
a.notice-designers-video,
-a.notice-designers {
+a.notice-designers,
+a.notice-designers-material {
float:right;
clear:right;
width:238px;
@@ -2976,13 +2977,15 @@ a.notice-designers {
a.notice-developers-video.wide,
a.notice-developers.wide,
a.notice-designers-video.wide,
-a.notice-designers.wide {
+a.notice-designers.wide,
+a.notice-designers-material.wide {
width:278px;
}
a.notice-developers-video div,
a.notice-developers div,
a.notice-designers-video div,
-a.notice-designers div {
+a.notice-designers div,
+a.notice-designers-material div {
min-height:40px;
background:url('../images/styles/notice-developers@2x.png') no-repeat 10px 10px;
background-size:40px 40px;
@@ -3000,16 +3003,22 @@ a.notice-developers-video div {
background:url('../images/styles/notice-developers-video@2x.png') no-repeat 10px 10px;
background-size:40px 40px;
}
+a.notice-designers-material div {
+ background:url('../images/styles/notice-designers-material@2x.png') no-repeat 10px 10px;
+ background-size:40px 40px;
+}
a.notice-developers-video:hover,
a.notice-developers:hover,
a.notice-designers-video:hover,
-a.notice-designers:hover {
+a.notice-designers:hover,
+a.notice-designers-material:hover {
background:#eee;
}
a.notice-developers-video h3,
a.notice-developers h3,
a.notice-designers-video h3,
-a.notice-designers h3 {
+a.notice-designers h3,
+a.notice-designers-material h3 {
font-size:13px;
line-height:18px;
font-weight:bold;
@@ -3020,14 +3029,16 @@ a.notice-designers h3 {
a.notice-developers-video p,
a.notice-developers p,
a.notice-designers-video p,
-a.notice-designers p {
+a.notice-designers p,
+a.notice-designers-material p {
margin:0;
line-height:14px;
}
a.notice-developers-video.left,
a.notice-developers.left,
a.notice-designers-video.left,
-a.notice-designers.left {
+a.notice-designers.left,
+a.notice-designers-material.left {
margin-left:0;
float:left;
}
diff --git a/tools/droiddoc/templates-sdk/assets/images/styles/notice-designers-material.png b/tools/droiddoc/templates-sdk/assets/images/styles/notice-designers-material.png
new file mode 100644
index 0000000000..1fb22a2acf
--- /dev/null
+++ b/tools/droiddoc/templates-sdk/assets/images/styles/notice-designers-material.png
Binary files differ
diff --git a/tools/droiddoc/templates-sdk/assets/images/styles/notice-designers-material@2x.png b/tools/droiddoc/templates-sdk/assets/images/styles/notice-designers-material@2x.png
new file mode 100644
index 0000000000..bc2f74b24b
--- /dev/null
+++ b/tools/droiddoc/templates-sdk/assets/images/styles/notice-designers-material@2x.png
Binary files differ