diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2015-05-13 11:31:26 -0700 |
|---|---|---|
| committer | Dirk Dougherty <ddougherty@google.com> | 2015-05-13 11:33:26 -0700 |
| commit | 40e6ac91665b57cf6e794e731d1b1c7142175abe (patch) | |
| tree | 0bad117a5b2d51e0ce795a58c782c87b28908a3f /docs/html/sdk | |
| parent | 876677ef2d04545593fd4cd7bb8539fa15e3dc09 (diff) | |
| parent | 45fed51720c152c4d41dc86364e5a3c391b251af (diff) | |
| download | frameworks_base-40e6ac91665b57cf6e794e731d1b1c7142175abe.zip frameworks_base-40e6ac91665b57cf6e794e731d1b1c7142175abe.tar.gz frameworks_base-40e6ac91665b57cf6e794e731d1b1c7142175abe.tar.bz2 | |
resolved conflicts for merge of 45fed517 to mnc-dev
Change-Id: I08e44ee778436e5592e73ced82356f015cbdfe74
Diffstat (limited to 'docs/html/sdk')
| -rw-r--r-- | docs/html/sdk/index.jd | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd index a352f65..8da052e 100644 --- a/docs/html/sdk/index.jd +++ b/docs/html/sdk/index.jd @@ -55,7 +55,6 @@ sdk.win_installer_checksum=e764ea93aa72766737f9be3b9fb3e42d879ab599 <style type="text/css"> .offline {display:none;} - a.download-bundle-button {display:block;} h2.feature { padding-top:30px; margin-top:0; @@ -66,19 +65,6 @@ sdk.win_installer_checksum=e764ea93aa72766737f9be3b9fb3e42d879ab599 padding-top:40px; } - .landing-button.green { - font-size:16px; - background-color:#90c653; - padding:8px 10px 10px; - margin:0; - width:206px; - text-align:center; - } - - .landing-button.green:hover { - background-color:#85b84f; - } - .landing-button .small { font-size: 12px; font-weight: normal; @@ -284,7 +270,7 @@ This is the Android Software Development Kit License Agreement <img src="{@docRoot}images/tools/studio-hero.png" srcset="{@docRoot}images/tools/studio-hero_2x.png 2x, {@docRoot}images/tools/studio-hero.png 1x" -width="760" height="400" alt="" style="margin-bottom:100px" /> +width="760" height="400" alt="" /> <div style="color: #fff; width:226px; height:0; overflow:visible; position:absolute; top:40px; left:25px"> @@ -300,7 +286,7 @@ width: 400px;text-align: center;">The official Android IDE</p> <li>Android 5.0 emulator system image with Google APIs</li> </ul> -<a class="online landing-button green download-bundle-button" style="margin-top:30px;" +<a class="online landing-button green download-bundle-button" href="#Other" >Download Android Studio</a> <!-- this appears when viewing the offline docs --> @@ -308,8 +294,9 @@ href="#Other" >Download Android Studio</a> To get Android Studio or stand-alone SDK tools, visit <a href="http://developer.android.com/sdk/index.html">developer.android.com/sdk/</a> </p> +</div> -<ul style="margin-top:50px;color:#444"> +<ul> <li><a href="#Requirements">System Requirements</a></li> <li><a href="#Other">Other Download Options</a></li> <li><a href="{@docRoot}sdk/installing/migrate.html">Migrating to Android Studio</a></li> @@ -317,7 +304,6 @@ href="http://developer.android.com/sdk/index.html">developer.android.com/sdk/</a target="_blank">Take a Survey</a></li> </ul> -</div> @@ -403,8 +389,7 @@ srcset="{@docRoot}images/tools/studio-hero-gradle_2x.png 2x, {@docRoot}images/to <p>Build APKs from Android Studio or the command line.</p> </div> - - +</div> <h2 class="feature norule">More about Android Studio</h2> <div style="background:#424242;padding:30px; color:#fff;margin:0 0 15px;"> |