Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e57c2c9 authored by Ricardo Cervera's avatar Ricardo Cervera Committed by Android (Google) Code Review
Browse files

Merge "docs: Migrating material design info from the Preview site" into lmp-dev

parents 67b5c8eb 414978a8

docs/html/design/design_toc.cs

+4 −0
Original line number Diff line number Diff line
@@ -8,6 +8,10 @@ 
    </ul>

  </li>



  <li class="nav-section">

    <div class="nav-section-header empty"><a href="<?cs var:toroot ?>design/material/index.html">Material Design</a></div>

  </li>



  <li class="nav-section">

    <div class="nav-section-header"><a href="<?cs var:toroot ?>design/devices.html">Devices</a></div>

    <ul>

docs/html/design/index.jd

+7 −7
Original line number Diff line number Diff line
@@ -28,20 +28,20 @@ footer.hide=1 
    <span itemprop="description">Welcome to <strong>Android Design</strong>, your place for

    learning how to design exceptional Android apps.</span>

    <br><br>

    Want to know what <strong>Android 4.4 KitKat</strong> has for designers? See <a href="{@docRoot}design/patterns/new.html">New in Android</a>.<br><br>

    Want to know what <strong>Android 5.0</strong> has for designers? See <a href="{@docRoot}design/patterns/new.html">New in Android</a>.<br><br>

    <a href="/design/get-started/creative-vision.html" class="landing-page-link">Creative Vision</a>

  </div>

  <a id="hero-image" href="/design/get-started/creative-vision.html">

    <img src="/design/media/index_landing_page.png">

    <img src="{@docRoot}design/media/index_landing_page.png" width="760" height="600" alt=""

         srcset="{@docRoot}design/media/index_landing_page_2x.png 2x"/>

  </a>



<div style="background: hsl(8, 70%, 54%); margin: 0; padding: 20px 20px 10px 20px;color: #fff; position: absolute;top: 255px;width: 179px;">

<h2 style="color: #fff;margin:0 0 10px; font-size:18px" class="norule">L Developer Preview</h2>

<p> The next version of Android uses a design

metaphor inspired by paper and ink that provides a reassuring sense of tactility. Before it arrives for users, you can get an early

look at the new Material design.

<h2 style="color: #fff;margin:0 0 10px; font-size:18px" class="norule">Material Design</h2>

<p>Android 5.0 introduces a design

metaphor inspired by paper and ink that provides a reassuring sense of tactility.

</p>

<p><a class="white" href="{@docRoot}preview/material/index.html">Learn more about Material</a></p>

<p><a class="white" href="{@docRoot}design/material/index.html">Learn more</a></p>

</div>



</div>