summaryrefslogtreecommitdiffstats
path: root/tools/droiddoc
diff options
context:
space:
mode:
authorsmain@google.com <smain@google.com>2014-06-25 00:19:46 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-25 00:19:46 +0000
commitcd59b7dfdb392153422f5618e2d6e847dcff790b (patch)
tree1a5517d1899bbcc2d78110be6d5887cfd11c3a7f /tools/droiddoc
parente662adf748be5d8df6056f4cf5da2c821bc27c59 (diff)
parent5f6019ab6cdcb3000eaf4b695424361a5038ade9 (diff)
downloadbuild-cd59b7dfdb392153422f5618e2d6e847dcff790b.zip
build-cd59b7dfdb392153422f5618e2d6e847dcff790b.tar.gz
build-cd59b7dfdb392153422f5618e2d6e847dcff790b.tar.bz2
am 5f6019ab: DO NOT MERGE add butterbar notice for the google IO SDK announcements
* commit '5f6019ab6cdcb3000eaf4b695424361a5038ade9': DO NOT MERGE add butterbar notice for the google IO SDK announcements
Diffstat (limited to 'tools/droiddoc')
-rw-r--r--tools/droiddoc/templates-sdk/assets/css/default.css23
-rw-r--r--tools/droiddoc/templates-sdk/components/masthead.cs7
2 files changed, 20 insertions, 10 deletions
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index 0bd70a5..f6a13e3 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -2710,19 +2710,22 @@ Butterbar
width:100%;
}
#butterbar {
- width:940px;
+ width:100%;
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;
+ background-color:rgba(255, 187, 51, .4);
+ font-size:13px;
+ padding: 5px 0;
+ text-align:center;
+}
+a#butterbar-message {
+ cursor:pointer;
+ display:block;
+}
+a#butterbar-message:hover {
+ text-decoration:underline;
}
-#butterbar-message a {color:#fff !important}
-#butterbar-message a:hover {text-decoration:underline;}
/* --------------------------------------------------------------------------
Misc
@@ -3943,7 +3946,7 @@ EndColorStr='#ececec');
#header-wrapper {
background: #f9f9f9;
margin: 0 -10px 0 -10px;
- padding: 31px 10px 0px 10px;
+ padding: 51px 10px 0px 10px;
position: relative;
}
#header-wrapper #nav-x div.wrap {
diff --git a/tools/droiddoc/templates-sdk/components/masthead.cs b/tools/droiddoc/templates-sdk/components/masthead.cs
index d0ff64d..29999b0 100644
--- a/tools/droiddoc/templates-sdk/components/masthead.cs
+++ b/tools/droiddoc/templates-sdk/components/masthead.cs
@@ -7,6 +7,13 @@
<!-- Header -->
<div id="header-wrapper">
<div id="header">
+ <div id="butterbar-wrapper">
+ <div id="butterbar">
+ <a href="<?cs var:toroot ?>preview/index.html" id="butterbar-message">
+ The SDKs announced at Google IO will be available on June 26th!
+ </a>
+ </div>
+ </div>
<div class="wrap" id="header-wrap">
<div class="col-3 logo">
<a href="<?cs var:toroot ?>index.html">