am 58b617b9: am cd59b7df: am 5f6019ab: DO NOT MERGE add butterbar notice for the google IO SDK announcements
* commit '58b617b902e5a9aa8c0367c894fefa747ea1b5e6':
DO NOT MERGE add butterbar notice for the google IO SDK announcements
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index 094fdc4..dc73c7f 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -2768,19 +2768,22 @@
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;
}
-#butterbar-message a {color:#fff !important}
-#butterbar-message a:hover {text-decoration:underline;}
+a#butterbar-message {
+ cursor:pointer;
+ display:block;
+}
+a#butterbar-message:hover {
+ text-decoration:underline;
+}
/* --------------------------------------------------------------------------
Misc
@@ -4039,7 +4042,7 @@
#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 43194ad..3971b60 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">
@@ -298,4 +305,4 @@
</div>
<?cs
-/def ?>
\ No newline at end of file
+/def ?>