diff options
| author | smain@google.com <smain@google.com> | 2014-06-25 00:24:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-25 00:24:34 +0000 |
| commit | 58b617b902e5a9aa8c0367c894fefa747ea1b5e6 (patch) | |
| tree | 2e319a185478ea5a73d8e061192421f819be9afb /tools/droiddoc | |
| parent | cfb92aa963f2fee3251c393bc6dcff9b194af3e1 (diff) | |
| parent | cd59b7dfdb392153422f5618e2d6e847dcff790b (diff) | |
| download | build-58b617b902e5a9aa8c0367c894fefa747ea1b5e6.zip build-58b617b902e5a9aa8c0367c894fefa747ea1b5e6.tar.gz build-58b617b902e5a9aa8c0367c894fefa747ea1b5e6.tar.bz2 | |
am cd59b7df: am 5f6019ab: DO NOT MERGE add butterbar notice for the google IO SDK announcements
* commit 'cd59b7dfdb392153422f5618e2d6e847dcff790b':
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.css | 23 | ||||
| -rw-r--r-- | tools/droiddoc/templates-sdk/components/masthead.cs | 9 |
2 files changed, 21 insertions, 11 deletions
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 @@ 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 @@ -4039,7 +4042,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 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 @@ color:#666;font-weight:100;font-size:27px;">L Developer Preview</h1></div> </div> <?cs -/def ?>
\ No newline at end of file +/def ?> |