am e87bd05e: am 820e226d: am d1ab4cb3: am 05e55e90: Merge "add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places." into klp-modular-docs

* commit 'e87bd05ecf8633c99f859a898f9a46a2a5c26e4b':
  add butterbar for L announcement. make the butterbar an encapsulated method for inclusion multiple places.
This commit is contained in:
smain@google.com 2014-10-15 23:57:09 +00:00 committed by Android Git Automerger
commit afb1fccfbb
1 changed files with 15 additions and 2 deletions

View File

@ -6,7 +6,7 @@
<?cs if:!devsite ?><?cs # leave out the global header for devsite; it is in devsite template ?>
<!-- Header -->
<div id="header-wrapper">
<div id="header">
<div id="header"><?cs call:butter_bar() ?>
<div class="wrap" id="header-wrap">
<div class="col-3 logo">
<a href="<?cs var:toroot ?>index.html">
@ -261,7 +261,7 @@
<!-- Header -->
<div id="header-wrapper">
<div id="header">
<div id="header"><?cs call:butter_bar() ?>
<div class="wrap" id="header-wrap">
<div class="col_3 logo landing-logo" style="width:240px">
<a href="<?cs var:toroot ?>preview/index.html">
@ -299,3 +299,16 @@ color:#666;font-weight:100;font-size:27px;">L Developer Preview</h1></div>
<?cs
/def ?>
<?cs # (UN)COMMENT THE INSIDE OF THIS METHOD TO TOGGLE VISIBILITY ?>
<?cs def:butter_bar() ?>
<div style="height:20px"><!-- spacer to bump header down --></div>
<div id="butterbar-wrapper">
<div id="butterbar">
<a href="http://googleblog.blogspot.com/" id="butterbar-message">
The Android 5.0 SDK will be available on October 17th!
</a>
</div>
</div>
<?cs /def ?>