aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2013-07-08 17:32:03 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-07-08 17:32:03 -0700
commitccc15faf56ad46f973800cb6bd41b4634b9192a0 (patch)
treeb4e0675f04c26c8b4797a241595a9328e589ba24
parentfb2bb3d867fcdd3add7e30d1cbb6b956d3fce89e (diff)
parent56811475202ededf0c76bf9b28d3e27d5761d747 (diff)
downloadbuild-ccc15faf56ad46f973800cb6bd41b4634b9192a0.tar.gz
am 56811475: am 5386532e: Merge "Doc change: Move butterbar css to template assets." into jb-mr1.1-ub-dev
* commit '56811475202ededf0c76bf9b28d3e27d5761d747': Doc change: Move butterbar css to template assets.
-rw-r--r--tools/droiddoc/templates-ds/assets/css/default.css24
-rw-r--r--tools/droiddoc/templates-sac/assets/css/default.css24
-rw-r--r--tools/droiddoc/templates-sdk/assets/css/default.css24
3 files changed, 72 insertions, 0 deletions
diff --git a/tools/droiddoc/templates-ds/assets/css/default.css b/tools/droiddoc/templates-ds/assets/css/default.css
index da06e3122b..5bd95a8dc7 100644
--- a/tools/droiddoc/templates-ds/assets/css/default.css
+++ b/tools/droiddoc/templates-ds/assets/css/default.css
@@ -2393,6 +2393,30 @@ Lightbox
}
/* --------------------------------------------------------------------------
+Butterbar
+*/
+#butterbar-wrapper {
+ position:absolute;
+ top:0;
+ left:0;
+ width:100%;
+}
+#butterbar {
+ width:940px;
+ margin:0 auto;
+}
+#butterbar-message {
+ background-color:#f80;
+ float:right;
+ font-size:12px;
+ font-weight:bold;
+ padding:0 10px;
+ border-radius: 0 0 5px 5px;
+}
+#butterbar-message a {color:#fff !important}
+#butterbar-message a:hover {text-decoration:underline;}
+
+/* --------------------------------------------------------------------------
Misc
*/
diff --git a/tools/droiddoc/templates-sac/assets/css/default.css b/tools/droiddoc/templates-sac/assets/css/default.css
index 1ce78fea85..b93fcc069d 100644
--- a/tools/droiddoc/templates-sac/assets/css/default.css
+++ b/tools/droiddoc/templates-sac/assets/css/default.css
@@ -2414,6 +2414,30 @@ Lightbox
}
/* --------------------------------------------------------------------------
+Butterbar
+*/
+#butterbar-wrapper {
+ position:absolute;
+ top:0;
+ left:0;
+ width:100%;
+}
+#butterbar {
+ width:940px;
+ margin:0 auto;
+}
+#butterbar-message {
+ background-color:#f80;
+ float:right;
+ font-size:12px;
+ font-weight:bold;
+ padding:0 10px;
+ border-radius: 0 0 5px 5px;
+}
+#butterbar-message a {color:#fff !important}
+#butterbar-message a:hover {text-decoration:underline;}
+
+/* --------------------------------------------------------------------------
Misc
*/
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index c76d9ef2ef..86d5ba07f0 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -2431,6 +2431,30 @@ Lightbox
}
/* --------------------------------------------------------------------------
+Butterbar
+*/
+#butterbar-wrapper {
+ position:absolute;
+ top:0;
+ left:0;
+ width:100%;
+}
+#butterbar {
+ width:940px;
+ margin:0 auto;
+}
+#butterbar-message {
+ background-color:#f80;
+ float:right;
+ font-size:12px;
+ font-weight:bold;
+ padding:0 10px;
+ border-radius: 0 0 5px 5px;
+}
+#butterbar-message a {color:#fff !important}
+#butterbar-message a:hover {text-decoration:underline;}
+
+/* --------------------------------------------------------------------------
Misc
*/